diff --git a/src/vs/workbench/browser/parts/activitybar/media/activityaction.css b/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
index 17a45fdb6fc0f54ae668e597ba0f624833982cbe..0ae4319d8f6db003dfdaec63eee9699f5efa3ca7 100644
--- a/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
+++ b/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
@@ -101,7 +101,7 @@
 }
 
 /* Hides active elements in high contrast mode */
-.hc-black.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked .active-item-indicator {
+.monaco-workbench.hc-black .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked .active-item-indicator {
 	display: none;
 }
 
@@ -120,8 +120,8 @@
 }
 
 /* Hides outline on HC as focus is handled by border */
-.hc-black.monaco-workbench .activitybar.left > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before,
-.hc-black.monaco-workbench .activitybar.right > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before {
+.monaco-workbench.hc-black .activitybar.left > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before,
+.monaco-workbench.hc-black .activitybar.right > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before {
 	outline: none;
 }
 
diff --git a/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css b/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
index 9ce5c0db6d77c91bf01dda763d3693017c4a21f1..0acaed95a1cedea8a07c71c455f4a544b764310c 100644
--- a/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
@@ -211,7 +211,7 @@
 	text-overflow: clip;
 }
 
-.hc-black.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink > .monaco-icon-label > .monaco-icon-label-container {
+.monaco-workbench.hc-black .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink > .monaco-icon-label > .monaco-icon-label-container {
 	text-overflow: ellipsis;
 }
 
diff --git a/src/vs/workbench/browser/parts/editor/media/titlecontrol.css b/src/vs/workbench/browser/parts/editor/media/titlecontrol.css
index 6e7c61073822822313cf56a4ce5981f52c9c59f1..ac6dc47d50f9da9182d2b31ab718444b7f556a47 100644
--- a/src/vs/workbench/browser/parts/editor/media/titlecontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/titlecontrol.css
@@ -40,8 +40,8 @@
 	background-repeat: no-repeat;
 }
 
-.hc-black.monaco-workbench .part.editor > .content .editor-group-container > .title .title-actions .action-label,
-.hc-black.monaco-workbench .part.editor > .content .editor-group-container > .title .editor-actions .action-label:not(.codicon) {
+.monaco-workbench.hc-black .part.editor > .content .editor-group-container > .title .title-actions .action-label,
+.monaco-workbench.hc-black .part.editor > .content .editor-group-container > .title .editor-actions .action-label:not(.codicon) {
 	line-height: initial;
 }
 
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkEdit.css b/src/vs/workbench/contrib/bulkEdit/browser/bulkEdit.css
index 04abcacd156522bcf89c32ecfe3b2d7c4272ddc0..aa88a067d338a4edb074c8c2d7cb9f761c1b0b1e 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/bulkEdit.css
+++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkEdit.css
@@ -70,10 +70,10 @@
 	min-width: 16px;
 }
 
-.vs-dark.monaco-workbench .bulk-edit-panel .monaco-tl-contents.category .uri-icon,
-.hc-black.monaco-workbench .bulk-edit-panel .monaco-tl-contents.category .uri-icon,
-.vs-dark.monaco-workbench .bulk-edit-panel .monaco-tl-contents.textedit .uri-icon,
-.hc-black.monaco-workbench .bulk-edit-panel .monaco-tl-contents.textedit .uri-icon
+.monaco-workbench.vs-dark .bulk-edit-panel .monaco-tl-contents.category .uri-icon,
+.monaco-workbench.hc-black .bulk-edit-panel .monaco-tl-contents.category .uri-icon,
+.monaco-workbench.vs-dark .bulk-edit-panel .monaco-tl-contents.textedit .uri-icon,
+.monaco-workbench.hc-black .bulk-edit-panel .monaco-tl-contents.textedit .uri-icon
 {
 	background-image: var(--background-dark);
 }
