diff --git a/extensions/theme-defaults/themes/dark_modern.json b/extensions/theme-defaults/themes/dark_modern.json
index be4ef129a7a..a4ff77a31e3 100644
--- a/extensions/theme-defaults/themes/dark_modern.json
+++ b/extensions/theme-defaults/themes/dark_modern.json
@@ -3,123 +3,123 @@
 	"name": "Default Dark Modern",
 	"include": "./dark_plus.json",
 	"colors": {
-		"activityBar.activeBorder": "#0078d4",
+		"activityBar.activeBorder": "#0078D4",
 		"activityBar.background": "#181818",
-		"activityBar.border": "#ffffff15",
-		"activityBar.foreground": "#d7d7d7",
-		"activityBar.inactiveForeground": "#ffffff80",
-		"activityBarBadge.background": "#0078d4",
-		"activityBarBadge.foreground": "#ffffff",
-		"badge.background": "#4D4D4D",
-		"badge.foreground": "#f2f2f2",
-		"button.background": "#0078d4",
-		"button.border": "#ffffff12",
-		"button.foreground": "#ffffff",
-		"button.hoverBackground": "#0078d4e6",
-		"button.secondaryBackground": "#FFFFFF0F",
-		"button.secondaryForeground": "#cccccc",
-		"button.secondaryHoverBackground": "#ffffff15",
+		"activityBar.border": "#2B2B2B",
+		"activityBar.foreground": "#D7D7D7",
+		"activityBar.inactiveForeground": "#868686",
+		"activityBarBadge.background": "#0078D4",
+		"activityBarBadge.foreground": "#FFFFFF",
+		"badge.background": "#616161",
+		"badge.foreground": "#F8F8F8",
+		"button.background": "#0078D4",
+		"button.border": "#FFFFFF12",
+		"button.foreground": "#FFFFFF",
+		"button.hoverBackground": "#026EC1",
+		"button.secondaryBackground": "#1F1F1F",
+		"button.secondaryForeground": "#CCCCCC",
+		"button.secondaryHoverBackground": "#2B2B2B",
 		"checkbox.background": "#313131",
-		"checkbox.border": "#ffffff1f",
+		"checkbox.border": "#3C3C3C",
 		"debugToolBar.background": "#181818",
-		"descriptionForeground": "#8b949e",
+		"descriptionForeground": "#9D9D9D",
 		"dropdown.background": "#313131",
-		"dropdown.border": "#ffffff1f",
-		"dropdown.foreground": "#cccccc",
-		"dropdown.listBackground": "#1f1f1f",
-		"editor.background": "#1f1f1f",
-		"editor.findMatchBackground": "#9e6a03",
-		"editor.foreground": "#cccccc",
-		"editorGroup.border": "#ffffff17",
+		"dropdown.border": "#3C3C3C",
+		"dropdown.foreground": "#CCCCCC",
+		"dropdown.listBackground": "#1F1F1F",
+		"editor.background": "#1F1F1F",
+		"editor.findMatchBackground": "#9E6A03",
+		"editor.foreground": "#CCCCCC",
+		"editorGroup.border": "#FFFFFF17",
 		"editorGroupHeader.tabsBackground": "#181818",
-		"editorGroupHeader.tabsBorder": "#ffffff15",
-		"editorGutter.addedBackground": "#2ea043",
-		"editorGutter.deletedBackground": "#f85149",
-		"editorGutter.modifiedBackground": "#0078d4",
-		"editorLineNumber.activeForeground": "#cccccc",
-		"editorLineNumber.foreground": "#6e7681",
+		"editorGroupHeader.tabsBorder": "#2B2B2B",
+		"editorGutter.addedBackground": "#2EA043",
+		"editorGutter.deletedBackground": "#F85149",
+		"editorGutter.modifiedBackground": "#0078D4",
+		"editorLineNumber.activeForeground": "#CCCCCC",
+		"editorLineNumber.foreground": "#6E7681",
 		"editorOverviewRuler.border": "#010409",
 		"editorWidget.background": "#2B2B2B",
-		"errorForeground": "#f85149",
-		"focusBorder": "#0078d4",
-		"foreground": "#cccccc",
-		"icon.foreground": "#cccccc",
-		"input.background": "#2a2a2a",
-		"input.border": "#ffffff1f",
-		"input.foreground": "#cccccc",
-		"input.placeholderForeground": "#ffffff79",
-		"inputOption.activeBackground": "#2489db82",
-		"inputOption.activeBorder": "#2488db",
-		"keybindingLabel.foreground": "#cccccc",
-		"menu.background": "#1f1f1f",
-		"notificationCenterHeader.background": "#1f1f1f",
-		"notificationCenterHeader.foreground": "#cccccc",
-		"notifications.background": "#1f1f1f",
-		"notifications.border": "#ffffff15",
-		"notifications.foreground": "#cccccc",
+		"errorForeground": "#F85149",
+		"focusBorder": "#0078D4",
+		"foreground": "#CCCCCC",
+		"icon.foreground": "#CCCCCC",
+		"input.background": "#2A2A2A",
+		"input.border": "#3C3C3C",
+		"input.foreground": "#CCCCCC",
+		"input.placeholderForeground": "#9D9D9D",
+		"inputOption.activeBackground": "#2489DB82",
+		"inputOption.activeBorder": "#2488DB",
+		"keybindingLabel.foreground": "#CCCCCC",
+		"menu.background": "#1F1F1F",
+		"notificationCenterHeader.background": "#1F1F1F",
+		"notificationCenterHeader.foreground": "#CCCCCC",
+		"notifications.background": "#1F1F1F",
+		"notifications.border": "#2B2B2B",
+		"notifications.foreground": "#CCCCCC",
 		"panel.background": "#181818",
-		"panel.border": "#ffffff15",
-		"panelInput.border": "#ffffff15",
-		"panelTitle.activeBorder": "#0078d4",
-		"panelTitle.activeForeground": "#cccccc",
-		"panelTitle.inactiveForeground": "#8b949e",
-		"peekViewEditor.background": "#1f1f1f",
-		"peekViewEditor.matchHighlightBackground": "#bb800966",
-		"peekViewResult.background": "#1f1f1f",
-		"peekViewResult.matchHighlightBackground": "#bb800966",
-		"pickerGroup.border": "#ffffff15",
-		"pickerGroup.foreground": "#8b949e",
-		"progressBar.background": "#0078d4",
+		"panel.border": "#2B2B2B",
+		"panelInput.border": "#2B2B2B",
+		"panelTitle.activeBorder": "#0078D4",
+		"panelTitle.activeForeground": "#CCCCCC",
+		"panelTitle.inactiveForeground": "#9D9D9D",
+		"peekViewEditor.background": "#1F1F1F",
+		"peekViewEditor.matchHighlightBackground": "#BB800966",
+		"peekViewResult.background": "#1F1F1F",
+		"peekViewResult.matchHighlightBackground": "#BB800966",
+		"pickerGroup.border": "#2B2B2B",
+		"pickerGroup.foreground": "#8B949E",
+		"progressBar.background": "#0078D4",
 		"quickInput.background": "#2A2A2A",
-		"quickInput.foreground": "#cccccc",
+		"quickInput.foreground": "#CCCCCC",
 		"settings.dropdownBackground": "#313131",
-		"settings.dropdownBorder": "#ffffff1f",
-		"settings.headerForeground": "#ffffff",
-		"settings.modifiedItemIndicator": "#bb800966",
+		"settings.dropdownBorder": "#3C3C3C",
+		"settings.headerForeground": "#FFFFFF",
+		"settings.modifiedItemIndicator": "#BB800966",
 		"sideBar.background": "#181818",
-		"sideBar.border": "#ffffff15",
-		"sideBar.foreground": "#cccccc",
+		"sideBar.border": "#2B2B2B",
+		"sideBar.foreground": "#CCCCCC",
 		"sideBarSectionHeader.background": "#181818",
-		"sideBarSectionHeader.border": "#ffffff15",
-		"sideBarSectionHeader.foreground": "#cccccc",
-		"sideBarTitle.foreground": "#cccccc",
+		"sideBarSectionHeader.border": "#2B2B2B",
+		"sideBarSectionHeader.foreground": "#CCCCCC",
+		"sideBarTitle.foreground": "#CCCCCC",
 		"statusBar.background": "#181818",
-		"statusBar.border": "#ffffff15",
-		"statusBar.debuggingBackground": "#0078d4",
-		"statusBar.debuggingForeground": "#ffffff",
-		"statusBar.focusBorder": "#0078d4",
-		"statusBar.foreground": "#cccccc",
-		"statusBar.noFolderBackground": "#1f1f1f",
-		"statusBarItem.focusBorder": "#0078d4",
-		"statusBarItem.prominentBackground": "#6e768166",
-		"statusBarItem.remoteBackground": "#0078d4",
-		"statusBarItem.remoteForeground": "#ffffff",
-		"tab.activeBackground": "#1f1f1f",
-		"tab.activeBorder": "#1f1f1f",
-		"tab.activeBorderTop": "#0078d4",
-		"tab.activeForeground": "#ffffff",
-		"tab.border": "#ffffff15",
-		"tab.hoverBackground": "#1f1f1f",
+		"statusBar.border": "#2B2B2B",
+		"statusBar.debuggingBackground": "#0078D4",
+		"statusBar.debuggingForeground": "#FFFFFF",
+		"statusBar.focusBorder": "#0078D4",
+		"statusBar.foreground": "#CCCCCC",
+		"statusBar.noFolderBackground": "#1F1F1F",
+		"statusBarItem.focusBorder": "#0078D4",
+		"statusBarItem.prominentBackground": "#6E768166",
+		"statusBarItem.remoteBackground": "#0078D4",
+		"statusBarItem.remoteForeground": "#FFFFFF",
+		"tab.activeBackground": "#1F1F1F",
+		"tab.activeBorder": "#1F1F1F",
+		"tab.activeBorderTop": "#0078D4",
+		"tab.activeForeground": "#FFFFFF",
+		"tab.border": "#2B2B2B",
+		"tab.hoverBackground": "#1F1F1F",
 		"tab.inactiveBackground": "#181818",
-		"tab.inactiveForeground": "#ffffff80",
-		"tab.unfocusedActiveBorder": "#1f1f1f",
-		"tab.unfocusedActiveBorderTop": "#ffffff15",
-		"tab.unfocusedHoverBackground": "#6e76811a",
-		"terminal.foreground": "#cccccc",
-		"terminal.tab.activeBorder": "#0078d4",
+		"tab.inactiveForeground": "#9D9D9D",
+		"tab.unfocusedActiveBorder": "#1F1F1F",
+		"tab.unfocusedActiveBorderTop": "#2B2B2B",
+		"tab.unfocusedHoverBackground": "#1F1F1F",
+		"terminal.foreground": "#CCCCCC",
+		"terminal.tab.activeBorder": "#0078D4",
 		"textBlockQuote.background": "#2B2B2B",
 		"textBlockQuote.border": "#616161",
 		"textCodeBlock.background": "#2B2B2B",
 		"textLink.activeForeground": "#40A6FF",
 		"textLink.foreground": "#40A6FF",
-		"textSeparator.foreground": "#21262d",
+		"textSeparator.foreground": "#21262D",
 		"titleBar.activeBackground": "#181818",
-		"titleBar.activeForeground": "#cccccc",
-		"titleBar.border": "#ffffff15",
-		"titleBar.inactiveBackground": "#1f1f1f",
-		"titleBar.inactiveForeground": "#8b949e",
-		"welcomePage.tileBackground": "#ffffff0f",
-		"welcomePage.progress.foreground": "#0078d4",
-		"widget.border": "#ffffff15",
+		"titleBar.activeForeground": "#CCCCCC",
+		"titleBar.border": "#2B2B2B",
+		"titleBar.inactiveBackground": "#1F1F1F",
+		"titleBar.inactiveForeground": "#9D9D9D",
+		"welcomePage.tileBackground": "#2B2B2B",
+		"welcomePage.progress.foreground": "#0078D4",
+		"widget.border": "#333333",
 	},
 }
