diff --git a/ayu-dark-bordered.json b/ayu-dark-bordered.json
index 28f38c69..89adbd8b 100644
--- a/ayu-dark-bordered.json
+++ b/ayu-dark-bordered.json
@@ -1,10 +1,10 @@
 {
 	"type": "dark",
 	"colors": {
-		"focusBorder": "#292d36",
+		"focusBorder": "#30343d",
 		"foreground": "#3d424d",
 		"widget.shadow": "#00010a",
-		"selection.background": "#161f2afd",
+		"selection.background": "#273747fd",
 		"textBlockQuote.background": "#0d1016",
 		"textLink.foreground": "#e6b450",
 		"textLink.activeForeground": "#e6b450",
@@ -14,11 +14,11 @@
 		"button.hoverBackground": "#e1af4b",
 		"dropdown.background": "#0d1016",
 		"dropdown.foreground": "#3d424d",
-		"dropdown.border": "#191e25",
-		"input.background": "#0d1016",
-		"input.border": "#191e25",
+		"dropdown.border": "#22262d",
+		"input.background": "#030810",
+		"input.border": "#22262d",
 		"input.foreground": "#b3b1ad",
-		"input.placeholderForeground": "#2e323c",
+		"input.placeholderForeground": "#333841",
 		"inputOption.activeBorder": "#e6b450",
 		"inputValidation.errorBackground": "#0a0e14",
 		"inputValidation.errorBorder": "#ff3333",
@@ -42,7 +42,7 @@
 		"list.hoverForeground": "#3d424d",
 		"list.inactiveSelectionBackground": "#01060e",
 		"list.inactiveSelectionForeground": "#3d424d",
-		"list.invalidItemForeground": "#2e323c",
+		"list.invalidItemForeground": "#333841",
 		"activityBar.background": "#0a0e14",
 		"activityBar.foreground": "#3d424dcc",
 		"activityBar.border": "#01060e",
@@ -72,17 +72,19 @@
 		"editorLineNumber.foreground": "#3d424d99",
 		"editorLineNumber.activeForeground": "#3d424de6",
 		"editorCursor.foreground": "#e6b450",
-		"editor.selectionBackground": "#161f2a",
-		"editor.inactiveSelectionBackground": "#121922",
-		"editor.selectionHighlightBackground": "#121922",
-		"editor.selectionHighlightBorder": "#1d2936",
-		"editor.wordHighlightBackground": "#121922",
-		"editor.wordHighlightStrongBackground": "#e6b45033",
+		"editor.selectionBackground": "#273747",
+		"editor.inactiveSelectionBackground": "#1b2733",
+		"editor.selectionHighlightBackground": "#1b2733",
+		"editor.selectionHighlightBorder": "#304357",
+		"editor.wordHighlightBackground": "#6994bf12",
+		"editor.wordHighlightBorder": "#6994bf80",
+		"editor.wordHighlightStrongBackground": "#91b36212",
+		"editor.wordHighlightStrongBorder": "#91b36280",
 		"editor.findMatchBackground": "#e6b4500d",
 		"editor.findMatchBorder": "#e6b450",
 		"editor.findMatchHighlightBackground": "#e6b4500d",
 		"editor.findMatchHighlightBorder": "#e6b45059",
-		"editor.findRangeHighlightBackground": "#121922",
+		"editor.findRangeHighlightBackground": "#1b2733",
 		"editor.findRangeHighlightBorder": "#0a0e1400",
 		"editor.lineHighlightBackground": "#01060e",
 		"editorLink.activeForeground": "#e6b450",
@@ -150,13 +152,13 @@
 		"extensionButton.prominentBackground": "#e6b450",
 		"extensionButton.prominentHoverBackground": "#e1af4b",
 		"pickerGroup.border": "#01060e",
-		"pickerGroup.foreground": "#242831",
+		"pickerGroup.foreground": "#2c3038",
 		"debugToolBar.background": "#0d1016",
 		"walkThrough.embeddedEditorBackground": "#0d1016",
 		"gitDecoration.modifiedResourceForeground": "#6994bfb3",
 		"gitDecoration.deletedResourceForeground": "#d96c75b3",
 		"gitDecoration.untrackedResourceForeground": "#91b362b3",
-		"gitDecoration.ignoredResourceForeground": "#242831",
+		"gitDecoration.ignoredResourceForeground": "#2c3038",
 		"gitDecoration.conflictingResourceForeground": "",
 		"gitDecoration.submoduleResourceForeground": "#ffee99b3",
 		"settings.headerForeground": "#b3b1ad",
diff --git a/ayu-dark.json b/ayu-dark.json
index 713ce37c..8be25dde 100644
--- a/ayu-dark.json
+++ b/ayu-dark.json
@@ -1,10 +1,10 @@
 {
 	"type": "dark",
 	"colors": {
-		"focusBorder": "#292d36",
+		"focusBorder": "#30343d",
 		"foreground": "#3d424d",
 		"widget.shadow": "#00010a",
-		"selection.background": "#161f2afd",
+		"selection.background": "#273747fd",
 		"textBlockQuote.background": "#0d1016",
 		"textLink.foreground": "#e6b450",
 		"textLink.activeForeground": "#e6b450",
@@ -14,11 +14,11 @@
 		"button.hoverBackground": "#e1af4b",
 		"dropdown.background": "#0d1016",
 		"dropdown.foreground": "#3d424d",
-		"dropdown.border": "#191e25",
-		"input.background": "#0d1016",
-		"input.border": "#191e25",
+		"dropdown.border": "#22262d",
+		"input.background": "#030810",
+		"input.border": "#22262d",
 		"input.foreground": "#b3b1ad",
-		"input.placeholderForeground": "#2e323c",
+		"input.placeholderForeground": "#333841",
 		"inputOption.activeBorder": "#e6b450",
 		"inputValidation.errorBackground": "#0a0e14",
 		"inputValidation.errorBorder": "#ff3333",
@@ -42,7 +42,7 @@
 		"list.hoverForeground": "#3d424d",
 		"list.inactiveSelectionBackground": "#01060e",
 		"list.inactiveSelectionForeground": "#3d424d",
-		"list.invalidItemForeground": "#2e323c",
+		"list.invalidItemForeground": "#333841",
 		"activityBar.background": "#0a0e14",
 		"activityBar.foreground": "#3d424dcc",
 		"activityBar.border": "#0a0e14",
@@ -72,17 +72,19 @@
 		"editorLineNumber.foreground": "#3d424d99",
 		"editorLineNumber.activeForeground": "#3d424de6",
 		"editorCursor.foreground": "#e6b450",
-		"editor.selectionBackground": "#161f2a",
-		"editor.inactiveSelectionBackground": "#121922",
-		"editor.selectionHighlightBackground": "#121922",
-		"editor.selectionHighlightBorder": "#1d2936",
-		"editor.wordHighlightBackground": "#121922",
-		"editor.wordHighlightStrongBackground": "#e6b45033",
+		"editor.selectionBackground": "#273747",
+		"editor.inactiveSelectionBackground": "#1b2733",
+		"editor.selectionHighlightBackground": "#1b2733",
+		"editor.selectionHighlightBorder": "#304357",
+		"editor.wordHighlightBackground": "#6994bf12",
+		"editor.wordHighlightBorder": "#6994bf80",
+		"editor.wordHighlightStrongBackground": "#91b36212",
+		"editor.wordHighlightStrongBorder": "#91b36280",
 		"editor.findMatchBackground": "#e6b4500d",
 		"editor.findMatchBorder": "#e6b450",
 		"editor.findMatchHighlightBackground": "#e6b4500d",
 		"editor.findMatchHighlightBorder": "#e6b45059",
-		"editor.findRangeHighlightBackground": "#121922",
+		"editor.findRangeHighlightBackground": "#1b2733",
 		"editor.findRangeHighlightBorder": "#0a0e1400",
 		"editor.lineHighlightBackground": "#01060e",
 		"editorLink.activeForeground": "#e6b450",
@@ -150,13 +152,13 @@
 		"extensionButton.prominentBackground": "#e6b450",
 		"extensionButton.prominentHoverBackground": "#e1af4b",
 		"pickerGroup.border": "#01060e",
-		"pickerGroup.foreground": "#242831",
+		"pickerGroup.foreground": "#2c3038",
 		"debugToolBar.background": "#0d1016",
 		"walkThrough.embeddedEditorBackground": "#0d1016",
 		"gitDecoration.modifiedResourceForeground": "#6994bfb3",
 		"gitDecoration.deletedResourceForeground": "#d96c75b3",
 		"gitDecoration.untrackedResourceForeground": "#91b362b3",
-		"gitDecoration.ignoredResourceForeground": "#242831",
+		"gitDecoration.ignoredResourceForeground": "#2c3038",
 		"gitDecoration.conflictingResourceForeground": "",
 		"gitDecoration.submoduleResourceForeground": "#ffee99b3",
 		"settings.headerForeground": "#b3b1ad",
diff --git a/ayu-light-bordered.json b/ayu-light-bordered.json
index 5d6fdf18..248f1394 100644
--- a/ayu-light-bordered.json
+++ b/ayu-light-bordered.json
@@ -1,10 +1,10 @@
 {
 	"type": "light",
 	"colors": {
-		"focusBorder": "#bdc2c8",
+		"focusBorder": "#c4c7cc",
 		"foreground": "#959da6",
 		"widget.shadow": "#56606940",
-		"selection.background": "#e8eef4fd",
+		"selection.background": "#d3e5f4fd",
 		"textBlockQuote.background": "#ffffff",
 		"textLink.foreground": "#ff9940",
 		"textLink.activeForeground": "#ff9940",
@@ -14,11 +14,11 @@
 		"button.hoverBackground": "#f9943b",
 		"dropdown.background": "#ffffff",
 		"dropdown.foreground": "#959da6",
-		"dropdown.border": "#dcdee1",
-		"input.background": "#ffffff",
-		"input.border": "#dcdee1",
+		"dropdown.border": "#e1e2e4",
+		"input.background": "#f7f7f7",
+		"input.border": "#e1e2e4",
 		"input.foreground": "#6c7680",
-		"input.placeholderForeground": "#b3b9bf",
+		"input.placeholderForeground": "#b9bec3",
 		"inputOption.activeBorder": "#ff9940",
 		"inputValidation.errorBackground": "#fafafa",
 		"inputValidation.errorBorder": "#f51818",
@@ -42,7 +42,7 @@
 		"list.hoverForeground": "#959da6",
 		"list.inactiveSelectionBackground": "#959da61a",
 		"list.inactiveSelectionForeground": "#959da6",
-		"list.invalidItemForeground": "#b3b9bf",
+		"list.invalidItemForeground": "#b9bec3",
 		"activityBar.background": "#fafafa",
 		"activityBar.foreground": "#959da6cc",
 		"activityBar.border": "#959da61a",
@@ -72,17 +72,19 @@
 		"editorLineNumber.foreground": "#959da666",
 		"editorLineNumber.activeForeground": "#959da6cc",
 		"editorCursor.foreground": "#ff9940",
-		"editor.selectionBackground": "#e8eef4",
-		"editor.inactiveSelectionBackground": "#eff3f6",
-		"editor.selectionHighlightBackground": "#eff3f6",
-		"editor.selectionHighlightBorder": "#dee8f1",
-		"editor.wordHighlightBackground": "#eff3f6",
-		"editor.wordHighlightStrongBackground": "#ff994033",
+		"editor.selectionBackground": "#d3e5f4",
+		"editor.inactiveSelectionBackground": "#e9e9e9",
+		"editor.selectionHighlightBackground": "#e9e9e9",
+		"editor.selectionHighlightBorder": "#e2e2e2",
+		"editor.wordHighlightBackground": "#709ecc12",
+		"editor.wordHighlightBorder": "#709ecc80",
+		"editor.wordHighlightStrongBackground": "#99bf4d12",
+		"editor.wordHighlightStrongBorder": "#99bf4d80",
 		"editor.findMatchBackground": "#ff99400d",
 		"editor.findMatchBorder": "#ff9940",
 		"editor.findMatchHighlightBackground": "#ff99400d",
 		"editor.findMatchHighlightBorder": "#ff994059",
-		"editor.findRangeHighlightBackground": "#eff3f6",
+		"editor.findRangeHighlightBackground": "#e9e9e9",
 		"editor.findRangeHighlightBorder": "#fafafa00",
 		"editor.lineHighlightBackground": "#959da61a",
 		"editorLink.activeForeground": "#ff9940",
@@ -150,13 +152,13 @@
 		"extensionButton.prominentBackground": "#ff9940",
 		"extensionButton.prominentHoverBackground": "#f9943b",
 		"pickerGroup.border": "#959da61a",
-		"pickerGroup.foreground": "#c8ccd0",
+		"pickerGroup.foreground": "#ced1d4",
 		"debugToolBar.background": "#ffffff",
 		"walkThrough.embeddedEditorBackground": "#ffffff",
 		"gitDecoration.modifiedResourceForeground": "#709eccb3",
 		"gitDecoration.deletedResourceForeground": "#f27983b3",
 		"gitDecoration.untrackedResourceForeground": "#99bf4db3",
-		"gitDecoration.ignoredResourceForeground": "#c8ccd0",
+		"gitDecoration.ignoredResourceForeground": "#ced1d4",
 		"gitDecoration.conflictingResourceForeground": "",
 		"gitDecoration.submoduleResourceForeground": "#a37accb3",
 		"settings.headerForeground": "#6c7680",
diff --git a/ayu-light.json b/ayu-light.json
index 3f20d8b1..bcffbbef 100644
--- a/ayu-light.json
+++ b/ayu-light.json
@@ -1,10 +1,10 @@
 {
 	"type": "light",
 	"colors": {
-		"focusBorder": "#bdc2c8",
+		"focusBorder": "#c4c7cc",
 		"foreground": "#959da6",
 		"widget.shadow": "#56606940",
-		"selection.background": "#e8eef4fd",
+		"selection.background": "#d3e5f4fd",
 		"textBlockQuote.background": "#ffffff",
 		"textLink.foreground": "#ff9940",
 		"textLink.activeForeground": "#ff9940",
@@ -14,11 +14,11 @@
 		"button.hoverBackground": "#f9943b",
 		"dropdown.background": "#ffffff",
 		"dropdown.foreground": "#959da6",
-		"dropdown.border": "#dcdee1",
-		"input.background": "#ffffff",
-		"input.border": "#dcdee1",
+		"dropdown.border": "#e1e2e4",
+		"input.background": "#f7f7f7",
+		"input.border": "#e1e2e4",
 		"input.foreground": "#6c7680",
-		"input.placeholderForeground": "#b3b9bf",
+		"input.placeholderForeground": "#b9bec3",
 		"inputOption.activeBorder": "#ff9940",
 		"inputValidation.errorBackground": "#fafafa",
 		"inputValidation.errorBorder": "#f51818",
@@ -42,7 +42,7 @@
 		"list.hoverForeground": "#959da6",
 		"list.inactiveSelectionBackground": "#959da61a",
 		"list.inactiveSelectionForeground": "#959da6",
-		"list.invalidItemForeground": "#b3b9bf",
+		"list.invalidItemForeground": "#b9bec3",
 		"activityBar.background": "#fafafa",
 		"activityBar.foreground": "#959da6cc",
 		"activityBar.border": "#fafafa",
@@ -72,17 +72,19 @@
 		"editorLineNumber.foreground": "#959da666",
 		"editorLineNumber.activeForeground": "#959da6cc",
 		"editorCursor.foreground": "#ff9940",
-		"editor.selectionBackground": "#e8eef4",
-		"editor.inactiveSelectionBackground": "#eff3f6",
-		"editor.selectionHighlightBackground": "#eff3f6",
-		"editor.selectionHighlightBorder": "#dee8f1",
-		"editor.wordHighlightBackground": "#eff3f6",
-		"editor.wordHighlightStrongBackground": "#ff994033",
+		"editor.selectionBackground": "#d3e5f4",
+		"editor.inactiveSelectionBackground": "#e9e9e9",
+		"editor.selectionHighlightBackground": "#e9e9e9",
+		"editor.selectionHighlightBorder": "#e2e2e2",
+		"editor.wordHighlightBackground": "#709ecc12",
+		"editor.wordHighlightBorder": "#709ecc80",
+		"editor.wordHighlightStrongBackground": "#99bf4d12",
+		"editor.wordHighlightStrongBorder": "#99bf4d80",
 		"editor.findMatchBackground": "#ff99400d",
 		"editor.findMatchBorder": "#ff9940",
 		"editor.findMatchHighlightBackground": "#ff99400d",
 		"editor.findMatchHighlightBorder": "#ff994059",
-		"editor.findRangeHighlightBackground": "#eff3f6",
+		"editor.findRangeHighlightBackground": "#e9e9e9",
 		"editor.findRangeHighlightBorder": "#fafafa00",
 		"editor.lineHighlightBackground": "#959da61a",
 		"editorLink.activeForeground": "#ff9940",
@@ -150,13 +152,13 @@
 		"extensionButton.prominentBackground": "#ff9940",
 		"extensionButton.prominentHoverBackground": "#f9943b",
 		"pickerGroup.border": "#959da61a",
-		"pickerGroup.foreground": "#c8ccd0",
+		"pickerGroup.foreground": "#ced1d4",
 		"debugToolBar.background": "#ffffff",
 		"walkThrough.embeddedEditorBackground": "#ffffff",
 		"gitDecoration.modifiedResourceForeground": "#709eccb3",
 		"gitDecoration.deletedResourceForeground": "#f27983b3",
 		"gitDecoration.untrackedResourceForeground": "#99bf4db3",
-		"gitDecoration.ignoredResourceForeground": "#c8ccd0",
+		"gitDecoration.ignoredResourceForeground": "#ced1d4",
 		"gitDecoration.conflictingResourceForeground": "",
 		"gitDecoration.submoduleResourceForeground": "#a37accb3",
 		"settings.headerForeground": "#6c7680",
diff --git a/ayu-mirage-bordered.json b/ayu-mirage-bordered.json
index efbe2760..8e651fab 100644
--- a/ayu-mirage-bordered.json
+++ b/ayu-mirage-bordered.json
@@ -1,10 +1,10 @@
 {
 	"type": "dark",
 	"colors": {
-		"focusBorder": "#505867",
+		"focusBorder": "#596171",
 		"foreground": "#707a8c",
 		"widget.shadow": "#141925",
-		"selection.background": "#2a3546fd",
+		"selection.background": "#33415efd",
 		"textBlockQuote.background": "#232834",
 		"textLink.foreground": "#ffcc66",
 		"textLink.activeForeground": "#ffcc66",
@@ -14,11 +14,11 @@
 		"button.hoverBackground": "#fac761",
 		"dropdown.background": "#232834",
 		"dropdown.foreground": "#707a8c",
-		"dropdown.border": "#373e4c",
-		"input.background": "#232834",
-		"input.border": "#373e4c",
+		"dropdown.border": "#434957",
+		"input.background": "#1d222e",
+		"input.border": "#434957",
 		"input.foreground": "#cbccc6",
-		"input.placeholderForeground": "#586070",
+		"input.placeholderForeground": "#5f6878",
 		"inputOption.activeBorder": "#ffcc66",
 		"inputValidation.errorBackground": "#1f2430",
 		"inputValidation.errorBorder": "#ff3333",
@@ -42,7 +42,7 @@
 		"list.hoverForeground": "#707a8c",
 		"list.inactiveSelectionBackground": "#191e2a",
 		"list.inactiveSelectionForeground": "#707a8c",
-		"list.invalidItemForeground": "#586070",
+		"list.invalidItemForeground": "#5f6878",
 		"activityBar.background": "#1f2430",
 		"activityBar.foreground": "#707a8ccc",
 		"activityBar.border": "#191e2a",
@@ -72,17 +72,19 @@
 		"editorLineNumber.foreground": "#707a8c66",
 		"editorLineNumber.activeForeground": "#707a8ccc",
 		"editorCursor.foreground": "#ffcc66",
-		"editor.selectionBackground": "#2a3546",
-		"editor.inactiveSelectionBackground": "#262f3e",
-		"editor.selectionHighlightBackground": "#262f3e",
-		"editor.selectionHighlightBorder": "#313e52",
-		"editor.wordHighlightBackground": "#262f3e",
-		"editor.wordHighlightStrongBackground": "#ffcc6633",
+		"editor.selectionBackground": "#33415e",
+		"editor.inactiveSelectionBackground": "#323a4c",
+		"editor.selectionHighlightBackground": "#323a4c",
+		"editor.selectionHighlightBorder": "#323a4c",
+		"editor.wordHighlightBackground": "#77a8d912",
+		"editor.wordHighlightBorder": "#77a8d980",
+		"editor.wordHighlightStrongBackground": "#a6cc7012",
+		"editor.wordHighlightStrongBorder": "#a6cc7080",
 		"editor.findMatchBackground": "#ffcc660d",
 		"editor.findMatchBorder": "#ffcc66",
 		"editor.findMatchHighlightBackground": "#ffcc660d",
 		"editor.findMatchHighlightBorder": "#ffcc6659",
-		"editor.findRangeHighlightBackground": "#262f3e",
+		"editor.findRangeHighlightBackground": "#323a4c",
 		"editor.findRangeHighlightBorder": "#1f243000",
 		"editor.lineHighlightBackground": "#191e2a",
 		"editorLink.activeForeground": "#ffcc66",
@@ -150,13 +152,13 @@
 		"extensionButton.prominentBackground": "#ffcc66",
 		"extensionButton.prominentHoverBackground": "#fac761",
 		"pickerGroup.border": "#191e2a",
-		"pickerGroup.foreground": "#484f5e",
+		"pickerGroup.foreground": "#525a69",
 		"debugToolBar.background": "#232834",
 		"walkThrough.embeddedEditorBackground": "#232834",
 		"gitDecoration.modifiedResourceForeground": "#77a8d9b3",
 		"gitDecoration.deletedResourceForeground": "#f27983b3",
 		"gitDecoration.untrackedResourceForeground": "#a6cc70b3",
-		"gitDecoration.ignoredResourceForeground": "#484f5e",
+		"gitDecoration.ignoredResourceForeground": "#525a69",
 		"gitDecoration.conflictingResourceForeground": "",
 		"gitDecoration.submoduleResourceForeground": "#d4bfffb3",
 		"settings.headerForeground": "#cbccc6",
diff --git a/ayu-mirage.json b/ayu-mirage.json
index 22c491a7..eb2a3b5d 100644
--- a/ayu-mirage.json
+++ b/ayu-mirage.json
@@ -1,10 +1,10 @@
 {
 	"type": "dark",
 	"colors": {
-		"focusBorder": "#505867",
+		"focusBorder": "#596171",
 		"foreground": "#707a8c",
 		"widget.shadow": "#141925",
-		"selection.background": "#2a3546fd",
+		"selection.background": "#33415efd",
 		"textBlockQuote.background": "#232834",
 		"textLink.foreground": "#ffcc66",
 		"textLink.activeForeground": "#ffcc66",
@@ -14,11 +14,11 @@
 		"button.hoverBackground": "#fac761",
 		"dropdown.background": "#232834",
 		"dropdown.foreground": "#707a8c",
-		"dropdown.border": "#373e4c",
-		"input.background": "#232834",
-		"input.border": "#373e4c",
+		"dropdown.border": "#434957",
+		"input.background": "#1d222e",
+		"input.border": "#434957",
 		"input.foreground": "#cbccc6",
-		"input.placeholderForeground": "#586070",
+		"input.placeholderForeground": "#5f6878",
 		"inputOption.activeBorder": "#ffcc66",
 		"inputValidation.errorBackground": "#1f2430",
 		"inputValidation.errorBorder": "#ff3333",
@@ -42,7 +42,7 @@
 		"list.hoverForeground": "#707a8c",
 		"list.inactiveSelectionBackground": "#191e2a",
 		"list.inactiveSelectionForeground": "#707a8c",
-		"list.invalidItemForeground": "#586070",
+		"list.invalidItemForeground": "#5f6878",
 		"activityBar.background": "#1f2430",
 		"activityBar.foreground": "#707a8ccc",
 		"activityBar.border": "#1f2430",
@@ -72,17 +72,19 @@
 		"editorLineNumber.foreground": "#707a8c66",
 		"editorLineNumber.activeForeground": "#707a8ccc",
 		"editorCursor.foreground": "#ffcc66",
-		"editor.selectionBackground": "#2a3546",
-		"editor.inactiveSelectionBackground": "#262f3e",
-		"editor.selectionHighlightBackground": "#262f3e",
-		"editor.selectionHighlightBorder": "#313e52",
-		"editor.wordHighlightBackground": "#262f3e",
-		"editor.wordHighlightStrongBackground": "#ffcc6633",
+		"editor.selectionBackground": "#33415e",
+		"editor.inactiveSelectionBackground": "#323a4c",
+		"editor.selectionHighlightBackground": "#323a4c",
+		"editor.selectionHighlightBorder": "#323a4c",
+		"editor.wordHighlightBackground": "#77a8d912",
+		"editor.wordHighlightBorder": "#77a8d980",
+		"editor.wordHighlightStrongBackground": "#a6cc7012",
+		"editor.wordHighlightStrongBorder": "#a6cc7080",
 		"editor.findMatchBackground": "#ffcc660d",
 		"editor.findMatchBorder": "#ffcc66",
 		"editor.findMatchHighlightBackground": "#ffcc660d",
 		"editor.findMatchHighlightBorder": "#ffcc6659",
-		"editor.findRangeHighlightBackground": "#262f3e",
+		"editor.findRangeHighlightBackground": "#323a4c",
 		"editor.findRangeHighlightBorder": "#1f243000",
 		"editor.lineHighlightBackground": "#191e2a",
 		"editorLink.activeForeground": "#ffcc66",
@@ -150,13 +152,13 @@
 		"extensionButton.prominentBackground": "#ffcc66",
 		"extensionButton.prominentHoverBackground": "#fac761",
 		"pickerGroup.border": "#191e2a",
-		"pickerGroup.foreground": "#484f5e",
+		"pickerGroup.foreground": "#525a69",
 		"debugToolBar.background": "#232834",
 		"walkThrough.embeddedEditorBackground": "#232834",
 		"gitDecoration.modifiedResourceForeground": "#77a8d9b3",
 		"gitDecoration.deletedResourceForeground": "#f27983b3",
 		"gitDecoration.untrackedResourceForeground": "#a6cc70b3",
-		"gitDecoration.ignoredResourceForeground": "#484f5e",
+		"gitDecoration.ignoredResourceForeground": "#525a69",
 		"gitDecoration.conflictingResourceForeground": "",
 		"gitDecoration.submoduleResourceForeground": "#d4bfffb3",
 		"settings.headerForeground": "#cbccc6",
diff --git a/package-lock.json b/package-lock.json
index 40fc3dd8..07c905ff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,19 +1,34 @@
 {
-  "name": "ayus",
-  "version": "0.16.0",
+  "name": "ayu",
+  "version": "0.18.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "@types/chroma-js": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@types/chroma-js/-/chroma-js-1.4.0.tgz",
-      "integrity": "sha512-pY0EVvIUizkmvSZo9c74hska0Gv1vXzdGCQ8FoBBNpV8jtMUstu55VVa+AKtaQyUZOPRBralYzzqFRXVk4Iznw==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@types/chroma-js/-/chroma-js-1.4.3.tgz",
+      "integrity": "sha512-m33zg9cRLtuaUSzlbMrr7iLIKNzrD4+M6Unt5+9mCu4BhR5NwnRjVKblINCwzcBXooukIgld8DtEncP8qpvbNg==",
       "dev": true
     },
     "@types/node": {
-      "version": "10.11.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.11.1.tgz",
-      "integrity": "sha512-Mash7eQv0HOs/fBVywUGR7NLSXyMl3XHkIo/kcWBgD9ppwPYOp8UDFxZfKy9hWeVHT2p+69vgXTPbPpoeqoM8w==",
+      "version": "14.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.6.tgz",
+      "integrity": "sha512-FbNmu4F67d3oZMWBV6Y4MaPER+0EpE9eIYf2yaHhCWovc1dlXCZkqGX4NLHfVVr6umt20TNBdRzrNJIzIKfdbw==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
       "dev": true
     },
     "argparse": {
@@ -25,20 +40,27 @@
         "sprintf-js": "~1.0.2"
       }
     },
-    "arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true
-    },
     "ayu": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/ayu/-/ayu-7.0.2.tgz",
-      "integrity": "sha512-zz6uCxv4q3t8sPWVYMEKhhq/s1bH2IBPhUIA6VaOcoJejJnJKu+d5c1F2amw7gaEdxdzquX1q5mla6xRWn/Klw==",
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/ayu/-/ayu-7.2.2.tgz",
+      "integrity": "sha512-u+q2/fzHyOe6mpMyzfQYNJNjMknce23hGRHysbZSWaYEgeEdA+hkAzlNLfCc/3ltSQ+ZgZ9LYYpI3OI4LZwYOg==",
+      "dev": true,
+      "requires": {
+        "@types/chroma-js": "^1.4.1",
+        "chroma-js": "^2.0.3",
+        "nonenumerable": "^1.1.1"
+      }
+    },
+    "azure-devops-node-api": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-7.2.0.tgz",
+      "integrity": "sha512-pMfGJ6gAQ7LRKTHgiRF+8iaUUeGAI0c8puLaqHLc7B8AR7W6GJLozK9RFeUHFjEGybC9/EB3r67WPd7e46zQ8w==",
       "dev": true,
       "requires": {
-        "@types/chroma-js": "^1.3.3",
-        "chroma-js": "^1.4.0"
+        "os": "0.1.1",
+        "tunnel": "0.0.4",
+        "typed-rest-client": "1.2.0",
+        "underscore": "1.8.3"
       }
     },
     "balanced-match": {
@@ -75,14 +97,25 @@
       "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
       "dev": true
     },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
     "cheerio": {
-      "version": "1.0.0-rc.2",
-      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz",
-      "integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=",
+      "version": "1.0.0-rc.3",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz",
+      "integrity": "sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==",
       "dev": true,
       "requires": {
         "css-select": "~1.2.0",
-        "dom-serializer": "~0.1.0",
+        "dom-serializer": "~0.1.1",
         "entities": "~1.1.1",
         "htmlparser2": "^3.9.1",
         "lodash": "^4.15.0",
@@ -90,15 +123,33 @@
       }
     },
     "chroma-js": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/chroma-js/-/chroma-js-1.4.0.tgz",
-      "integrity": "sha512-5vBYGJkhSnK2SRZ0XkxwTL+TSRyP7PHIxjeg+1uce5qpNDRLLwAXcF12kIztas/BYakWPQhchzV4TKkiwKNd8Q==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/chroma-js/-/chroma-js-2.1.0.tgz",
+      "integrity": "sha512-uiRdh4ZZy+UTPSrAdp8hqEdVb1EllLtTHOt5TMaOjJUvi+O54/83Fc5K2ld1P+TJX+dw5B+8/sCgzI6eaur/lg==",
+      "dev": true,
+      "requires": {
+        "cross-env": "^6.0.3"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
     "commander": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.18.0.tgz",
-      "integrity": "sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==",
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
     "concat-map": {
@@ -107,11 +158,25 @@
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true
     },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
+    "cross-env": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-6.0.3.tgz",
+      "integrity": "sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.0"
+      }
+    },
+    "cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "requires": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      }
     },
     "css-select": {
       "version": "1.2.0",
@@ -126,9 +191,9 @@
       }
     },
     "css-what": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz",
-      "integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
       "dev": true
     },
     "denodeify": {
@@ -138,33 +203,25 @@
       "dev": true
     },
     "diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
       "dev": true
     },
     "dom-serializer": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-      "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
       "dev": true,
       "requires": {
-        "domelementtype": "~1.1.1",
-        "entities": "~1.1.1"
-      },
-      "dependencies": {
-        "domelementtype": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
-          "dev": true
-        }
+        "domelementtype": "^1.3.0",
+        "entities": "^1.1.1"
       }
     },
     "domelementtype": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
-      "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
       "dev": true
     },
     "domhandler": {
@@ -187,9 +244,15 @@
       }
     },
     "entities": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