diff --git a/src/vs/workbench/contrib/feedback/browser/media/feedback.css b/src/vs/workbench/contrib/feedback/browser/media/feedback.css
index feb2c31de5afa57c600496529134ddf4a5cfb824..409ebc60eb29526b6e51c8c674c5505f4133fd2c 100644
--- a/src/vs/workbench/contrib/feedback/browser/media/feedback.css
+++ b/src/vs/workbench/contrib/feedback/browser/media/feedback.css
@@ -115,8 +115,8 @@
 }
 
 /* Theming */
-.vs.monaco-workbench .feedback-form .feedback-alias,
-.vs.monaco-workbench .feedback-form .feedback-description {
+.monaco-workbench.vs .feedback-form .feedback-alias,
+.monaco-workbench.vs .feedback-form .feedback-description {
 	font-family: inherit;
 	border: 1px solid transparent;
 }
@@ -168,17 +168,17 @@
 	background-color: #E51400;
 }
 
-.vs-dark.monaco-workbench .feedback-form h3 {
+.monaco-workbench.vs-dark .feedback-form h3 {
 	font-weight: normal;
 	font-size: 1.2em;
 }
 
-.vs-dark.monaco-workbench .feedback-form .sentiment:hover {
+.monaco-workbench.vs-dark .feedback-form .sentiment:hover {
 	background-color: rgba(30,30,30,0.8);
 }
 
-.vs-dark.monaco-workbench .feedback-form .feedback-alias,
-.vs-dark.monaco-workbench .feedback-form .feedback-description {
+.monaco-workbench.vs-dark .feedback-form .feedback-alias,
+.monaco-workbench.vs-dark .feedback-form .feedback-description {
 	font-family: inherit;
 }
 
@@ -195,29 +195,29 @@
 }
 
 /* High Contrast Theming */
-.hc-black.monaco-workbench .feedback-form {
+.monaco-workbench.hc-black .feedback-form {
 	outline: 2px solid #6fc3df;
 	outline-offset: -2px;
 }
 
-.hc-black.monaco-workbench .feedback-form .feedback-alias,
-.hc-black.monaco-workbench .feedback-form .feedback-description {
+.monaco-workbench.hc-black .feedback-form .feedback-alias,
+.monaco-workbench.hc-black .feedback-form .feedback-description {
 	font-family: inherit;
 }
 
-.hc-black.monaco-workbench .feedback-form .content .contactus {
+.monaco-workbench.hc-black .feedback-form .content .contactus {
 	padding: 10px;
 	float: right;
 }
 
-.hc-black.monaco-workbench .feedback-form .form-buttons .send,
-.hc-black.monaco-workbench .feedback-form .form-buttons .send.in-progress,
-.hc-black.monaco-workbench .feedback-form .form-buttons .send.success {
+.monaco-workbench.hc-black .feedback-form .form-buttons .send,
+.monaco-workbench.hc-black .feedback-form .form-buttons .send.in-progress,
+.monaco-workbench.hc-black .feedback-form .form-buttons .send.success {
 	background-color: #0C141F;
 	color: #D4D4D4;
 	border: 1px solid #6FC3DF;
 }
 
-.hc-black.monaco-workbench .feedback-form .form-buttons .send:hover {
+.monaco-workbench.hc-black .feedback-form .form-buttons .send:hover {
 	background-color: #0C141F;
 }
diff --git a/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css b/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css
index 9d31e1b0713f70a19fb80896e7a056497f21a256..2caadb1ae2e298eeb708fb602913649449b56d24 100644
--- a/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css
+++ b/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css
@@ -95,6 +95,6 @@
 }
 
 /* High Contrast Theming */
-.hc-black.monaco-workbench .explorer-viewlet .explorer-item {
+.monaco-workbench.hc-black .explorer-viewlet .explorer-item {
 	line-height: 20px;
 }
diff --git a/src/vs/workbench/contrib/files/browser/views/media/openeditors.css b/src/vs/workbench/contrib/files/browser/views/media/openeditors.css
index ada27840f38720dcad13c86c02460dfb30d20af6..ee672533ae4705613ac29471762873fcb73ac5c2 100644
--- a/src/vs/workbench/contrib/files/browser/views/media/openeditors.css
+++ b/src/vs/workbench/contrib/files/browser/views/media/openeditors.css
@@ -81,7 +81,7 @@
 	overflow: hidden;
 }
 
-.hc-black.monaco-workbench .open-editors .open-editor,
-.hc-black.monaco-workbench .open-editors .editor-group {
+.monaco-workbench.hc-black .open-editors .open-editor,
+.monaco-workbench.hc-black .open-editors .editor-group {
 	line-height: 20px;
 }
diff --git a/src/vs/workbench/contrib/search/browser/media/searchview.css b/src/vs/workbench/contrib/search/browser/media/searchview.css
index aa19592c488f440b15e778f16464491a147a59c6..6d744386c7c1bbfa1d5798d16b932008f7826bb3 100644
--- a/src/vs/workbench/contrib/search/browser/media/searchview.css
+++ b/src/vs/workbench/contrib/search/browser/media/searchview.css
@@ -282,8 +282,8 @@
 	white-space: pre;
 }
 
-.hc-black.monaco-workbench .search-view .replaceMatch,
-.hc-black.monaco-workbench .search-view .findInFileMatch {
+.monaco-workbench.hc-black .search-view .replaceMatch,
+.monaco-workbench.hc-black .search-view .findInFileMatch {
 	background: none !important;
 	box-sizing: border-box;
 }
@@ -309,9 +309,9 @@
 
 /* High Contrast Theming */
 
-.hc-black.monaco-workbench .search-view .foldermatch,
-.hc-black.monaco-workbench .search-view .filematch,
-.hc-black.monaco-workbench .search-view .linematch {
+.monaco-workbench.hc-black .search-view .foldermatch,
+.monaco-workbench.hc-black .search-view .filematch,
+.monaco-workbench.hc-black .search-view .linematch {
 	line-height: 20px;
 }
 
diff --git a/src/vs/workbench/contrib/terminal/browser/media/terminal.css b/src/vs/workbench/contrib/terminal/browser/media/terminal.css
index c38020d1becf5e9abd01591918d3e9d7ffb39609..43de91e60fbe155249028cfa322f1871994c89a9 100644
--- a/src/vs/workbench/contrib/terminal/browser/media/terminal.css
+++ b/src/vs/workbench/contrib/terminal/browser/media/terminal.css
@@ -119,8 +119,8 @@
 	outline: none;
 }
 
-.hc-black.monaco-workbench .pane-body.integrated-terminal .xterm.focus::before,
-.hc-black.monaco-workbench .pane-body.integrated-terminal .xterm:focus::before {
+.monaco-workbench.hc-black .pane-body.integrated-terminal .xterm.focus::before,
+.monaco-workbench.hc-black .pane-body.integrated-terminal .xterm:focus::before {
 	display: block;
 	content: "";
 	border: 1px solid;
@@ -132,8 +132,8 @@
 	z-index: 10;
 }
 
-.hc-black.monaco-workbench .pane-body.integrated-terminal .monaco-split-view2.horizontal .split-view-view:not(:only-child) .xterm.focus::before,
-.hc-black.monaco-workbench .pane-body.integrated-terminal .monaco-split-view2.horizontal .split-view-view:not(:only-child) .xterm:focus::before {
+.monaco-workbench.hc-black .pane-body.integrated-terminal .monaco-split-view2.horizontal .split-view-view:not(:only-child) .xterm.focus::before,
+.monaco-workbench.hc-black .pane-body.integrated-terminal .monaco-split-view2.horizontal .split-view-view:not(:only-child) .xterm:focus::before {
 	right: 0;
 }
 
@@ -147,8 +147,8 @@
 	opacity: 0 !important;
 }
 
-.vs-dark.monaco-workbench.mac .pane-body.integrated-terminal .terminal-outer-container:not(.alt-active) .terminal:not(.enable-mouse-events),
-.hc-black.monaco-workbench.mac .pane-body.integrated-terminal .terminal-outer-container:not(.alt-active) .terminal:not(.enable-mouse-events) {
+.monaco-workbench.vs-dark.mac .pane-body.integrated-terminal .terminal-outer-container:not(.alt-active) .terminal:not(.enable-mouse-events),
+.monaco-workbench.hc-black.mac .pane-body.integrated-terminal .terminal-outer-container:not(.alt-active) .terminal:not(.enable-mouse-events) {
 	cursor: -webkit-image-set(url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAL0lEQVQoz2NgCD3x//9/BhBYBWdhgFVAiVW4JBFKGIa4AqD0//9D3pt4I4tAdAMAHTQ/j5Zom30AAAAASUVORK5CYII=') 1x, url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAAz0lEQVRIx2NgYGBY/R8I/vx5eelX3n82IJ9FxGf6tksvf/8FiTMQAcAGQMDvSwu09abffY8QYSAScNk45G198eX//yev73/4///701eh//kZSARckrNBRvz//+8+6ZohwCzjGNjdgQxkAg7B9WADeBjIBqtJCbhRA0YNoIkBSNmaPEMoNmA0FkYNoFKhapJ6FGyAH3nauaSmPfwI0v/3OukVi0CIZ+F25KrtYcx/CTIy0e+rC7R1Z4KMICVTQQ14feVXIbR695u14+Ir4gwAAD49E54wc1kWAAAAAElFTkSuQmCC') 2x) 5 8, text;
 }
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
index d5e48000dae593f62030c1b9de253344caf97e5d..4d942a3cd0fc04e2cef726e9865846f67cf41db9 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -1484,8 +1484,8 @@ registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) =
 	const border = theme.getColor(activeContrastBorder);
 	if (border) {
 		collector.addRule(`
-			.hc-black.monaco-workbench .pane-body.integrated-terminal .xterm.focus::before,
-			.hc-black.monaco-workbench .pane-body.integrated-terminal .xterm:focus::before { border-color: ${border}; }`
+			.monaco-workbench.hc-black .pane-body.integrated-terminal .xterm.focus::before,
+			.monaco-workbench.hc-black .pane-body.integrated-terminal .xterm:focus::before { border-color: ${border}; }`
 		);
 	}
 
diff --git a/src/vs/workbench/contrib/watermark/browser/watermark.css b/src/vs/workbench/contrib/watermark/browser/watermark.css
index 0008573344767898985b844df7e215472e750fe6..aa84eaefc72042bcc1cf37ddfef43425bb2213cd 100644
--- a/src/vs/workbench/contrib/watermark/browser/watermark.css
+++ b/src/vs/workbench/contrib/watermark/browser/watermark.css
@@ -60,15 +60,15 @@
 	color: rgba(0,0,0,.68);
 }
 
-.vs-dark.monaco-workbench .part.editor > .content.empty > .watermark dt,
-.vs-dark.monaco-workbench .part.editor > .content.empty > .watermark dl {
+.monaco-workbench.vs-dark .part.editor > .content.empty > .watermark dt,
+.monaco-workbench.vs-dark .part.editor > .content.empty > .watermark dl {
 	color: rgba(255,255,255,.6);
 }
 
-.hc-black.monaco-workbench .part.editor > .content.empty > .watermark dt {
+.monaco-workbench.hc-black .part.editor > .content.empty > .watermark dt {
 	color: #FFF;
 }
-.hc-black.monaco-workbench .part.editor > .content.empty > .watermark dl {
+.monaco-workbench.hc-black .part.editor > .content.empty > .watermark dl {
 	color: #FFF;
 	opacity: 1;
 }
diff --git a/src/vs/workbench/contrib/welcome/overlay/browser/welcomeOverlay.css b/src/vs/workbench/contrib/welcome/overlay/browser/welcomeOverlay.css
index 4fb1ae7b8e4602d842cb7458bd45adcc72c1d96a..a7b446b83a9b060a14d15eeafc41cc62f410d01a 100644
--- a/src/vs/workbench/contrib/welcome/overlay/browser/welcomeOverlay.css
+++ b/src/vs/workbench/contrib/welcome/overlay/browser/welcomeOverlay.css
@@ -26,9 +26,9 @@
 	opacity: .4;
 }
 
-.hc-black.monaco-workbench.blur-background #workbench\.parts\.panel,
-.hc-black.monaco-workbench.blur-background #workbench\.parts\.sidebar,
-.hc-black.monaco-workbench.blur-background #workbench\.parts\.editor {
+.monaco-workbench.hc-black.blur-background #workbench\.parts\.panel,
+.monaco-workbench.hc-black.blur-background #workbench\.parts\.sidebar,
+.monaco-workbench.hc-black.blur-background #workbench\.parts\.editor {
 	opacity: .2;
 }
 
@@ -154,8 +154,8 @@
 	background-size: 100%;
 }
 
-.vs-dark.monaco-workbench > .welcomeOverlay > .commandPalettePlaceholder,
-.hc-black.monaco-workbench > .welcomeOverlay > .commandPalettePlaceholder {
+.monaco-workbench.vs-dark > .welcomeOverlay > .commandPalettePlaceholder,
+.monaco-workbench.hc-black > .welcomeOverlay > .commandPalettePlaceholder {
 	background-image: url('media/commandpalette-dark.svg');
 }
 @media screen and (max-width: 880px) {
diff --git a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.css b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.css
index 0cf39b62a0e413b6f9e1834e91bccf75ff3df341..738ce140c1af76ee0017c59cc883578e966f5348 100644
--- a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.css
+++ b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.css
@@ -76,7 +76,7 @@
 	display: block;
 }
 
-.hc-black.monaco-workbench .part.editor > .content .welcomePage .subtitle {
+.monaco-workbench.hc-black .part.editor > .content .welcomePage .subtitle {
 	font-weight: 200;
 }
 
@@ -184,7 +184,7 @@
 	border: none;
 }
 
-.hc-black.monaco-workbench .part.editor > .content .welcomePage .commands .item button > h3 {
+.monaco-workbench.hc-black .part.editor > .content .welcomePage .commands .item button > h3 {
 	font-weight: bold;
 }
 
@@ -193,12 +193,12 @@
 	outline-width: 1px;
 }
 
-.hc-black.monaco-workbench .part.editor > .content .welcomePage .commands .item button {
+.monaco-workbench.hc-black .part.editor > .content .welcomePage .commands .item button {
 	border-width: 1px;
 	border-style: solid;
 }
 
-.hc-black.monaco-workbench .part.editor > .content .welcomePage .commands .item button:hover {
+.monaco-workbench.hc-black .part.editor > .content .welcomePage .commands .item button:hover {
 	outline-width: 1px;
 	outline-style: dashed;
 	outline-offset: -5px;
diff --git a/src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughPart.css b/src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughPart.css
index 8eec65b76b7a5eaf8d5bfb0a29358e2ec07f1658..e2a46b3799aab3581773485221fcdfc4fdd11fd3 100644
--- a/src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughPart.css
+++ b/src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughPart.css
@@ -134,7 +134,7 @@
 	display: initial;
 }
 
-.hc-black.monaco-workbench .part.editor > .content .walkThroughContent .monaco-editor {
+.monaco-workbench.hc-black .part.editor > .content .walkThroughContent .monaco-editor {
 	border-width: 1px;
 	border-style: solid;
 }