diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html
index 9bf87281e2c..9c7defe5af3 100644
--- a/src/vs/code/browser/workbench/workbench.html
+++ b/src/vs/code/browser/workbench/workbench.html
@@ -4,29 +4,32 @@
 	<head>
 		<meta charset="utf-8" />
 
-		<link rel="icon" href="/favicon.ico" type="image/x-icon" />
-
 		<!-- Disable pinch zooming -->
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
 
-		<meta http-equiv="Content-Security-Policy"
-		content="default-src 'none'; img-src 'self' https: data: blob:; media-src 'none'; frame-src 'self' {{WEBVIEW_ENDPOINT}} https://*.vscode-webview-test.com; script-src 'self' https://az416426.vo.msecnd.net 'unsafe-eval' https:; style-src 'self' 'unsafe-inline'; connect-src 'self' ws: wss: https:; font-src 'self' blob:;">
+		<!-- Content Security Policy -->
+		<meta
+			http-equiv="Content-Security-Policy"
+			content="default-src 'none'; img-src 'self' https: data: blob:; media-src 'none'; frame-src 'self' {{WEBVIEW_ENDPOINT}} https://*.vscode-webview-test.com; script-src 'self' https://az416426.vo.msecnd.net 'unsafe-eval' https:; style-src 'self' 'unsafe-inline'; connect-src 'self' ws: wss: https:; font-src 'self' blob:;"
+		>
 
+		<!-- Workbench Configuration -->
 		<meta id="vscode-workbench-web-configuration" data-settings="{{WORKBENCH_WEB_CONGIGURATION}}">
 
-		<!-- Workaround to pass remote user data uri-->
+		<!-- Workarounds/Hacks (remote user data uri, product configuration ) -->
 		<meta id="vscode-remote-user-data-uri" data-settings="{{REMOTE_USER_DATA_URI}}">
-
-		<!-- Workaround to pass product configuration-->
 		<meta id="vscode-remote-product-configuration" data-settings="{{PRODUCT_CONFIGURATION}}">
+
+		<!-- Workbench Icon/CSS -->
+		<link rel="icon" href="/favicon.ico" type="image/x-icon" />
+		<link data-name="vs/workbench/workbench.web.api" rel="stylesheet" href="./static/out/vs/workbench/workbench.web.api.css">
 	</head>
 
 	<body aria-label="">
 	</body>
 
-	<!-- Require our AMD loader -->
+	<!-- Startup (do not modify order of script tags!) -->
 	<script src="./static/out/vs/loader.js"></script>
-
-	<!-- Startup via workbench.js -->
+	<script src="./static/out/vs/workbench/workbench.web.api.nls.js"></script>
 	<script src="./static/out/vs/code/browser/workbench/workbench.js"></script>
 </html>
diff --git a/src/vs/workbench/workbench.web.main.css b/src/vs/workbench/workbench.web.api.css
similarity index 94%
rename from src/vs/workbench/workbench.web.main.css
rename to src/vs/workbench/workbench.web.api.css
index 06ed8a197b2..3a0641938d5 100644
--- a/src/vs/workbench/workbench.web.main.css
+++ b/src/vs/workbench/workbench.web.api.css
@@ -4,6 +4,3 @@
  *--------------------------------------------------------------------------------------------*/
 
 /* NOTE: THIS FILE WILL BE OVERWRITTEN DURING BUILD TIME, DO NOT EDIT */
-
-div.monaco.main.css {
-}
\ No newline at end of file
diff --git a/src/vs/workbench/workbench.web.main.nls.js b/src/vs/workbench/workbench.web.api.nls.js
similarity index 96%
rename from src/vs/workbench/workbench.web.main.nls.js
rename to src/vs/workbench/workbench.web.api.nls.js
index d6a8b487eaf..6113d093d5c 100644
--- a/src/vs/workbench/workbench.web.main.nls.js
+++ b/src/vs/workbench/workbench.web.api.nls.js
@@ -4,5 +4,3 @@
  *--------------------------------------------------------------------------------------------*/
 
 // NOTE: THIS FILE WILL BE OVERWRITTEN DURING BUILD TIME, DO NOT EDIT
-
-define([], {});
\ No newline at end of file