-      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
       "dev": true
     },
     "fd-slicer": {
@@ -208,9 +271,9 @@
       "dev": true
     },
     "glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
       "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
@@ -221,18 +284,24 @@
         "path-is-absolute": "^1.0.0"
       }
     },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
     "htmlparser2": {
-      "version": "3.9.2",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
-      "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
       "dev": true,
       "requires": {
-        "domelementtype": "^1.3.0",
+        "domelementtype": "^1.3.1",
         "domhandler": "^2.3.0",
         "domutils": "^1.5.1",
         "entities": "^1.1.1",
         "inherits": "^2.0.1",
-        "readable-stream": "^2.0.2"
+        "readable-stream": "^3.1.1"
       }
     },
     "inflight": {
@@ -246,49 +315,63 @@
       }
     },
     "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
       "dev": true
     },
     "linkify-it": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz",
-      "integrity": "sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
+      "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
       "dev": true,
       "requires": {
         "uc.micro": "^1.0.1"
       }
     },
     "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
       "dev": true
     },
     "make-error": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.4.tgz",
-      "integrity": "sha512-0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g==",
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
       "dev": true
     },
     "markdown-it": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz",
-      "integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
+      "integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",
-        "entities": "~1.1.1",
+        "entities": "~2.0.0",
         "linkify-it": "^2.0.0",
         "mdurl": "^1.0.1",
         "uc.micro": "^1.0.5"
