diff --git a/src/vs/base/browser/ui/checkbox/checkbox.css b/src/vs/base/browser/ui/checkbox/checkbox.css
index 92be50c8e20..936b3ffceb5 100644
--- a/src/vs/base/browser/ui/checkbox/checkbox.css
+++ b/src/vs/base/browser/ui/checkbox/checkbox.css
@@ -59,5 +59,5 @@
 }
 
 .hc-black .custom-checkbox.checked {
-	border: 1px solid #DF740C;
+	border: 1px solid #f38518;
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/list/list.css b/src/vs/base/browser/ui/list/list.css
index 3ce77e94e15..415dd8154ea 100644
--- a/src/vs/base/browser/ui/list/list.css
+++ b/src/vs/base/browser/ui/list/list.css
@@ -45,14 +45,14 @@
 /* Hover */
 .monaco-list-row:hover { background-color: #F0F0F0; }
 .vs-dark .monaco-list-row:hover { background-color: rgba(255, 255, 255, 0.08); }
-.hc-black .monaco-list-row:hover { border: 1px dashed #DF740C; }
+.hc-black .monaco-list-row:hover { border: 1px dashed #f38518; }
 
 /* Selection */
 .monaco-list-row.selected { background-color: #4FA7FF; color: white; }
 .vs-dark .monaco-list-row.selected { background-color: #0E639C; color: white; }
-.hc-black .monaco-list-row.selected { border: 1px solid #DF740C; }
+.hc-black .monaco-list-row.selected { border: 1px solid #f38518; }
 
 /* Focus */
 .monaco-list-row.focused { background-color: #DCEBFC; }
 .vs-dark .monaco-list-row.focused { background-color: #073655; }
-.hc-black .monaco-list-row.focused { border: 1px dotted #DF740C; }
+.hc-black .monaco-list-row.focused { border: 1px dotted #f38518; }
diff --git a/src/vs/base/browser/ui/menu/menu.css b/src/vs/base/browser/ui/menu/menu.css
index d467efa87b6..c8ca4a65e05 100644
--- a/src/vs/base/browser/ui/menu/menu.css
+++ b/src/vs/base/browser/ui/menu/menu.css
@@ -90,7 +90,7 @@
 
 /* Context Menu */
 
-.context-view.monaco-menu-container {	
+.context-view.monaco-menu-container {
 	font-family: "Segoe WPC", "Segoe UI", "SFUIText-Light", "HelveticaNeue-Light", sans-serif, "Droid Sans Fallback";
 	outline: 0;
 	box-shadow: 0 2px 8px #A8A8A8;
@@ -106,9 +106,9 @@
 
 .ie.ie9 .context-view.monaco-menu-container {
 	box-shadow: 0 2px 8px 2px #A8A8A8;
-}	
+}
 
-.context-view.monaco-menu-container :focus {	
+.context-view.monaco-menu-container :focus {
 	outline: 0;
 }
 
@@ -121,14 +121,14 @@
 	background-color: #3A3A3A;
 }
 
-.vs-dark .context-view.monaco-menu-container {	
+.vs-dark .context-view.monaco-menu-container {
 	box-shadow: 0 2px 8px #000;
 	color: #BBB;
-	background-color: #2D2F31; 
+	background-color: #2D2F31;
 }
 
 /* High Contrast Theming */
-.hc-black .context-view.monaco-menu-container {	
+.hc-black .context-view.monaco-menu-container {
 	border: 2px solid #6FC3DF;
 	color: white;
 	background-color: #0C141F;
@@ -137,10 +137,10 @@
 
 .hc-black .monaco-menu .monaco-action-bar.vertical .action-item.focused {
 	background: none;
-	border: 1px dotted #DF740C;
+	border: 1px dotted #f38518;
 }
 
 .hc-black .monaco-menu .monaco-action-bar.vertical .action-item:hover:not(.disabled) {
 	background: none;
-	border: 1px dashed #DF740C;
+	border: 1px dashed #f38518;
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/scrollbar/media/scrollbars.css b/src/vs/base/browser/ui/scrollbar/media/scrollbars.css
index 8df68299314..d266daa5ef1 100644
--- a/src/vs/base/browser/ui/scrollbar/media/scrollbars.css
+++ b/src/vs/base/browser/ui/scrollbar/media/scrollbars.css
@@ -90,13 +90,13 @@
 .hc-black .monaco-scrollable-element > .scrollbar > .slider {
 	background: none;
 	border: 20px solid #6FC3DF;
-	opacity: .3;
+	opacity: .4;
 }
 
 .hc-black .monaco-scrollable-element > .scrollbar > .slider:hover {
-	opacity: .35;
+	opacity: .85;
 }
 
 .hc-black .monaco-scrollable-element > .scrollbar > .slider.active {
-	opacity: .4;
+	opacity: .9;
 }
\ No newline at end of file
diff --git a/src/vs/base/parts/tree/browser/tree.css b/src/vs/base/parts/tree/browser/tree.css
index 628d9f34143..e61799d06e1 100644
--- a/src/vs/base/parts/tree/browser/tree.css
+++ b/src/vs/base/parts/tree/browser/tree.css
@@ -199,12 +199,12 @@
 
 /* High Contrast Theming */
 .hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row 														{ background: none !important; }
-.hc-black .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.focused:not(.highlighted) 						{ border: 1px dotted #DF740C; }
-.hc-black .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected:not(.highlighted) 					{ border: 1px solid #DF740C; }
-.hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row.selected:not(.highlighted)  							{ border: 1px solid #DF740C; }
-.hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row:hover:not(.highlighted):not(.selected):not(.focused)  	{ border: 1px dashed #DF740C; }
+.hc-black .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.focused:not(.highlighted) 						{ border: 1px dotted #f38518; }
+.hc-black .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected:not(.highlighted) 					{ border: 1px solid #f38518; }
+.hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row.selected:not(.highlighted)  							{ border: 1px solid #f38518; }
+.hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row:hover:not(.highlighted):not(.selected):not(.focused)  	{ border: 1px dashed #f38518; margin-top:-1px; margin-bottom:1px; margin-left:-1px; }
 .hc-black .monaco-tree .monaco-tree-wrapper.drop-target,
-.hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row.drop-target											{ background: none !important; border: 1px dashed #DF740C; }
+.hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row.drop-target											{ background: none !important; border: 1px dashed #f38518; }
 
 .hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row.has-children > .content:before	{
 	border: none;
diff --git a/src/vs/editor/browser/widget/media/tokens.css b/src/vs/editor/browser/widget/media/tokens.css
index 5c92135c39c..125d74f05af 100644
--- a/src/vs/editor/browser/widget/media/tokens.css
+++ b/src/vs/editor/browser/widget/media/tokens.css
@@ -523,7 +523,7 @@
 
 .monaco-editor.hc-black .token.builtin.function					{ color: #569CD6; }
 
-.monaco-editor.hc-black .token.comment							{ color: #608B4E; }
+.monaco-editor.hc-black .token.comment							{ color: #7ca668; }
 
 .monaco-editor.hc-black .token.constant							{ color: #569CD6; }
 .monaco-editor.hc-black .token.constant.language				{ color: #569CD6; }
diff --git a/src/vs/editor/contrib/find/browser/findWidget.css b/src/vs/editor/contrib/find/browser/findWidget.css
index fe1be6abfae..c954f1f95df 100644
--- a/src/vs/editor/contrib/find/browser/findWidget.css
+++ b/src/vs/editor/contrib/find/browser/findWidget.css
@@ -406,7 +406,7 @@
 
 .monaco-editor.hc-black .findMatch {
 	background: none;
-	border: 1px dotted #DF740C;
+	border: 1px dotted #f38518;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 }
@@ -414,14 +414,14 @@
 .monaco-editor.hc-black .currentFindMatch {
 	background: none;
 	padding: 1px;
-	border: 2px solid #DF740C;
+	border: 2px solid #f38518;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 }
 
 .monaco-editor.hc-black .findScope {
 	background: none;
-	border: 1px dashed #DF740C;
+	border: 1px dashed #f38518;
 	opacity: .4;
 }
 
diff --git a/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.css b/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.css
index c7a6882bc88..953dcf26e97 100644
--- a/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.css
+++ b/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.css
@@ -169,7 +169,7 @@
 
 .monaco-editor.hc-black .reference-zone-widget .preview .reference-decoration {
 	background: none;
-	border: 2px solid #DF740C;
+	border: 2px solid #f38518;
 }
 
 .monaco-editor.hc-black .reference-zone-widget .tree {
@@ -194,5 +194,5 @@
 
 .monaco-editor.hc-black .reference-zone-widget .tree .referenceMatch {
 	background: none;
-	border: 1px dotted #DF740C;
+	border: 1px dotted #f38518;
 }
\ No newline at end of file
diff --git a/src/vs/editor/css/hc-black-theme.css b/src/vs/editor/css/hc-black-theme.css
index 0602430700b..681a1a8b7f7 100644
--- a/src/vs/editor/css/hc-black-theme.css
+++ b/src/vs/editor/css/hc-black-theme.css
@@ -34,9 +34,8 @@
 }
 .monaco-editor.hc-black.focused .current-line {
 	background: none;
-	border: 2px solid #DF740C;
+	border: 2px solid #f38518;
 	box-sizing: border-box;
-	opacity: .5;
 }
 
 /* Highlight a line */
@@ -46,11 +45,9 @@
 
 /* Selection */
 .monaco-editor.hc-black .view-overlays.focused .selected-text {
-	border: 2px solid #DF740C;
-	background: none;
+	background: white;
 	box-sizing: border-box;
 	border-radius: 0;
-	opacity: .5;
 }
 .monaco-editor.hc-black .view-overlays .selected-text {
 	background: none;
@@ -69,6 +66,13 @@
 	border-bottom-right-radius: 0;
 }
 
+.monaco-editor.hc-black .selectionHighlight {
+	background: none;
+	border: 1px dotted #f38518;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
 /* Squigglies */
 .monaco-editor.hc-black .redsquiggly {
 	background: none;
@@ -136,7 +140,7 @@
 .monaco-editor.hc-black .snippet-placeholder		{ background-color: rgba(124, 124, 124, 0.1); }
 .monaco-editor.hc-black .finish-snippet-placeholder	{ outline: #525252 solid 1px; }
 
-/* Scrollbar */
+/* Scrollbar */    /* TODO: many of these are not doing anything, not specific enough.  Clean up */
 .hc-black.monaco-scrollable-element .slider {
 	background: none;
 	border: 20px solid #6FC3DF;
@@ -185,4 +189,7 @@
 	background: none;
 }
 
-/* Tokens colors are defined in tokens.css */
\ No newline at end of file
+/* Tokens colors are defined in tokens.css */
+.monaco-editor.hc-black .token {
+	mix-blend-mode: difference;
+}
diff --git a/src/vs/workbench/browser/parts/activitybar/media/activityaction.css b/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
index 165cbbcfd67..bc8f291e640 100644
--- a/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
+++ b/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
@@ -48,7 +48,7 @@
 
 .monaco-workbench.hc-black > .activitybar > .content .monaco-action-bar .badge:active:before,
 .monaco-workbench.hc-black > .activitybar > .content .monaco-action-bar .action-item .action-label:focus:before {
-	border-left-color: #DF740C;
+	border-left-color: #f38518;
 }
 
 .monaco-workbench > .activitybar.left > .content .monaco-action-bar .badge:active:before,
@@ -153,7 +153,7 @@
 }
 
 .monaco-workbench.hc-black > .activitybar > .content .monaco-action-bar .action-item .action-label.active:before {
-	border: 1px solid #DF740C;
+	outline: 1px solid #f38518;
 }
 
 .monaco-workbench.hc-black > .activitybar > .content .monaco-action-bar.global .action-item .action-label.active:before {
diff --git a/src/vs/workbench/electron-browser/media/shell.css b/src/vs/workbench/electron-browser/media/shell.css
index 8d5f27d5f89..4175fd64b75 100644
--- a/src/vs/workbench/electron-browser/media/shell.css
+++ b/src/vs/workbench/electron-browser/media/shell.css
@@ -80,8 +80,12 @@
 .monaco-shell.hc-black input[type="submit"]:focus,
 .monaco-shell.hc-black input[type="text"]:focus, .monaco-shell.hc-black textarea:focus,
 .monaco-shell.hc-black input[type="checkbox"]:focus {
-	outline: 2px solid #DF740C;
-	outline-offset: -2px;
+	outline: 2px solid #f38518;
+	outline-offset: -1px;
+}
+
+.monaco-shell.hc-black .synthetic-focus input {
+	background:transparent; /* Search input focus fix when in high contrast */
 }
 
 .monaco-shell.vs .monaco-tree.focused .monaco-tree-row.focused [tabindex="0"]:focus {
@@ -114,7 +118,7 @@
 }
 
 .monaco-shell.hc-black .monaco-tree.focused.no-focused-item:focus:before {
-	outline: 2px solid #DF740C; /* we still need to handle the empty tree or no focus item case */
+	outline: 2px solid #f38518; /* we still need to handle the empty tree or no focus item case */
 	outline-offset: -2px;
 }
 
diff --git a/src/vs/workbench/parts/feedback/browser/media/feedback.css b/src/vs/workbench/parts/feedback/browser/media/feedback.css
index 11e4edfd130..efd58797e96 100644
--- a/src/vs/workbench/parts/feedback/browser/media/feedback.css
+++ b/src/vs/workbench/parts/feedback/browser/media/feedback.css
@@ -369,7 +369,7 @@
 }
 
 .monaco-shell.hc-black .feedback-form .sentiment.checked {
-	border: 1px solid #DF740C;
+	border: 1px solid #f38518;
 }
 
 .monaco-shell.hc-black .feedback-form .sentiment:before {
diff --git a/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts b/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts
index b46352bbed7..d10773607e6 100644
--- a/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts
+++ b/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts
@@ -12,7 +12,6 @@ import {SyncActionDescriptor} from 'vs/platform/actions/common/actions';
 import {IMessageService, Severity} from 'vs/platform/message/common/message';
 import {IStorageService, StorageScope} from 'vs/platform/storage/common/storage';
 import platform = require('vs/platform/platform');
-import commonPlatform = require('vs/base/common/platform');
 import workbenchActionRegistry = require('vs/workbench/common/actionRegistry');
 import Themes = require('vs/platform/theme/common/themes');
 import {IQuickOpenService, IPickOpenEntry} from 'vs/workbench/services/quickopen/common/quickOpenService';
@@ -44,7 +43,7 @@ class SelectThemeAction extends actions.Action {
 			let currentTheme = this.storageService.get(Constants.Preferences.THEME, StorageScope.GLOBAL, DEFAULT_THEME_ID);
 
 			let picks: IPickOpenEntry[] = [];
-			Themes.getBaseThemes(commonPlatform.isWindows).forEach(baseTheme => {
+			Themes.getBaseThemes(true).forEach(baseTheme => {
 				picks.push({ label: Themes.toLabel(baseTheme), id: Themes.toId(baseTheme) });
 			});