diff --git a/extensions/theme-defaults/themes/light_modern.json b/extensions/theme-defaults/themes/light_modern.json
index 84b12a1d0f7..2fb9a7aee79 100644
--- a/extensions/theme-defaults/themes/light_modern.json
+++ b/extensions/theme-defaults/themes/light_modern.json
@@ -4,138 +4,138 @@
 	"include": "./light_plus.json",
 	"colors": {
 		"activityBar.activeBorder": "#005FB8",
-		"activityBar.background": "#f8f8f8",
-		"activityBar.border": "#0000001a",
-		"activityBar.foreground": "#1f1f1f",
-		"activityBar.inactiveForeground": "#0000009e",
+		"activityBar.background": "#F8F8F8",
+		"activityBar.border": "#E5E5E5",
+		"activityBar.foreground": "#1F1F1F",
+		"activityBar.inactiveForeground": "#616161",
 		"activityBarBadge.background": "#005FB8",
-		"activityBarBadge.foreground": "#ffffff",
+		"activityBarBadge.foreground": "#FFFFFF",
 		"badge.background": "#CCCCCC",
-		"badge.foreground": "#3b3b3b",
+		"badge.foreground": "#3B3B3B",
 		"button.background": "#005FB8",
 		"button.border": "#0000001a",
-		"button.foreground": "#ffffff",
-		"button.hoverBackground": "#005FB8e6",
-		"button.secondaryBackground": "#0000001a",
-		"button.secondaryForeground": "#3b3b3b",
-		"button.secondaryHoverBackground": "#00000034",
-		"checkbox.background": "#f8f8f8",
+		"button.foreground": "#FFFFFF",
+		"button.hoverBackground": "#0258A8",
+		"button.secondaryBackground": "#E5E5E5",
+		"button.secondaryForeground": "#3B3B3B",
+		"button.secondaryHoverBackground": "#CBCBCB",
+		"checkbox.background": "#F8F8F8",
 		"checkbox.border": "#CECECE",
-		"descriptionForeground": "#3b3b3b",
-		"dropdown.background": "#ffffff",
+		"descriptionForeground": "#3B3B3B",
+		"dropdown.background": "#FFFFFF",
 		"dropdown.border": "#CECECE",
-		"dropdown.foreground": "#3b3b3b",
-		"dropdown.listBackground": "#ffffff",
-		"editor.background": "#ffffff",
-		"editor.foreground": "#3b3b3b",
+		"dropdown.foreground": "#3B3B3B",
+		"dropdown.listBackground": "#FFFFFF",
+		"editor.background": "#FFFFFF",
+		"editor.foreground": "#3B3B3B",
 		"editor.inactiveSelectionBackground": "#E5EBF1",
 		"editor.selectionHighlightBackground": "#ADD6FF80",
-		"editorGroup.border": "#0000001a",
-		"editorGroupHeader.tabsBackground": "#f8f8f8",
-		"editorGroupHeader.tabsBorder": "#0000001a",
-		"editorGutter.addedBackground": "#2ea043",
-		"editorGutter.deletedBackground": "#f85149",
+		"editorGroup.border": "#E5E5E5",
+		"editorGroupHeader.tabsBackground": "#F8F8F8",
+		"editorGroupHeader.tabsBorder": "#E5E5E5",
+		"editorGutter.addedBackground": "#2EA043",
+		"editorGutter.deletedBackground": "#F85149",
 		"editorGutter.modifiedBackground": "#005FB8",
 		"editorIndentGuide.background": "#D3D3D3",
 		"editorLineNumber.activeForeground": "#171184",
-		"editorLineNumber.foreground": "#6e7681",
-		"editorOverviewRuler.border": "#0000001a",
-		"editorSuggestWidget.background": "#f8f8f8",
+		"editorLineNumber.foreground": "#6E7681",
+		"editorOverviewRuler.border": "#E5E5E5",
+		"editorSuggestWidget.background": "#F8F8F8",
 		"editorWidget.background": "#F8F8F8",
-		"errorForeground": "#f85149",
+		"errorForeground": "#F85149",
 		"focusBorder": "#005FB8",
-		"foreground": "#3b3b3b",
-		"icon.foreground": "#3b3b3b",
-		"input.background": "#ffffff",
+		"foreground": "#3B3B3B",
+		"icon.foreground": "#3B3B3B",
+		"input.background": "#FFFFFF",
 		"input.border": "#CECECE",
-		"input.foreground": "#3b3b3b",
-		"input.placeholderForeground": "#00000079",
-		"inputOption.activeBackground": "#005fb841",
+		"input.foreground": "#3B3B3B",
+		"input.placeholderForeground": "#868686",
+		"inputOption.activeBackground": "#BED6ED",
 		"inputOption.activeBorder": "#005FB8",
 		"inputOption.activeForeground": "#000000",
-		"keybindingLabel.foreground": "#3b3b3b",
+		"keybindingLabel.foreground": "#3B3B3B",
+		"list.activeSelectionBackground": "#E8E8E8",
+		"list.activeSelectionForeground": "#000000",
+		"list.activeSelectionIconForeground": "#000000",
+		"list.hoverBackground": "#F2F2F2",
 		"list.focusAndSelectionOutline": "#005FB8",
-		"menu.border": "#D4D4D4",
-		"notebook.cellBorderColor": "#E8E8E8",
-		"notebook.selectedCellBackground": "#c8ddf150",
-		"notificationCenterHeader.background": "#ffffff",
-		"notificationCenterHeader.foreground": "#3b3b3b",
-		"notifications.background": "#ffffff",
-		"notifications.border": "#0000001a",
-		"notifications.foreground": "#3b3b3b",
-		"panel.background": "#f8f8f8",
-		"panel.border": "#0000001a",
-		"panelInput.border": "#0000001a",
+		"menu.border": "#CECECE",
+		"notebook.cellBorderColor": "#E5E5E5",
+		"notebook.selectedCellBackground": "#C8DDF150",
+		"notificationCenterHeader.background": "#FFFFFF",
+		"notificationCenterHeader.foreground": "#3B3B3B",
+		"notifications.background": "#FFFFFF",
+		"notifications.border": "#E5E5E5",
+		"notifications.foreground": "#3B3B3B",
+		"panel.background": "#F8F8F8",
+		"panel.border": "#E5E5E5",
+		"panelInput.border": "#E5E5E5",
 		"panelTitle.activeBorder": "#005FB8",
-		"panelTitle.activeForeground": "#3b3b3b",
-		"panelTitle.inactiveForeground": "#3b3b3b",
-		"peekViewEditor.matchHighlightBackground": "#bb800966",
-		"peekViewResult.background": "#ffffff",
-		"peekViewResult.matchHighlightBackground": "#bb800966",
-		"pickerGroup.border": "#0000001a",
-		"pickerGroup.foreground": "#8b949e",
+		"panelTitle.activeForeground": "#3B3B3B",
+		"panelTitle.inactiveForeground": "#3B3B3B",
+		"peekViewEditor.matchHighlightBackground": "#BB800966",
+		"peekViewResult.background": "#FFFFFF",
+		"peekViewResult.matchHighlightBackground": "#BB800966",
+		"pickerGroup.border": "#E5E5E5",
+		"pickerGroup.foreground": "#8B949E",
 		"ports.iconRunningProcessForeground": "#369432",
 		"progressBar.background": "#005FB8",
 		"quickInput.background": "#F8F8F8",
-		"quickInput.foreground": "#3b3b3b",
-		"scrollbar.shadow": "#484f5833",
-		"scrollbarSlider.activeBackground": "#6e768187",
-		"scrollbarSlider.background": "#6e768133",
-		"scrollbarSlider.hoverBackground": "#6e768145",
+		"quickInput.foreground": "#3B3B3B",
 		"searchEditor.textInputBorder": "#CECECE",
-		"settings.dropdownBackground": "#ffffff",
+		"settings.dropdownBackground": "#FFFFFF",
 		"settings.dropdownBorder": "#CECECE",
-		"settings.headerForeground": "#1f1f1f",
-		"settings.modifiedItemIndicator": "#bb800966",
+		"settings.headerForeground": "#1F1F1F",
+		"settings.modifiedItemIndicator": "#BB800966",
 		"settings.numberInputBorder": "#CECECE",
 		"settings.textInputBorder": "#CECECE",
-		"sideBar.background": "#f8f8f8",
-		"sideBar.border": "#0000001a",
-		"sideBar.foreground": "#3b3b3b",
-		"sideBarSectionHeader.background": "#f8f8f8",
-		"sideBarSectionHeader.border": "#0000001a",
-		"sideBarSectionHeader.foreground": "#3b3b3b",
-		"sideBarTitle.foreground": "#3b3b3b",
-		"statusBar.background": "#f8f8f8",
-		"statusBar.foreground": "#3b3b3b",
-		"statusBar.border": "#0000001a",
-		"statusBar.debuggingBackground": "#fd716c",
+		"sideBar.background": "#F8F8F8",
+		"sideBar.border": "#E5E5E5",
+		"sideBar.foreground": "#3B3B3B",
+		"sideBarSectionHeader.background": "#F8F8F8",
+		"sideBarSectionHeader.border": "#E5E5E5",
+		"sideBarSectionHeader.foreground": "#3B3B3B",
+		"sideBarTitle.foreground": "#3B3B3B",
+		"statusBar.background": "#F8F8F8",
+		"statusBar.foreground": "#3B3B3B",
+		"statusBar.border": "#E5E5E5",
+		"statusBar.debuggingBackground": "#FD716C",
 		"statusBar.debuggingForeground": "#000000",
 		"statusBar.focusBorder": "#005FB8",
-		"statusBar.noFolderBackground": "#f8f8f8",
-		"statusBarItem.errorBackground": "#c72e0f",
+		"statusBar.noFolderBackground": "#F8F8F8",
+		"statusBarItem.errorBackground": "#C72E0F",
 		"statusBarItem.focusBorder": "#005FB8",
-		"statusBarItem.prominentBackground": "#6e768166",
+		"statusBarItem.prominentBackground": "#6E768166",
 		"statusBarItem.remoteBackground": "#005FB8",
-		"statusBarItem.remoteForeground": "#ffffff",
-		"tab.activeBackground": "#ffffff",
-		"tab.activeBorder": "#f8f8f8",
+		"statusBarItem.remoteForeground": "#FFFFFF",
+		"tab.activeBackground": "#FFFFFF",
+		"tab.activeBorder": "#F8F8F8",
 		"tab.activeBorderTop": "#005FB8",
-		"tab.activeForeground": "#3b3b3b",
-		"tab.border": "#0000001a",
-		"tab.hoverBackground": "#ffffff",
-		"tab.inactiveBackground": "#f8f8f8",
-		"tab.inactiveForeground": "#00000080",
-		"tab.lastPinnedBorder": "#3b3b3b30",
-		"tab.unfocusedActiveBorder": "#f8f8f8",
-		"tab.unfocusedActiveBorderTop": "#00000015",
-		"tab.unfocusedHoverBackground": "#6e76811a",
+		"tab.activeForeground": "#3B3B3B",
+		"tab.border": "#E5E5E5",
+		"tab.hoverBackground": "#FFFFFF",
+		"tab.inactiveBackground": "#F8F8F8",
+		"tab.inactiveForeground": "#868686",
+		"tab.lastPinnedBorder": "#D4D4D4",
+		"tab.unfocusedActiveBorder": "#F8F8F8",
+		"tab.unfocusedActiveBorderTop": "#E5E5E5",
+		"tab.unfocusedHoverBackground": "#F8F8F8",
 		"terminalCursor.foreground": "#005FB8",
-		"terminal.foreground": "#3b3b3b",
+		"terminal.foreground": "#3B3B3B",
 		"terminal.inactiveSelectionBackground": "#E5EBF1",
-		"terminal.tab.activeBorder": "#005fb8",
+		"terminal.tab.activeBorder": "#005FB8",
 		"textBlockQuote.background": "#F8F8F8",
-		"textBlockQuote.border": "#0000001a",
+		"textBlockQuote.border": "#E5E5E5",
 		"textCodeBlock.background": "#F8F8F8",
 		"textLink.activeForeground": "#005FB8",
 		"textLink.foreground": "#005FB8",
-		"textSeparator.foreground": "#21262d",
-		"titleBar.activeBackground": "#f8f8f8",
-		"titleBar.activeForeground": "#1e1e1e",
-		"titleBar.border": "#0000001a",
-		"titleBar.inactiveBackground": "#f8f8f8",
-		"titleBar.inactiveForeground": "#8b949e",
-		"welcomePage.tileBackground": "#f3f3f3",
-		"widget.border": "#0000001a",
+		"textSeparator.foreground": "#21262D",
+		"titleBar.activeBackground": "#F8F8F8",
+		"titleBar.activeForeground": "#1E1E1E",
+		"titleBar.border": "#E5E5E5",
+		"titleBar.inactiveBackground": "#F8F8F8",
+		"titleBar.inactiveForeground": "#8B949E",
+		"welcomePage.tileBackground": "#F3F3F3",
+		"widget.border": "#E5E5E5"
 	},
 }