diff --git a/.github/classifier.json b/.github/classifier.json
index d7f4f8d3547..e9c1e26ca39 100644
--- a/.github/classifier.json
+++ b/.github/classifier.json
@@ -12,6 +12,8 @@
 		"api-finalization": {"assign": []},
 		"api-proposal": {"assign": ["jrieken"]},
 		"authentication": {"assign": ["TylerLeonhardt"]},
+		"bracket-pair-colorization": {"assign": ["hediet"]},
+		"bracket-pair-guides": {"assign": ["hediet"]},
 		"breadcrumbs": {"assign": ["jrieken"]},
 		"callhierarchy": {"assign": ["jrieken"]},
 		"code-lens": {"assign": ["jrieken"]},
@@ -23,44 +25,47 @@
 		"custom-editors": {"assign": ["mjbvz"]},
 		"debug": {"assign": ["weinand"]},
 		"dialogs": {"assign": ["sbatten"]},
-		"diff-editor": {"assign": []},
+		"diff-editor": {"assign": ["alexdima"]},
 		"dropdown": {"assign": []},
-		"editor": {"assign": ["rebornix"]},
-		"editor-autoclosing": {"assign": []},
+		"editor-api": {"assign": ["alexdima"]},
+		"editor-autoclosing": {"assign": ["alexdima"]},
 		"editor-autoindent": {"assign": ["rebornix"]},
-		"editor-bracket-matching": {"assign": []},
-		"editor-clipboard": {"assign": ["jrieken"]},
+		"editor-bracket-matching": {"assign": ["hediet"]},
+		"editor-clipboard": {"assign": ["alexdima", "rebornix"]},
 		"editor-code-actions": {"assign": []},
 		"editor-color-picker": {"assign": ["rebornix"]},
 		"editor-columnselect": {"assign": ["alexdima"]},
-		"editor-commands": {"assign": ["jrieken"]},
-		"editor-comments": {"assign": []},
-		"editor-contrib": {"assign": []},
-		"editor-core": {"assign": []},
+		"editor-commands": {"assign": ["alexdima"]},
+		"editor-comments": {"assign": ["alexdima"]},
+		"editor-contrib": {"assign": ["alexdima"]},
+		"editor-core": {"assign": ["alexdima"]},
 		"editor-drag-and-drop": {"assign": ["rebornix"]},
 		"editor-error-widget": {"assign": ["sandy081"]},
 		"editor-find": {"assign": ["rebornix"]},
 		"editor-folding": {"assign": ["aeschli"]},
+		"editor-highlight": {"assign": ["alexdima"]},
 		"editor-hover": {"assign": []},
-		"editor-indent-guides": {"assign": []},
+		"editor-indent-detection": {"assign": ["alexdima"]},
+		"editor-indent-guides": {"assign": ["hediet"]},
 		"editor-input": {"assign": ["alexdima"]},
-		"editor-input-IME": {"assign": ["rebornix"]},
-		"editor-minimap": {"assign": []},
+		"editor-input-IME": {"assign": ["alexdima", "rebornix"]},
+		"editor-minimap": {"assign": ["alexdima"]},
 		"editor-multicursor": {"assign": ["alexdima"]},
 		"editor-parameter-hints": {"assign": []},
-		"editor-render-whitespace": {"assign": []},
+		"editor-render-whitespace": {"assign": ["alexdima"]},
 		"editor-rendering": {"assign": ["alexdima"]},
-		"editor-scrollbar": {"assign": []},
+		"editor-RTL": {"assign": ["alexdima"]},
+		"editor-scrollbar": {"assign": ["alexdima"]},
 		"editor-symbols": {"assign": ["jrieken"]},
 		"editor-synced-region": {"assign": ["aeschli"]},
 		"editor-textbuffer": {"assign": ["rebornix"]},
-		"editor-theming": {"assign": []},
+		"editor-theming": {"assign": ["alexdima"]},
 		"editor-wordnav": {"assign": ["alexdima"]},
 		"editor-wrapping": {"assign": ["alexdima"]},
 		"emmet": {"assign": ["rzhao271"]},
 		"error-list": {"assign": ["sandy081"]},
 		"explorer-custom": {"assign": ["sandy081"]},
-		"extension-host": {"assign": []},
+		"extension-host": {"assign": ["alexdima"]},
 		"extensions": {"assign": ["sandy081"]},
 		"extensions-development": {"assign": []},
 		"file-decorations": {"assign": ["jrieken"]},
@@ -72,6 +77,7 @@
 		"file-watcher": {"assign": ["bpasero"]},
 		"font-rendering": {"assign": []},
 		"formatting": {"assign": []},
+		"ghost-text": {"assign": ["hediet"]},
 		"git": {"assign": ["lszomoru"]},
 		"gpu": {"assign": ["deepak1556"]},
 		"grammar": {"assign": ["mjbvz"]},
@@ -80,6 +86,8 @@
 		"i18n": {"assign": []},
 		"icon-brand": {"assign": []},
 		"icons-product": {"assign": ["misolori"]},
+		"inlay-hints": {"assign": ["jrieken", "hediet"]},
+		"inline-completions": {"assign": ["hediet"]},
 		"install-update": {"assign": []},
 		"terminal": {"assign": ["meganrogge"]},
 		"terminal-conpty": {"assign": ["meganrogge"]},
@@ -92,7 +100,7 @@
 		"issue-reporter": {"assign": ["TylerLeonhardt"]},
 		"javascript": {"assign": ["mjbvz"]},
 		"json": {"assign": ["aeschli"]},
-		"keybindings": {"assign": []},
+		"keybindings": {"assign": ["alexdima"]},
 		"keybindings-editor": {"assign": ["sandy081"]},
 		"keyboard-layout": {"assign": ["alexdima"]},
 		"languages-basic": {"assign": ["aeschli"]},
@@ -118,6 +126,7 @@
 		"references-viewlet": {"assign": ["jrieken"]},
 		"release-notes": {"assign": []},
 		"remote": {"assign": []},
+		"remote-connection": {"assign": ["alexdima"]},
 		"remote-explorer": {"assign": ["alexr00"]},
 		"rename": {"assign": ["jrieken"]},
 		"scm": {"assign": ["lszomoru"]},
@@ -125,7 +134,7 @@
 		"search": {"assign": ["roblourens"]},
 		"search-editor": {"assign": ["JacksonKearl"]},
 		"search-replace": {"assign": ["sandy081"]},
-		"semantic-tokens": {"assign": ["aeschli"]},
+		"semantic-tokens": {"assign": ["alexdima", "aeschli"]},
 		"settings-editor": {"assign": ["rzhao271"]},
 		"settings-sync": {"assign": ["sandy081"]},
 		"simple-file-dialog": {"assign": ["alexr00"]},
@@ -142,9 +151,10 @@
 		"timeline-git": {"assign": ["lszomoru"]},
 		"titlebar": {"assign": ["sbatten"]},
 		"tokenization": {"assign": []},
+		"trackpad/scroll": {"assign": []},
 		"tree": {"assign": ["joaomoreno"]},
 		"typescript": {"assign": ["mjbvz"]},
-		"undo-redo": {"assign": []},
+		"undo-redo": {"assign": ["alexdima"]},
 		"unit-test": {"assign": []},
 		"uri": {"assign": ["jrieken"]},
 		"ux": {"assign": ["misolori"]},