+      },
+      "dependencies": {
+        "entities": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.2.tgz",
+          "integrity": "sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw==",
+          "dev": true
+        }
       }
     },
     "mdurl": {
@@ -312,39 +395,22 @@
         "brace-expansion": "^1.1.7"
       }
     },
-    "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+    "mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
       "dev": true
     },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
-      "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        }
-      }
-    },
-    "mute-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+    "nonenumerable": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/nonenumerable/-/nonenumerable-1.1.1.tgz",
+      "integrity": "sha512-ptUD9w9D8WqW6fuJJkZNCImkf+0vdbgUTbRK3i7jsy3olqtH96hYE6Q/S3Tx9NWbcB/ocAjYshXCAUP0lZ9B4Q==",
       "dev": true
     },
     "nth-check": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
-      "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
       "dev": true,
       "requires": {
         "boolbase": "~1.0.0"
@@ -359,6 +425,12 @@
         "wrappy": "1"
       }
     },
+    "os": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/os/-/os-0.1.1.tgz",
+      "integrity": "sha1-IIhF6J4ZOtTZcUdLk5R3NqVtE/M=",
+      "dev": true
+    },
     "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
@@ -405,24 +477,18 @@
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "dev": true
     },
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true
+    },
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
       "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
       "dev": true
     },
-    "process-nextick-args": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-      "dev": true
-    },
-    "q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-      "dev": true
-    },
     "read": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
@@ -433,30 +499,41 @@
       }
     },
     "readable-stream": {
-      "version": "2.3.6",
-      "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
       "dev": true,
       "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
       }
     },
     "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
       "dev": true
     },
     "semver": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz",
-      "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==",
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true
+    },
+    "shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^3.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true
     },
     "source-map": {
@@ -466,9 +543,9 @@
       "dev": true
     },
     "source-map-support": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz",
-      "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==",
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
       "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
@@ -482,12 +559,21 @@
       "dev": true
     },
     "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
       "dev": true,
       "requires": {
-        "safe-buffer": "~5.1.0"
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
       }
     },
     "tmp": {
@@ -500,19 +586,16 @@
       }
     },
     "ts-node": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-7.0.0.tgz",
-      "integrity": "sha512-klJsfswHP0FuOLsvBZ/zzCfUvakOSSxds78mVeK7I+qP76YWtxf16hEZsp3U+b0kIo82R5UatGFeblYMqabb2Q==",
+      "version": "8.10.2",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz",
+      "integrity": "sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==",
       "dev": true,
       "requires": {
-        "arrify": "^1.0.0",
-        "buffer-from": "^1.1.0",
-        "diff": "^3.1.0",
+        "arg": "^4.1.0",
+        "diff": "^4.0.1",
         "make-error": "^1.1.1",
-        "minimist": "^1.2.0",
-        "mkdirp": "^0.5.1",
-        "source-map-support": "^0.5.6",
-        "yn": "^2.0.0"
+        "source-map-support": "^0.5.17",
+        "yn": "3.1.1"
       }
     },
     "tunnel": {
@@ -522,39 +605,31 @@
       "dev": true
     },
     "typed-rest-client": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-0.9.0.tgz",
-      "integrity": "sha1-92jMDcP06VDwbgSCXDaz54NKofI=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.2.0.tgz",
+      "integrity": "sha512-FrUshzZ1yxH8YwGR29PWWnfksLEILbWJydU7zfIRkyH7kAEzB62uMAl2WY6EyolWpLpVHeJGgQm45/MaruaHpw==",
       "dev": true,
       "requires": {
         "tunnel": "0.0.4",
         "underscore": "1.8.3"
-      },
-      "dependencies": {
-        "underscore": {
-          "version": "1.8.3",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-          "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=",
-          "dev": true
-        }
       }
     },
     "typescript": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz",
-      "integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
+      "version": "3.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.3.tgz",
+      "integrity": "sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==",
       "dev": true
     },
     "uc.micro": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.5.tgz",
-      "integrity": "sha512-JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
       "dev": true
     },
     "underscore": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
-      "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
+      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=",
       "dev": true
     },
     "url-join": {
@@ -570,17 +645,20 @@
       "dev": true
     },
     "vsce": {
-      "version": "1.51.0",
-      "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.51.0.tgz",
-      "integrity": "sha512-x8vr8pwh4H8WTAaAmRVQby1sXv+e3K5l2uDCNE5LAKM8KVs7xWS2e3KpxNr22R5ZMkYW2P36TP7KzyszSHnstA==",
+      "version": "1.75.0",
+      "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.75.0.tgz",
+      "integrity": "sha512-qyAQTmolxKWc9bV1z0yBTSH4WEIWhDueBJMKB0GUFD6lM4MiaU1zJ9BtzekUORZu094YeNSKz0RmVVuxfqPq0g==",
       "dev": true,
       "requires": {
+        "azure-devops-node-api": "^7.2.0",
+        "chalk": "^2.4.2",
         "cheerio": "^1.0.0-rc.1",
         "commander": "^2.8.1",
         "denodeify": "^1.2.1",
         "glob": "^7.0.6",
-        "lodash": "^4.17.10",
-        "markdown-it": "^8.3.1",
+        "leven": "^3.1.0",
+        "lodash": "^4.17.15",
+        "markdown-it": "^10.0.0",
         "mime": "^1.3.4",
         "minimatch": "^3.0.3",
         "osenv": "^0.1.3",
@@ -588,22 +666,19 @@
         "read": "^1.0.7",
         "semver": "^5.1.0",
         "tmp": "0.0.29",
+        "typed-rest-client": "1.2.0",
         "url-join": "^1.1.0",
-        "vso-node-api": "6.1.2-preview",
         "yauzl": "^2.3.1",
         "yazl": "^2.2.2"
       }
     },
-    "vso-node-api": {
-      "version": "6.1.2-preview",
-      "resolved": "https://registry.npmjs.org/vso-node-api/-/vso-node-api-6.1.2-preview.tgz",
-      "integrity": "sha1-qrNUbfJFHs2JTgcbuZtd8Zxfp48=",
+    "which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
       "requires": {
-        "q": "^1.0.1",
-        "tunnel": "0.0.4",
-        "typed-rest-client": "^0.9.0",
-        "underscore": "^1.8.3"
+        "isexe": "^2.0.0"
       }
     },
     "wrappy": {
@@ -623,18 +698,18 @@
       }
     },
     "yazl": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.3.tgz",
-      "integrity": "sha1-7CblzIfVYBud+EMtvdPNLlFzoHE=",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
+      "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
       "dev": true,
       "requires": {
         "buffer-crc32": "~0.2.3"
       }
     },
     "yn": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz",
-      "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
       "dev": true
     }
   }
diff --git a/package.json b/package.json
index 8146ae6c..54393e29 100644
--- a/package.json
+++ b/package.json
@@ -74,9 +74,9 @@
     "publish": "vsce publish"
   },
   "devDependencies": {
-    "ayu": "^7.0.2",
-    "ts-node": "^7.0.0",
-    "typescript": "^3.0.1",
-    "vsce": "^1.51.0"
+    "ayu": "^7.2.2",
+    "ts-node": "^8.10.2",
+    "typescript": "^3.9.3",
+    "vsce": "^1.75.0"
   }
 }
diff --git a/src/template.ts b/src/template.ts
index f44c7f0e..f02ad6e7 100644
--- a/src/template.ts
+++ b/src/template.ts
@@ -56,7 +56,7 @@ export default (variant: SchemeName, bordered: boolean) => {
       'dropdown.border': scheme.common.ui.fade(.7).hex(),
 
       // INPUT CONTROL
-      'input.background': scheme.ui.panel.bg.hex(),
+      'input.background': scheme.ui.panel.bg.darken(.15).hex(),
       'input.border': scheme.common.ui.fade(.7).hex(),
       'input.foreground': scheme.common.fg.hex(),
       'input.placeholderForeground': scheme.common.ui.fade(.3).hex(),
@@ -112,7 +112,7 @@ export default (variant: SchemeName, bordered: boolean) => {
       'editorGroup.background': scheme.ui.panel.bg.hex(),
       'editorGroupHeader.noTabsBackground': scheme.common.bg.hex(),
       'editorGroupHeader.tabsBackground': scheme.common.bg.hex(),
-      'editorGroupHeader.tabsBorder': bordered ?  scheme.ui.line.hex() : scheme.common.bg.hex(),
+      'editorGroupHeader.tabsBorder': bordered ? scheme.ui.line.hex() : scheme.common.bg.hex(),
       'tab.activeBackground': bordered ? scheme.ui.panel.bg.hex() : scheme.common.bg.hex(),
       'tab.activeForeground': scheme.common.fg.hex(),
       'tab.border': bordered ? scheme.ui.line.hex() : scheme.common.bg.hex(),
@@ -137,8 +137,10 @@ export default (variant: SchemeName, bordered: boolean) => {
       'editor.selectionHighlightBackground': scheme.ui.selection.inactive.hex(),
       'editor.selectionHighlightBorder': scheme.ui.selection.border.hex(),
 
-      'editor.wordHighlightBackground': scheme.ui.selection.inactive.hex(),
-      'editor.wordHighlightStrongBackground': scheme.common.accent.alpha(.2).hex(),
+      'editor.wordHighlightBackground': scheme.vcs.modified.alpha(.07).hex(),
+      'editor.wordHighlightBorder': scheme.vcs.modified.alpha(.5).hex(),
+      'editor.wordHighlightStrongBackground': scheme.vcs.added.alpha(.07).hex(),
+      'editor.wordHighlightStrongBorder': scheme.vcs.added.alpha(.5).hex(),
 
       'editor.findMatchBackground': scheme.common.accent.alpha(.05).hex(),
       'editor.findMatchBorder': scheme.common.accent.hex(),