diff --git a/.github/calendar.yml b/.github/calendar.yml
index 7bc555c3f6e..7deb804acb4 100644
--- a/.github/calendar.yml
+++ b/.github/calendar.yml
@@ -1,5 +1,8 @@
 {
-  '2018-01-30T00:00Z': 'endgame',
-  '2018-02-07T20:00Z': 'release',
-  '2018-02-12T20:00Z': 'development',
+  '2018-01-29 18:00, US/Pacific':    'endgame',
+  '2018-02-07 12:00, US/Pacific':    'release', # 1.20.0
+  '2018-02-12 12:00, US/Pacific':    'development',
+  '2018-02-14 16:00, Europe/Zurich': 'release', # 1.20.1
+  '2018-02-19 16:00, Europe/Zurich': 'development',
+  '2018-02-26 18:00, US/Pacific':    'endgame',
 }
\ No newline at end of file
diff --git a/.github/commands.yml b/.github/commands.yml
index 8076f05fd1f..ba8c8d7f3ce 100644
--- a/.github/commands.yml
+++ b/.github/commands.yml
@@ -56,5 +56,11 @@
             action: 'updateLabels',
             addLabel: 'confirmed'
         },
+        {
+            type: 'comment',
+            name: 'findDuplicates',
+            action: 'comment',
+            comment: "Potential duplicates:\n${potentialDuplicates}"
+        },
     ]
 }
diff --git a/.github/similarity.yml b/.github/similarity.yml
new file mode 100644
index 00000000000..cd51cd2da64
--- /dev/null
+++ b/.github/similarity.yml
@@ -0,0 +1,5 @@
+{
+    perform: true,
+    whenCreatedByTeam: false,
+    comment: "(Experimental duplicate detection)\nThanks for submitting this issue. Please also check if it is already covered by an existing one, like:\n${potentialDuplicates}"
+}
diff --git a/.travis.yml b/.travis.yml
index d789e84c612..693cdcbb4d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,8 @@ cache:
 notifications:
   email: false
   webhooks:
-    - http://vscode-probot.westus.cloudapp.azure.com:3450/travis/notifications
-    - http://vscode-test-probot.westus.cloudapp.azure.com:3450/travis/notifications
+    - https://vscode-probot.westus.cloudapp.azure.com:7890/travis/notifications
+    - https://vscode-test-probot.westus.cloudapp.azure.com:7890/travis/notifications
 
 addons:
   apt:
diff --git a/build/builtInExtensions.json b/build/builtInExtensions.json
index 5c05672fc78..47453c14afb 100644
--- a/build/builtInExtensions.json
+++ b/build/builtInExtensions.json
@@ -1,7 +1,7 @@
 [
 	{
 		"name": "ms-vscode.node-debug",
-		"version": "1.21.1",
+		"version": "1.21.2",
 		"repo": "https://github.com/Microsoft/vscode-node-debug"
 	},
 	{
diff --git a/build/builtin/browser-main.js b/build/builtin/browser-main.js
index 160bac61968..83a5ba4e592 100644
--- a/build/builtin/browser-main.js
+++ b/build/builtin/browser-main.js
@@ -6,6 +6,7 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+// @ts-ignore review
 const { remote } = require('electron');
 const dialog = remote.dialog;
 
@@ -13,6 +14,7 @@ const builtInExtensionsPath = path.join(__dirname, '..', 'builtInExtensions.json
 const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
 
 function readJson(filePath) {
+	//@ts-ignore review
 	return JSON.parse(fs.readFileSync(filePath));
 }
 
diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js
index 1a09abd4f55..f282b006cd8 100644
--- a/build/gulpfile.editor.js
+++ b/build/gulpfile.editor.js
@@ -12,6 +12,7 @@ var File = require('vinyl');
 
 var root = path.dirname(__dirname);
 var sha1 = util.getVersion(root);
+// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 var semver = require('./monaco/package.json').version;
 var headerVersion = semver + '(' + sha1 + ')';
 
@@ -21,14 +22,14 @@ var editorEntryPoints = [
 	{
 		name: 'vs/editor/editor.main',
 		include: [],
-		exclude: [ 'vs/css', 'vs/nls' ],
-		prepend: [ 'out-build/vs/css.js', 'out-build/vs/nls.js' ],
+		exclude: ['vs/css', 'vs/nls'],
+		prepend: ['out-build/vs/css.js', 'out-build/vs/nls.js'],
 	},
 	{
 		name: 'vs/base/common/worker/simpleWorker',
-		include: [ 'vs/editor/common/services/editorSimpleWorker' ],
-		prepend: [ 'vs/loader.js' ],
-		append: [ 'vs/base/worker/workerMain' ],
+		include: ['vs/editor/common/services/editorSimpleWorker'],
+		prepend: ['vs/loader.js'],
+		append: ['vs/base/worker/workerMain'],
 		dest: 'vs/base/worker/workerMain.js'
 	}
 ];
@@ -79,14 +80,15 @@ gulp.task('optimize-editor', ['clean-optimized-editor', 'compile-client-build'],
 	bundleLoader: false,
 	header: BUNDLED_FILE_HEADER,
 	bundleInfo: true,
-	out: 'out-editor'
+	out: 'out-editor',
+	languages: undefined
 }));
 
 gulp.task('clean-minified-editor', util.rimraf('out-editor-min'));
 gulp.task('minify-editor', ['clean-minified-editor', 'optimize-editor'], common.minifyTask('out-editor'));
 
 gulp.task('clean-editor-distro', util.rimraf('out-monaco-editor-core'));
-gulp.task('editor-distro', ['clean-editor-distro', 'minify-editor', 'optimize-editor'], function() {
+gulp.task('editor-distro', ['clean-editor-distro', 'minify-editor', 'optimize-editor'], function () {
 	return es.merge(
 		// other assets
 		es.merge(
@@ -97,7 +99,7 @@ gulp.task('editor-distro', ['clean-editor-distro', 'minify-editor', 'optimize-ed
 
 		// package.json
 		gulp.src('build/monaco/package.json')
-			.pipe(es.through(function(data) {
+			.pipe(es.through(function (data) {
 				var json = JSON.parse(data.contents.toString());
 				json.private = false;
 				data.contents = new Buffer(JSON.stringify(json, null, '  '));
@@ -107,7 +109,7 @@ gulp.task('editor-distro', ['clean-editor-distro', 'minify-editor', 'optimize-ed
 
 		// README.md
 		gulp.src('build/monaco/README-npm.md')
-			.pipe(es.through(function(data) {
+			.pipe(es.through(function (data) {
 				this.emit('data', new File({
 					path: data.path.replace(/README-npm\.md/, 'README.md'),
 					base: data.base,
@@ -124,10 +126,10 @@ gulp.task('editor-distro', ['clean-editor-distro', 'minify-editor', 'optimize-ed
 		// min folder
 		es.merge(
 			gulp.src('out-editor-min/**/*')
-		).pipe(filterStream(function(path) {
+		).pipe(filterStream(function (path) {
 			// no map files
 			return !/(\.js\.map$)|(nls\.metadata\.json$)|(bundleInfo\.json$)/.test(path);
-		})).pipe(es.through(function(data) {
+		})).pipe(es.through(function (data) {
 			// tweak the sourceMappingURL
 			if (!/\.js$/.test(data.path)) {
 				this.emit('data', data);
@@ -147,42 +149,43 @@ gulp.task('editor-distro', ['clean-editor-distro', 'minify-editor', 'optimize-ed
 		// min-maps folder
 		es.merge(
 			gulp.src('out-editor-min/**/*')
-		).pipe(filterStream(function(path) {
+		).pipe(filterStream(function (path) {
 			// no map files
 			return /\.js\.map$/.test(path);
 		})).pipe(gulp.dest('out-monaco-editor-core/min-maps'))
 	);
 });
 
-gulp.task('analyze-editor-distro', function() {
+gulp.task('analyze-editor-distro', function () {
+	// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 	var bundleInfo = require('../out-editor/bundleInfo.json');
 	var graph = bundleInfo.graph;
 	var bundles = bundleInfo.bundles;
 
 	var inverseGraph = {};
-	Object.keys(graph).forEach(function(module) {
+	Object.keys(graph).forEach(function (module) {
 		var dependencies = graph[module];
-		dependencies.forEach(function(dep) {
+		dependencies.forEach(function (dep) {
 			inverseGraph[dep] = inverseGraph[dep] || [];
 			inverseGraph[dep].push(module);
 		});
 	});
 
 	var detailed = {};
-	Object.keys(bundles).forEach(function(entryPoint) {
+	Object.keys(bundles).forEach(function (entryPoint) {
 		var included = bundles[entryPoint];
 		var includedMap = {};
-		included.forEach(function(included) {
+		included.forEach(function (included) {
 			includedMap[included] = true;
 		});
 
 		var explanation = [];
-		included.map(function(included) {
+		included.map(function (included) {
 			if (included.indexOf('!') >= 0) {
 				return;
 			}
 
-			var reason = (inverseGraph[included]||[]).filter(function(mod) {
+			var reason = (inverseGraph[included] || []).filter(function (mod) {
 				return !!includedMap[mod];
 			});
 			explanation.push({
@@ -198,7 +201,7 @@ gulp.task('analyze-editor-distro', function() {
 });
 
 function filterStream(testFunc) {
-	return es.through(function(data) {
+	return es.through(function (data) {
 		if (!testFunc(data.relative)) {
 			return;
 		}
diff --git a/build/gulpfile.extensions.js b/build/gulpfile.extensions.js
index 55094f4f449..ac1b08c6fd2 100644
--- a/build/gulpfile.extensions.js
+++ b/build/gulpfile.extensions.js
@@ -31,7 +31,7 @@ const compilations = glob.sync('**/tsconfig.json', {
 
 const getBaseUrl = out => `https://ticino.blob.core.windows.net/sourcemaps/${commit}/${out}`;
 
-const languages = i18n.defaultLanguages.concat(process.env.VSCODE_QUALITY !== 'stable' ? i18n.extraLanguages: []);
+const languages = i18n.defaultLanguages.concat(process.env.VSCODE_QUALITY !== 'stable' ? i18n.extraLanguages : []);
 
 const tasks = compilations.map(function (tsconfigFile) {
 	const absolutePath = path.join(extensionsPath, tsconfigFile);
@@ -94,8 +94,11 @@ const tasks = compilations.map(function (tsconfigFile) {
 					sourceRoot: '../src'
 				}))
 				.pipe(tsFilter.restore)
+				// @ts-ignore review
 				.pipe(build ? nlsDev.createAdditionalLanguageFiles(languages, i18nPath, out) : es.through())
+				// @ts-ignore review
 				.pipe(build ? nlsDev.bundleMetaDataFiles(headerId, headerOut) : es.through())
+				// @ts-ignore review
 				.pipe(build ? nlsDev.bundleLanguageFiles() : es.through())
 				.pipe(reporter.end(emitError));
 
@@ -143,6 +146,7 @@ const tasks = compilations.map(function (tsconfigFile) {
 		const watchInput = watcher(src, srcOpts);
 
 		return watchInput
+			// @ts-ignore review
 			.pipe(util.incremental(() => pipeline(true), input))
 			.pipe(gulp.dest(out));
 	});
diff --git a/build/gulpfile.hygiene.js b/build/gulpfile.hygiene.js
index ec9108dc67f..edefbf721a4 100644
--- a/build/gulpfile.hygiene.js
+++ b/build/gulpfile.hygiene.js
@@ -151,8 +151,8 @@ gulp.task('tslint', () => {
 
 	return vfs.src(all, { base: '.', follow: true, allowEmpty: true })
 		.pipe(filter(tslintFilter))
-		.pipe(gulptslint({ rulesDirectory: 'build/lib/tslint' }))
-		.pipe(gulptslint.report(options));
+		.pipe(gulptslint.default({ rulesDirectory: 'build/lib/tslint' }))
+		.pipe(gulptslint.default.report(options));
 });
 
 const hygiene = exports.hygiene = (some, options) => {
@@ -202,6 +202,11 @@ const hygiene = exports.hygiene = (some, options) => {
 			verify: true,
 			tsfmt: true,
 			// verbose: true
+			// keep checkJS happy
+			editorconfig: undefined,
+			replace: undefined,
+			tsconfig: undefined,
+			tslint: undefined
 		}).then(result => {
 			if (result.error) {
 				console.error(result.message);
@@ -261,12 +266,12 @@ const hygiene = exports.hygiene = (some, options) => {
 			const tslintResult = linter.getResult();
 			if (tslintResult.failures.length > 0) {
 				for (const failure of tslintResult.failures) {
-					const name = failure.name || failure.fileName;
-					const position = failure.startPosition;
-					const line = position.lineAndCharacter ? position.lineAndCharacter.line : position.line;
-					const character = position.lineAndCharacter ? position.lineAndCharacter.character : position.character;
+					const name = failure.getFailure() || failure.getFileName;
+					const position = failure.getStartPosition();
+					const line = position.getLineAndCharacter().line;
+					const character = position.getLineAndCharacter().character;
 
-					console.error(`${name}:${line + 1}:${character + 1}:${failure.failure}`);
+					console.error(`${name}:${line + 1}:${character + 1}:${failure.getFailure()}`);
 				}
 
 				errorCount += tslintResult.failures.length;
diff --git a/build/gulpfile.mixin.js b/build/gulpfile.mixin.js
index abf3ce4a90c..a370981ab3c 100644
--- a/build/gulpfile.mixin.js
+++ b/build/gulpfile.mixin.js
@@ -14,6 +14,8 @@ const util = require('./lib/util');
 const remote = require('gulp-remote-src');
 const zip = require('gulp-vinyl-zip');
 const assign = require('object-assign');
+
+// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const pkg = require('../package.json');
 
 gulp.task('mixin', function () {
@@ -54,6 +56,7 @@ gulp.task('mixin', function () {
 			.pipe(util.rebase(2))
 			.pipe(productJsonFilter)
 			.pipe(buffer())
+			// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 			.pipe(json(o => assign({}, require('../product.json'), o)))
 			.pipe(productJsonFilter.restore);
 
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 69c7b1b4af9..849a8a1018d 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -27,7 +27,9 @@ const common = require('./lib/optimize');
 const nlsDev = require('vscode-nls-dev');
 const root = path.dirname(__dirname);
 const commit = util.getVersion(root);
+// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const packageJson = require('../package.json');
+// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const product = require('../product.json');
 const crypto = require('crypto');
 const i18n = require('./lib/i18n');
@@ -37,6 +39,7 @@ const getElectronVersion = require('./lib/electron').getElectronVersion;
 // const createAsar = require('./lib/asar').createAsar;
 
 const productionDependencies = deps.getProductionDependencies(path.dirname(__dirname));
+//@ts-ignore review
 const baseModules = Object.keys(process.binding('natives')).filter(n => !/^_|\//.test(n));
 const nodeModules = ['electron', 'original-fs']
 	.concat(Object.keys(product.dependencies || {}))
@@ -44,8 +47,8 @@ const nodeModules = ['electron', 'original-fs']
 	.concat(baseModules);
 
 // Build
-
-const builtInExtensions = require('./builtInExtensions');
+// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
+const builtInExtensions = require('./builtInExtensions.json');
 
 const excludedExtensions = [
 	'vscode-api-tests',
@@ -104,6 +107,8 @@ gulp.task('optimize-vscode', ['clean-optimized-vscode', 'compile-build', 'compil
 	header: BUNDLED_FILE_HEADER,
 	out: 'out-vscode',
 	languages: languages,
+	// @ts-ignore review
+	bundleInfo: undefined
 }));
 
 
@@ -245,6 +250,7 @@ function packageTask(platform, arch, opts) {
 				// 	// TODO@Dirk: this filter / buffer is here to make sure the nls.json files are buffered
 				.pipe(nlsFilter)
 				.pipe(buffer())
+				//@ts-ignore review
 				.pipe(nlsDev.createAdditionalLanguageFiles(languages, path.join(__dirname, '..', 'i18n')))
 				.pipe(nlsFilter.restore);
 		}));
@@ -297,6 +303,7 @@ function packageTask(platform, arch, opts) {
 			.pipe(util.cleanNodeModule('native-is-elevated', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node']))
 			.pipe(util.cleanNodeModule('native-watchdog', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
 			.pipe(util.cleanNodeModule('spdlog', ['binding.gyp', 'build/**', 'deps/**', 'src/**', 'test/**'], ['**/*.node']))
+			//@ts-ignore review
 			.pipe(util.cleanNodeModule('jschardet', ['dist/**']))
 			.pipe(util.cleanNodeModule('windows-foreground-love', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
 			.pipe(util.cleanNodeModule('windows-process-tree', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
@@ -305,7 +312,7 @@ function packageTask(platform, arch, opts) {
 			.pipe(util.cleanNodeModule('node-pty', ['binding.gyp', 'build/**', 'src/**', 'tools/**'], ['build/Release/*.exe', 'build/Release/*.dll', 'build/Release/*.node']))
 			.pipe(util.cleanNodeModule('nsfw', ['binding.gyp', 'build/**', 'src/**', 'openpa/**', 'includes/**'], ['**/*.node', '**/*.a']))
 			.pipe(util.cleanNodeModule('vsda', ['binding.gyp', 'README.md', 'build/**', '*.bat', '*.sh', '*.cpp', '*.h'], ['build/Release/vsda.node']));
-			// .pipe(createAsar(path.join(process.cwd(), 'node_modules'), ['**/*.node', '**/vscode-ripgrep/bin/*', '**/node-pty/build/Release/*'], 'app/node_modules.asar'));
+		// .pipe(createAsar(path.join(process.cwd(), 'node_modules'), ['**/*.node', '**/vscode-ripgrep/bin/*', '**/node-pty/build/Release/*'], 'app/node_modules.asar'));
 
 		let all = es.merge(
 			packageJsonStream,
@@ -401,7 +408,7 @@ const apiHostname = process.env.TRANSIFEX_API_URL;
 const apiName = process.env.TRANSIFEX_API_NAME;
 const apiToken = process.env.TRANSIFEX_API_TOKEN;
 
-gulp.task('vscode-translations-push', [ 'optimize-vscode' ], function () {
+gulp.task('vscode-translations-push', ['optimize-vscode'], function () {
 	const pathToMetadata = './out-vscode/nls.metadata.json';
 	const pathToExtensions = './extensions/*';
 	const pathToSetup = 'build/win32/**/{Default.isl,messages.en.isl}';
@@ -411,10 +418,10 @@ gulp.task('vscode-translations-push', [ 'optimize-vscode' ], function () {
 		gulp.src(pathToSetup).pipe(i18n.createXlfFilesForIsl()),
 		gulp.src(pathToExtensions).pipe(i18n.createXlfFilesForExtensions())
 	).pipe(i18n.findObsoleteResources(apiHostname, apiName, apiToken)
-		).pipe(i18n.pushXlfFiles(apiHostname, apiName, apiToken));
+	).pipe(i18n.pushXlfFiles(apiHostname, apiName, apiToken));
 });
 
-gulp.task('vscode-translations-push-test', [ 'optimize-vscode' ], function () {
+gulp.task('vscode-translations-push-test', ['optimize-vscode'], function () {
 	const pathToMetadata = './out-vscode/nls.metadata.json';
 	const pathToExtensions = './extensions/*';
 	const pathToSetup = 'build/win32/**/{Default.isl,messages.en.isl}';
@@ -424,7 +431,7 @@ gulp.task('vscode-translations-push-test', [ 'optimize-vscode' ], function () {
 		gulp.src(pathToSetup).pipe(i18n.createXlfFilesForIsl()),
 		gulp.src(pathToExtensions).pipe(i18n.createXlfFilesForExtensions())
 	).pipe(i18n.findObsoleteResources(apiHostname, apiName, apiToken)
-		).pipe(vfs.dest('../vscode-transifex-input'));
+	).pipe(vfs.dest('../vscode-transifex-input'));
 });
 
 gulp.task('vscode-translations-pull', function () {
@@ -439,6 +446,7 @@ gulp.task('vscode-translations-pull', function () {
 gulp.task('vscode-translations-import', function () {
 	[...i18n.defaultLanguages, ...i18n.extraLanguages].forEach(language => {
 		gulp.src(`../vscode-localization/${language.id}/build/*/*.xlf`)
+			//@ts-ignore review
 			.pipe(i18n.prepareI18nFiles(language))
 			.pipe(vfs.dest(`./i18n/${language.folderName}`));
 		gulp.src(`../vscode-localization/${language.id}/setup/*/*.xlf`)
@@ -470,6 +478,7 @@ gulp.task('upload-vscode-sourcemaps', ['minify-vscode'], () => {
 const allConfigDetailsPath = path.join(os.tmpdir(), 'configuration.json');
 gulp.task('upload-vscode-configuration', ['generate-vscode-configuration'], () => {
 	const branch = process.env.BUILD_SOURCEBRANCH;
+	//@ts-ignore review
 	if (!branch.endsWith('/master') && branch.indexOf('/release/') < 0) {
 		console.log(`Only runs on master and release branches, not ${branch}`);
 		return;
diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
index 28f062bf749..a658758de98 100644
--- a/build/gulpfile.vscode.linux.js
+++ b/build/gulpfile.vscode.linux.js
@@ -12,9 +12,12 @@ const shell = require('gulp-shell');
 const es = require('event-stream');
 const vfs = require('vinyl-fs');
 const util = require('./lib/util');
+// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const packageJson = require('../package.json');
+// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const product = require('../product.json');
-const rpmDependencies = require('../resources/linux/rpm/dependencies');
+// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
+const rpmDependencies = require('../resources/linux/rpm/dependencies.json');
 
 const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
 
diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
index 15459f7dae8..636d9e8300b 100644
--- a/build/gulpfile.vscode.win32.js
+++ b/build/gulpfile.vscode.win32.js
@@ -11,7 +11,9 @@ const assert = require('assert');
 const cp = require('child_process');
 const _7z = require('7zip')['7z'];
 const util = require('./lib/util');
+// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const pkg = require('../package.json');
+// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const product = require('../product.json');
 const vfs = require('vinyl-fs');
 
@@ -78,7 +80,7 @@ gulp.task('vscode-win32-x64-setup', ['clean-vscode-win32-x64-setup'], buildWin32
 
 function archiveWin32Setup(arch) {
 	return cb => {
-		const args = ['a', '-tzip', zipPath(arch), '.', '-r', '-x!inno_updater.exe'];
+		const args = ['a', '-tzip', zipPath(arch), '.', '-r'];
 
 		cp.spawn(_7z, args, { stdio: 'inherit', cwd: buildPath(arch) })
 			.on('error', cb)
@@ -94,8 +96,8 @@ gulp.task('vscode-win32-x64-archive', ['clean-vscode-win32-x64-archive'], archiv
 
 function copyInnoUpdater(arch) {
 	return () => {
-		return gulp.src('build/win32/inno_updater.exe', { base: 'build/win32' })
-			.pipe(vfs.dest(buildPath(arch)));
+		return gulp.src('build/win32/{inno_updater.exe,vcruntime140.dll}', { base: 'build/win32' })
+			.pipe(vfs.dest(path.join(buildPath(arch), 'tools')));
 	};
 }
 
diff --git a/build/lib/builtInExtensions.js b/build/lib/builtInExtensions.js
index 245509379c1..c538416ce4d 100644
--- a/build/lib/builtInExtensions.js
+++ b/build/lib/builtInExtensions.js
@@ -17,7 +17,8 @@ const ext = require('./extensions');
 const util = require('gulp-util');
 
 const root = path.dirname(path.dirname(__dirname));
-const builtInExtensions = require('../builtInExtensions');
+// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
+const builtInExtensions = require('../builtInExtensions.json');
 const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
 
 function getExtensionPath(extension) {
@@ -34,6 +35,7 @@ function isUpToDate(extension) {
 	const packageContents = fs.readFileSync(packagePath);
 
 	try {
+		//@ts-ignore review
 		const diskVersion = JSON.parse(packageContents).version;
 		return (diskVersion === extension.version);
 	} catch (err) {
diff --git a/build/lib/bundle.js b/build/lib/bundle.js
index 89c5b9b50bd..d7e142e5e36 100644
--- a/build/lib/bundle.js
+++ b/build/lib/bundle.js
@@ -217,6 +217,7 @@ function removeDuplicateTSBoilerplate(destFiles) {
         { start: /^var __metadata/, end: /^};$/ },
         { start: /^var __param/, end: /^};$/ },
         { start: /^var __awaiter/, end: /^};$/ },
+        { start: /^var __generator/, end: /^};$/ },
     ];
     destFiles.forEach(function (destFile) {
         var SEEN_BOILERPLATE = [];
diff --git a/build/lib/bundle.ts b/build/lib/bundle.ts
index e188ce44de1..da38acec4f4 100644
--- a/build/lib/bundle.ts
+++ b/build/lib/bundle.ts
@@ -44,11 +44,11 @@ interface ILoaderPluginReqFunc {
 
 export interface IEntryPoint {
 	name: string;
-	include: string[];
-	exclude: string[];
+	include?: string[];
+	exclude?: string[];
 	prepend: string[];
-	append: string[];
-	dest: string;
+	append?: string[];
+	dest?: string;
 }
 
 interface IEntryPointMap {
@@ -339,6 +339,7 @@ function removeDuplicateTSBoilerplate(destFiles: IConcatFile[]): IConcatFile[] {
 		{ start: /^var __metadata/, end: /^};$/ },
 		{ start: /^var __param/, end: /^};$/ },
 		{ start: /^var __awaiter/, end: /^};$/ },
+		{ start: /^var __generator/, end: /^};$/ },
 	];
 
 	destFiles.forEach((destFile) => {
diff --git a/build/lib/i18n.resources.json b/build/lib/i18n.resources.json
index a94b0a43327..28ff359e8d5 100644
--- a/build/lib/i18n.resources.json
+++ b/build/lib/i18n.resources.json
@@ -146,6 +146,10 @@
 			"name": "vs/workbench/services/crashReporter",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/services/dialogs",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/services/editor",
 			"project": "vscode-workbench"
@@ -162,10 +166,6 @@
 			"name": "vs/workbench/services/keybinding",
 			"project": "vscode-workbench"
 		},
-		{
-			"name": "vs/workbench/services/message",
-			"project": "vscode-workbench"
-		},
 		{
 			"name": "vs/workbench/services/mode",
 			"project": "vscode-workbench"
diff --git a/build/lib/optimize.ts b/build/lib/optimize.ts
index c47f513e436..bf818454343 100644
--- a/build/lib/optimize.ts
+++ b/build/lib/optimize.ts
@@ -30,7 +30,7 @@ function log(prefix: string, message: string): void {
 	gulpUtil.log(gulpUtil.colors.cyan('[' + prefix + ']'), message);
 }
 
-export function loaderConfig(emptyPaths: string[]) {
+export function loaderConfig(emptyPaths?: string[]) {
 	const result = {
 		paths: {
 			'vs': 'out-build/vs',
@@ -293,7 +293,7 @@ function uglifyWithCopyrights(): NodeJS.ReadWriteStream {
 	return es.duplex(input, output);
 }
 
-export function minifyTask(src: string, sourceMapBaseUrl: string): (cb: any) => void {
+export function minifyTask(src: string, sourceMapBaseUrl?: string): (cb: any) => void {
 	const sourceMappingURL = sourceMapBaseUrl && (f => `${sourceMapBaseUrl}/${f.relative}.map`);
 
 	return cb => {
diff --git a/build/lib/util.js b/build/lib/util.js
index f9f3f7a792a..679e049f5a5 100644
--- a/build/lib/util.js
+++ b/build/lib/util.js
@@ -173,7 +173,6 @@ function rimraf(dir) {
             if (!err) {
                 return cb();
             }
-            ;
             if (err.code === 'ENOTEMPTY' && ++retries < 5) {
                 return setTimeout(function () { return retry(cb); }, 10);
             }
diff --git a/build/lib/util.ts b/build/lib/util.ts
index 8f4f1ea75e9..9a4a2b44346 100644
--- a/build/lib/util.ts
+++ b/build/lib/util.ts
@@ -28,7 +28,7 @@ export interface IStreamProvider {
 	(cancellationToken?: ICancellationToken): NodeJS.ReadWriteStream;
 }
 
-export function incremental(streamProvider: IStreamProvider, initial: NodeJS.ReadWriteStream, supportsCancellation: boolean): NodeJS.ReadWriteStream {
+export function incremental(streamProvider: IStreamProvider, initial: NodeJS.ReadWriteStream, supportsCancellation?: boolean): NodeJS.ReadWriteStream {
 	const input = es.through();
 	const output = es.through();
 	let state = 'idle';
@@ -223,7 +223,7 @@ export function rimraf(dir: string): (cb: any) => void {
 		_rimraf(dir, { maxBusyTries: 1 }, (err: any) => {
 			if (!err) {
 				return cb();
-			};
+			}
 
 			if (err.code === 'ENOTEMPTY' && ++retries < 5) {
 				return setTimeout(() => retry(cb), 10);
diff --git a/build/lib/watch/watch-nsfw.js b/build/lib/watch/watch-nsfw.js
index c9fe9192f31..306ab481039 100644
--- a/build/lib/watch/watch-nsfw.js
+++ b/build/lib/watch/watch-nsfw.js
@@ -30,12 +30,12 @@ function watch(root) {
             path: path,
             base: root
         });
-
+        //@ts-ignore review
         file.event = type;
         result.emit('data', file);
     }
 
-    nsfw(root, function(events) {
+    nsfw(root, function (events) {
         for (var i = 0; i < events.length; i++) {
             var e = events[i];
             var changeType = e.action;
@@ -47,16 +47,16 @@ function watch(root) {
                 handleEvent(path.join(e.directory, e.file), toChangeType(changeType));
             }
         }
-    }).then(function(watcher) {
+    }).then(function (watcher) {
         watcher.start();
-	});
+    });
 
-	return result;
+    return result;
 }
 
 var cache = Object.create(null);
 
-module.exports = function(pattern, options) {
+module.exports = function (pattern, options) {
     options = options || {};
 
     var cwd = path.normalize(options.cwd || process.cwd());
@@ -66,7 +66,7 @@ module.exports = function(pattern, options) {
         watcher = cache[cwd] = watch(cwd);
     }
 
-    var rebase = !options.base ? es.through() : es.mapSync(function(f) {
+    var rebase = !options.base ? es.through() : es.mapSync(function (f) {
         f.base = options.base;
         return f;
     });
@@ -74,13 +74,13 @@ module.exports = function(pattern, options) {
     return watcher
         .pipe(filter(['**', '!.git{,/**}'])) // ignore all things git
         .pipe(filter(pattern))
-        .pipe(es.map(function(file, cb) {
-            fs.stat(file.path, function(err, stat) {
+        .pipe(es.map(function (file, cb) {
+            fs.stat(file.path, function (err, stat) {
                 if (err && err.code === 'ENOENT') { return cb(null, file); }
                 if (err) { return cb(); }
                 if (!stat.isFile()) { return cb(); }
 
-                fs.readFile(file.path, function(err, contents) {
+                fs.readFile(file.path, function (err, contents) {
                     if (err && err.code === 'ENOENT') { return cb(null, file); }
                     if (err) { return cb(); }
 
diff --git a/build/lib/watch/watch-win32.js b/build/lib/watch/watch-win32.js
index a6c4ea66470..de9c76c90d6 100644
--- a/build/lib/watch/watch-win32.js
+++ b/build/lib/watch/watch-win32.js
@@ -24,7 +24,8 @@ function watch(root) {
 	var result = es.through();
 	var child = cp.spawn(watcherPath, [root]);
 
-	child.stdout.on('data', function(data) {
+	child.stdout.on('data', function (data) {
+		//@ts-ignore review
 		var lines = data.toString('utf8').split('\n');
 		for (var i = 0; i < lines.length; i++) {
 			var line = lines[i].trim();
@@ -46,17 +47,17 @@ function watch(root) {
 				path: changePathFull,
 				base: root
 			});
-
+			//@ts-ignore review
 			file.event = toChangeType(changeType);
 			result.emit('data', file);
 		}
 	});
 
-	child.stderr.on('data', function(data) {
+	child.stderr.on('data', function (data) {
 		result.emit('error', data);
 	});
 
-	child.on('exit', function(code) {
+	child.on('exit', function (code) {
 		result.emit('error', 'Watcher died with code ' + code);
 		child = null;
 	});
@@ -70,7 +71,7 @@ function watch(root) {
 
 var cache = Object.create(null);
 
-module.exports = function(pattern, options) {
+module.exports = function (pattern, options) {
 	options = options || {};
 
 	var cwd = path.normalize(options.cwd || process.cwd());
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
index 4d7b1524998..5a2eb75d6b4 100644
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -49,6 +49,7 @@ extensions.forEach(extension => yarnInstall(`extensions/${extension}`));
 function yarnInstallBuildDependencies() {
 	// make sure we install the deps of build/lib/watch for the system installed
 	// node, since that is the driver of gulp
+	//@ts-ignore review
 	const env = Object.assign({}, process.env);
 	const watchPath = path.join(path.dirname(__dirname), 'lib', 'watch');
 	const yarnrcPath = path.join(watchPath, '.yarnrc');
diff --git a/build/npm/update-grammar.js b/build/npm/update-grammar.js
index d65112b3456..822de7c59c2 100644
--- a/build/npm/update-grammar.js
+++ b/build/npm/update-grammar.js
@@ -37,12 +37,16 @@ function download(url, redirectCount) {
 			response.on('data', function (data) {
 				content += data.toString();
 			}).on('end', function () {
+				if (response.statusCode === 403 && response.headers['x-ratelimit-remaining'] === '0') {
+					e('GitHub API rate exceeded. Set GITHUB_TOKEN environment variable to increase rate limit.');
+					return;
+				}
 				let count = redirectCount || 0;
 				if (count < 5 && response.statusCode >= 300 && response.statusCode <= 303 || response.statusCode === 307) {
 					let location = response.headers['location'];
 					if (location) {
 						console.log("Redirected " + url + " to " + location);
-						download(location, count+1).then(c, e);
+						download(location, count + 1).then(c, e);
 						return;
 					}
 				}
@@ -64,12 +68,8 @@ function getCommitSha(repoId, repoPath) {
 				commitDate: lastCommit.commit.author.date
 			});
 		} catch (e) {
-			console.error("Failed extracting the SHA: " + content);
-			return Promise.resolve(null);
+			return Promise.reject(new Error("Failed extracting the SHA: " + content));
 		}
-	}, function () {
-		console.error('Failed loading ' + commitInfo);
-		return Promise.resolve(null);
 	});
 }
 
@@ -86,8 +86,7 @@ exports.update = function (repoId, repoPath, dest, modifyGrammar, version = 'mas
 		} else if (ext === '.json') {
 			grammar = JSON.parse(content);
 		} else {
-			console.error('Unknown file extension: ' + ext);
-			return;
+			return Promise.reject(new Error('Unknown file extension: ' + ext));
 		}
 		if (modifyGrammar) {
 			modifyGrammar(grammar);
@@ -104,8 +103,10 @@ exports.update = function (repoId, repoPath, dest, modifyGrammar, version = 'mas
 			if (info) {
 				result.version = 'https://github.com/' + repoId + '/commit/' + info.commitSha;
 			}
-			for (let key in grammar) {
-				if (!result.hasOwnProperty(key)) {
+
+			let keys = ['name', 'scopeName', 'comment', 'injections', 'patterns', 'repository'];
+			for (let key of keys) {
+				if (grammar.hasOwnProperty(key)) {
 					result[key] = grammar[key];
 				}
 			}
@@ -118,11 +119,14 @@ exports.update = function (repoId, repoPath, dest, modifyGrammar, version = 'mas
 					console.log('Updated ' + path.basename(dest));
 				}
 			} catch (e) {
-				console.error(e);
+				return Promise.reject(e);
 			}
 		});
 
-	}, console.error);
+	}, console.error).catch(e => {
+		console.error(e);
+		process.exit(1);
+	});
 };
 
 if (path.basename(process.argv[1]) === 'update-grammar.js') {
diff --git a/build/npm/update-localization-extension.js b/build/npm/update-localization-extension.js
index ca41f25783e..985fbd28cb7 100644
--- a/build/npm/update-localization-extension.js
+++ b/build/npm/update-localization-extension.js
@@ -15,7 +15,6 @@ let rimraf = require('rimraf');
 function update(idOrPath) {
 	if (!idOrPath) {
 		throw new Error('Argument must be the location of the localization extension.');
-		return;
 	}
 	let locExtFolder = idOrPath;
 	if (/^\w{2}(-\w+)?$/.test(idOrPath)) {
diff --git a/build/package.json b/build/package.json
index 25acf1c2251..bcc32e8dec0 100644
--- a/build/package.json
+++ b/build/package.json
@@ -17,8 +17,9 @@
     "xml2js": "^0.4.17"
   },
   "scripts": {
-    "compile": "tsc",
-    "watch": "tsc --watch",
-    "postinstall": "npm run compile"
+    "compile": "tsc -p tsconfig.build.json",
+    "watch": "tsc -p tsconfig.build.json --watch",
+    "postinstall": "npm run compile",
+    "npmCheckJs": "tsc --noEmit"
   }
 }
\ No newline at end of file
diff --git a/build/tsconfig.build.json b/build/tsconfig.build.json
new file mode 100644
index 00000000000..2402a092886
--- /dev/null
+++ b/build/tsconfig.build.json
@@ -0,0 +1,7 @@
+{
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"allowJs": false,
+		"checkJs": false
+	}
+}
\ No newline at end of file
diff --git a/build/tsconfig.json b/build/tsconfig.json
index 04f3963055d..b68c9b6dafa 100644
--- a/build/tsconfig.json
+++ b/build/tsconfig.json
@@ -7,7 +7,12 @@
 		"preserveConstEnums": true,
 		"sourceMap": false,
 		"experimentalDecorators": true,
-		"newLine": "LF"
+		"newLine": "LF",
+		// enable JavaScript type checking for the language service
+		// use the tsconfig.build.json for compiling wich disable JavaScript
+		// type checking so that JavaScript file are not transpiled
+		"allowJs": true,
+		"checkJs": true
 	},
 	"exclude": [
 		"node_modules/**"
diff --git a/build/win32/code.iss b/build/win32/code.iss
index 22c0096e0c5..7cadcd9a5c1 100644
--- a/build/win32/code.iss
+++ b/build/win32/code.iss
@@ -57,7 +57,6 @@ Type: files; Name: "{app}\resources\app\Credits_45.0.2454.85.html"; Check: IsNot
 
 [UninstallDelete]
 Type: filesandordirs; Name: "{app}\_"
-Type: filesandordirs; Name: "{app}\old"
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
@@ -69,8 +68,8 @@ Name: "addtopath"; Description: "{cm:AddToPath}"; GroupDescription: "{cm:Other}"
 Name: "runcode"; Description: "{cm:RunAfter,{#NameShort}}"; GroupDescription: "{cm:Other}"; Check: WizardSilent
 
 [Files]
-Source: "*"; Excludes: "inno_updater.exe"; DestDir: "{code:GetDestDir}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "inno_updater.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "*"; Excludes: "\tools,\tools\*"; DestDir: "{code:GetDestDir}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "tools\*"; DestDir: "{app}\tools"; Flags: ignoreversion
 
 [Icons]
 Name: "{group}\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; AppUserModelID: "{#AppUserId}"
@@ -1027,7 +1026,7 @@ begin
       Sleep(1000);
     end;
 
-    Exec(ExpandConstant('{app}\inno_updater.exe'), ExpandConstant('"{app}\{#ExeBasename}.exe" ' + BoolToStr(LockFileExists())), '', SW_SHOW, ewWaitUntilTerminated, UpdateResultCode);
+    Exec(ExpandConstant('{app}\tools\inno_updater.exe'), ExpandConstant('"{app}\{#ExeBasename}.exe" ' + BoolToStr(LockFileExists())), '', SW_SHOW, ewWaitUntilTerminated, UpdateResultCode);
   end;
 end;
 
diff --git a/build/win32/inno_updater.exe b/build/win32/inno_updater.exe
index ffc04fb7661..05441e94e15 100644
Binary files a/build/win32/inno_updater.exe and b/build/win32/inno_updater.exe differ
diff --git a/build/win32/vcruntime140.dll b/build/win32/vcruntime140.dll
new file mode 100644
index 00000000000..d26d2948972
Binary files /dev/null and b/build/win32/vcruntime140.dll differ
diff --git a/extensions/bat/language-configuration.json b/extensions/bat/language-configuration.json
index 2fb5445a34a..2064cd941ca 100644
--- a/extensions/bat/language-configuration.json
+++ b/extensions/bat/language-configuration.json
@@ -11,7 +11,8 @@
 		["{", "}"],
 		["[", "]"],
 		["(", ")"],
-		["\"", "\""]
+		["\"", "\""],
+		["`", "`"]
 	],
 	"surroundingPairs": [
 		["{", "}"],
diff --git a/extensions/bat/package.json b/extensions/bat/package.json
index d9f1cba592b..e5809eb032e 100644
--- a/extensions/bat/package.json
+++ b/extensions/bat/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "bat",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/bat/package.nls.json b/extensions/bat/package.nls.json
new file mode 100644
index 00000000000..a3842b35c73
--- /dev/null
+++ b/extensions/bat/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Windows Bat Language Features",
+	"description": "Provides Syntax highlighting, Folding, Bracket matching, Snippets and other language features in Windows batch files"
+}
\ No newline at end of file
diff --git a/extensions/bat/syntaxes/batchfile.tmLanguage.json b/extensions/bat/syntaxes/batchfile.tmLanguage.json
index 42adcf64854..2aee0692ad8 100644
--- a/extensions/bat/syntaxes/batchfile.tmLanguage.json
+++ b/extensions/bat/syntaxes/batchfile.tmLanguage.json
@@ -5,12 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/mmims/language-batchfile/commit/3dd105c31484e5975144478dac1aa91d8f51e528",
-	"scopeName": "source.batchfile",
 	"name": "Batch File",
-	"fileTypes": [
-		"bat",
-		"cmd"
-	],
+	"scopeName": "source.batchfile",
 	"patterns": [
 		{
 			"include": "#commands"
diff --git a/extensions/clojure/package.json b/extensions/clojure/package.json
index b404ef5fb8a..7be42cc30c1 100644
--- a/extensions/clojure/package.json
+++ b/extensions/clojure/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "clojure",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/clojure/package.nls.json b/extensions/clojure/package.nls.json
new file mode 100644
index 00000000000..d443e17ed45
--- /dev/null
+++ b/extensions/clojure/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Clojure Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching and other language features in Clojure files"
+}
\ No newline at end of file
diff --git a/extensions/clojure/syntaxes/clojure.tmLanguage.json b/extensions/clojure/syntaxes/clojure.tmLanguage.json
index 033e3e2a178..3d059513af0 100644
--- a/extensions/clojure/syntaxes/clojure.tmLanguage.json
+++ b/extensions/clojure/syntaxes/clojure.tmLanguage.json
@@ -5,25 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/atom/language-clojure/commit/ecc790326bc8e14220e4d2d72a392a30876c3219",
-	"scopeName": "source.clojure",
-	"fileTypes": [
-		"boot",
-		"clj",
-		"clj.hl",
-		"cljc",
-		"cljs",
-		"cljs.hl",
-		"cljx",
-		"clojure",
-		"edn",
-		"org",
-		"joke",
-		"joker"
-	],
-	"foldingStartMarker": "\\(\\s*$",
-	"foldingStopMarker": "^\\s*\\)",
-	"firstLineMatch": "(?x)\n# Hashbang\n^\\#!.*(?:\\s|\\/)\n  boot\n(?:$|\\s)\n|\n# Modeline\n(?i:\n  # Emacs\n  -\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n    clojure(script)?\n  (?=[\\s;]|(?<![-*])-\\*-).*?-\\*-\n  |\n  # Vim\n  (?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n    clojure\n  (?=\\s|:|$)\n)",
 	"name": "Clojure",
+	"scopeName": "source.clojure",
 	"patterns": [
 		{
 			"include": "#comment"
diff --git a/extensions/coffeescript/package.json b/extensions/coffeescript/package.json
index c688f7b0836..706b55220ce 100644
--- a/extensions/coffeescript/package.json
+++ b/extensions/coffeescript/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "coffeescript",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/coffeescript/package.nls.json b/extensions/coffeescript/package.nls.json
new file mode 100644
index 00000000000..e891ba0ab2a
--- /dev/null
+++ b/extensions/coffeescript/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Coffeescript Language Features",
+	"description": "Provides Syntax highlighting, Folding, Bracket matching, Snippets and other language features in Coffeescript files"
+}
\ No newline at end of file
diff --git a/extensions/coffeescript/syntaxes/coffeescript.tmLanguage.json b/extensions/coffeescript/syntaxes/coffeescript.tmLanguage.json
index 0e4c904a029..5fcff295c61 100644
--- a/extensions/coffeescript/syntaxes/coffeescript.tmLanguage.json
+++ b/extensions/coffeescript/syntaxes/coffeescript.tmLanguage.json
@@ -5,16 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/atom/language-coffee-script/commit/a0da2a73ad817e2fc13c2ef8fcd2624017c39610",
-	"scopeName": "source.coffee",
 	"name": "CoffeeScript",
-	"fileTypes": [
-		"coffee",
-		"Cakefile",
-		"coffee.erb",
-		"cson",
-		"_coffee"
-	],
-	"firstLineMatch": "(?x)\n# Hashbang\n^\\#!.*(?:\\s|\\/)\n  coffee\n(?:$|\\s)\n|\n# Modeline\n(?i:\n  # Emacs\n  -\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n    coffee\n  (?=[\\s;]|(?<![-*])-\\*-).*?-\\*-\n  |\n  # Vim\n  (?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n    coffee\n  (?=\\s|:|$)\n)",
+	"scopeName": "source.coffee",
 	"patterns": [
 		{
 			"match": "(new)\\s+(?:(?:(class)\\s+(\\w+(?:\\.\\w*)*)?)|(\\w+(?:\\.\\w*)*))",
diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json
index c5030630b40..da25e2e643e 100644
--- a/extensions/configuration-editing/package.json
+++ b/extensions/configuration-editing/package.json
@@ -1,5 +1,7 @@
 {
   "name": "configuration-editing",
+  "displayName": "%displayName%",
+  "description": "%description%",
   "version": "0.0.1",
   "publisher": "vscode",
   "engines": {
@@ -81,4 +83,4 @@
   "devDependencies": {
     "@types/node": "7.0.4"
   }
-}
+}
\ No newline at end of file
diff --git a/extensions/configuration-editing/package.nls.json b/extensions/configuration-editing/package.nls.json
new file mode 100644
index 00000000000..7e75dbe9053
--- /dev/null
+++ b/extensions/configuration-editing/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Configuration Editing",
+	"description": "Provides capabilities (advanced intelli-sense, auto-fixing) in configuration files like settings, launch and extension recommendation files"
+}
\ No newline at end of file
diff --git a/extensions/cpp/package.json b/extensions/cpp/package.json
index bb2f0b6aaab..5541288995d 100644
--- a/extensions/cpp/package.json
+++ b/extensions/cpp/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "cpp",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
@@ -15,7 +17,7 @@
 		},
 		{
 			"id": "cpp",
-			"extensions": [ ".cpp", ".cc", ".cxx", ".hpp", ".hh", ".hxx", ".h", ".ino", ".inl" ],
+			"extensions": [ ".cpp", ".cc", ".cxx", ".hpp", ".hh", ".hxx", ".h", ".ino", ".inl", ".ipp" ],
 			"aliases": [ "C++", "Cpp", "cpp"],
 			"configuration": "./language-configuration.json"
 		}],
diff --git a/extensions/cpp/package.nls.json b/extensions/cpp/package.nls.json
new file mode 100644
index 00000000000..241d7a1adbf
--- /dev/null
+++ b/extensions/cpp/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "C/C++ Language Features",
+	"description": "Provides Syntax highlighting, Folding, Bracket matching, Snippets and other language features in C/C++ files"
+}
\ No newline at end of file
diff --git a/extensions/cpp/syntaxes/c.tmLanguage.json b/extensions/cpp/syntaxes/c.tmLanguage.json
index d5143bd4901..bcd5470a64c 100644
--- a/extensions/cpp/syntaxes/c.tmLanguage.json
+++ b/extensions/cpp/syntaxes/c.tmLanguage.json
@@ -5,14 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/atom/language-c/commit/9c0c5f202741a5647025db8d5df5fefba47b036c",
-	"scopeName": "source.c",
-	"fileTypes": [
-		"c",
-		"h.in",
-		"xpm"
-	],
-	"firstLineMatch": "(?i)-\\*-[^*]*(Mode:\\s*)?C(\\s*;.*?)?\\s*-\\*-",
 	"name": "C",
+	"scopeName": "source.c",
 	"patterns": [
 		{
 			"include": "#preprocessor-rule-enabled"
diff --git a/extensions/cpp/syntaxes/cpp.tmLanguage.json b/extensions/cpp/syntaxes/cpp.tmLanguage.json
index 4cd5c4e8d91..f29bc255ba8 100644
--- a/extensions/cpp/syntaxes/cpp.tmLanguage.json
+++ b/extensions/cpp/syntaxes/cpp.tmLanguage.json
@@ -5,28 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/atom/language-c/commit/3a269f88b12e512fb9495dc006a1dabf325d3d7f",
-	"scopeName": "source.cpp",
-	"fileTypes": [
-		"cc",
-		"cpp",
-		"cp",
-		"cxx",
-		"c++",
-		"cu",
-		"cuh",
-		"h",
-		"hh",
-		"hpp",
-		"hxx",
-		"h++",
-		"inl",
-		"ino",
-		"ipp",
-		"tcc",
-		"tpp"
-	],
-	"firstLineMatch": "(?i)-\\*-[^*]*(Mode:\\s*)?C\\+\\+(\\s*;.*?)?\\s*-\\*-",
 	"name": "C++",
+	"scopeName": "source.cpp",
 	"patterns": [
 		{
 			"include": "#special_block"
diff --git a/extensions/cpp/syntaxes/platform.tmLanguage.json b/extensions/cpp/syntaxes/platform.tmLanguage.json
index bc4821b4f63..14fb45016c0 100644
--- a/extensions/cpp/syntaxes/platform.tmLanguage.json
+++ b/extensions/cpp/syntaxes/platform.tmLanguage.json
@@ -5,10 +5,9 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/textmate/c.tmbundle/commit/9aa365882274ca52f01722f3dbb169b9539a20ee",
-	"comment": "This file was generated with clang-C using MacOSX10.12.sdk",
-	"fileTypes": [],
-	"hideFromUser": true,
 	"name": "Platform",
+	"scopeName": "source.c.platform",
+	"comment": "This file was generated with clang-C using MacOSX10.12.sdk",
 	"patterns": [
 		{
 			"match": "\\bkCF(?:CalendarUnitWeek|Gregorian(?:AllUnits|Units(?:Days|Hours|M(?:inutes|onths)|Seconds|Years)))\\b",
@@ -568,7 +567,5 @@
 				}
 			]
 		}
-	},
-	"scopeName": "source.c.platform",
-	"uuid": "3E3CB242-CEBA-4B61-9806-9A97B5783D2A"
+	}
 }
\ No newline at end of file
diff --git a/extensions/csharp/package.json b/extensions/csharp/package.json
index 137ce2656d6..e5aae513537 100644
--- a/extensions/csharp/package.json
+++ b/extensions/csharp/package.json
@@ -1,5 +1,7 @@
 {
   "name": "csharp",
+	"displayName": "%displayName%",
+	"description": "%description%",
   "version": "0.1.0",
   "publisher": "vscode",
   "engines": {
diff --git a/extensions/csharp/package.nls.json b/extensions/csharp/package.nls.json
new file mode 100644
index 00000000000..ff75c382146
--- /dev/null
+++ b/extensions/csharp/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "C# Language Features",
+	"description": "Provides Syntax highlighting, Folding, Bracket matching, Snippets and other language features in C# files"
+}
\ No newline at end of file
diff --git a/extensions/csharp/syntaxes/csharp.tmLanguage.json b/extensions/csharp/syntaxes/csharp.tmLanguage.json
index 074c761a4d5..fb3f667f5b1 100644
--- a/extensions/csharp/syntaxes/csharp.tmLanguage.json
+++ b/extensions/csharp/syntaxes/csharp.tmLanguage.json
@@ -7,10 +7,6 @@
 	"version": "https://github.com/dotnet/csharp-tmLanguage/commit/ca22c5211b87a6a1a8fd5356895237bb821df728",
 	"name": "C#",
 	"scopeName": "source.cs",
-	"fileTypes": [
-		"cs"
-	],
-	"uuid": "f7de61e2-bdde-4e2a-a139-8221b179584e",
 	"patterns": [
 		{
 			"include": "#preprocessor"
diff --git a/extensions/css/client/src/cssMain.ts b/extensions/css/client/src/cssMain.ts
index 930deba4a6e..a8aaa53a18a 100644
--- a/extensions/css/client/src/cssMain.ts
+++ b/extensions/css/client/src/cssMain.ts
@@ -8,12 +8,9 @@ import * as path from 'path';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
-import { languages, window, commands, ExtensionContext, TextDocument, ColorInformation, ColorPresentation, Color, Range, Position, CompletionItem, CompletionItemKind, TextEdit, SnippetString } from 'vscode';
+import { languages, window, commands, ExtensionContext, Range, Position, CompletionItem, CompletionItemKind, TextEdit, SnippetString } from 'vscode';
 import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind } from 'vscode-languageclient';
 
-import { ConfigurationFeature } from 'vscode-languageclient/lib/configuration.proposed';
-import { DocumentColorRequest, DocumentColorParams, ColorPresentationRequest, ColorPresentationParams } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
-
 // this method is called when vs code is activated
 export function activate(context: ExtensionContext) {
 
@@ -35,7 +32,7 @@ export function activate(context: ExtensionContext) {
 	let clientOptions: LanguageClientOptions = {
 		documentSelector,
 		synchronize: {
-			configurationSection: ['css', 'scss', 'less']
+			configurationSection: ['css', 'scss', 'less', 'emmet']
 		},
 		initializationOptions: {
 		}
@@ -43,46 +40,13 @@ export function activate(context: ExtensionContext) {
 
 	// Create the language client and start the client.
 	let client = new LanguageClient('css', localize('cssserver.name', 'CSS Language Server'), serverOptions, clientOptions);
-	client.registerFeature(new ConfigurationFeature(client));
+	client.registerProposedFeatures();
 
 	let disposable = client.start();
 	// Push the disposable to the context's subscriptions so that the
 	// client can be deactivated on extension deactivation
 	context.subscriptions.push(disposable);
 
-	client.onReady().then(_ => {
-		// register color provider
-		context.subscriptions.push(languages.registerColorProvider(documentSelector, {
-			provideDocumentColors(document: TextDocument): Thenable<ColorInformation[]> {
-				let params: DocumentColorParams = {
-					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document)
-				};
-				return client.sendRequest(DocumentColorRequest.type, params).then(symbols => {
-					return symbols.map(symbol => {
-						let range = client.protocol2CodeConverter.asRange(symbol.range);
-						let color = new Color(symbol.color.red, symbol.color.green, symbol.color.blue, symbol.color.alpha);
-						return new ColorInformation(range, color);
-					});
-				});
-			},
-			provideColorPresentations(color: Color, context): ColorPresentation[] | Thenable<ColorPresentation[]> {
-				let params: ColorPresentationParams = {
-					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(context.document),
-					color,
-					range: client.code2ProtocolConverter.asRange(context.range)
-				};
-				return client.sendRequest(ColorPresentationRequest.type, params).then(presentations => {
-					return presentations.map(p => {
-						let presentation = new ColorPresentation(p.label);
-						presentation.textEdit = p.textEdit && client.protocol2CodeConverter.asTextEdit(p.textEdit);
-						presentation.additionalTextEdits = p.additionalTextEdits && client.protocol2CodeConverter.asTextEdits(p.additionalTextEdits);
-						return presentation;
-					});
-				});
-			}
-		}));
-	});
-
 	let indentationRules = {
 		increaseIndentPattern: /(^.*\{[^}]*$)/,
 		decreaseIndentPattern: /^\s*\}/
diff --git a/extensions/css/client/tsconfig.json b/extensions/css/client/tsconfig.json
index 7f8b647d04b..ee67f8333d4 100644
--- a/extensions/css/client/tsconfig.json
+++ b/extensions/css/client/tsconfig.json
@@ -1,11 +1,11 @@
 {
 	"compilerOptions": {
-		"target": "es5",
+		"target": "es6",
 		"module": "commonjs",
 		"outDir": "./out",
 		"noUnusedLocals": true,
 		"lib": [
-			"es5", "es2015.promise"
+			"es2016"
 		],
 		"strict": true
 	},
diff --git a/extensions/css/package.json b/extensions/css/package.json
index 8893cc34b93..c5022b59db6 100644
--- a/extensions/css/package.json
+++ b/extensions/css/package.json
@@ -1,5 +1,7 @@
 {
   "name": "css",
+	"displayName": "%displayName%",
+	"description": "%description%",
   "version": "0.1.0",
   "publisher": "vscode",
   "engines": {
@@ -713,10 +715,10 @@
     ]
   },
   "dependencies": {
-    "vscode-languageclient": "^3.5.0",
+    "vscode-languageclient": "^4.0.0-next.9",
     "vscode-nls": "^3.2.1"
   },
   "devDependencies": {
     "@types/node": "7.0.43"
   }
-}
\ No newline at end of file
+}
diff --git a/extensions/css/package.nls.json b/extensions/css/package.nls.json
index 33fbf6d5c28..cbe77ea0abb 100644
--- a/extensions/css/package.nls.json
+++ b/extensions/css/package.nls.json
@@ -1,4 +1,6 @@
 {
+	"displayName": "CSS Language Features",
+	"description": "Provides rich language support for CSS, LESS and SCSS files.",
 	"css.title": "CSS",
 	"css.lint.argumentsInColorFunction.desc": "Invalid number of parameters",
 	"css.lint.boxModel.desc": "Do not use width or height when using padding or border",
diff --git a/extensions/css/server/.vscode/launch.json b/extensions/css/server/.vscode/launch.json
index 68a18d7bb9e..624ac31332f 100644
--- a/extensions/css/server/.vscode/launch.json
+++ b/extensions/css/server/.vscode/launch.json
@@ -7,6 +7,7 @@
 			"type": "node",
 			"request": "attach",
 			"port": 6044,
+			"protocol": "inspector",
 			"sourceMaps": true,
 			"outFiles": ["${workspaceFolder}/out/**/*.js"]
 		},
diff --git a/extensions/css/server/package.json b/extensions/css/server/package.json
index bd00c7a2c6d..eaf6a20397b 100644
--- a/extensions/css/server/package.json
+++ b/extensions/css/server/package.json
@@ -8,10 +8,12 @@
     "node": "*"
   },
   "dependencies": {
-    "vscode-css-languageservice": "^3.0.5",
-    "vscode-languageserver": "^3.5.0"
+    "vscode-css-languageservice": "^3.0.6",
+    "vscode-emmet-helper": "^1.1.34",
+    "vscode-languageserver": "^4.0.0-next.4"
   },
   "devDependencies": {
+    "@types/mocha": "2.2.33",
     "@types/node": "7.0.43"
   },
   "scripts": {
@@ -20,6 +22,7 @@
     "install-service-next": "yarn add vscode-css-languageservice@next",
     "install-service-local": "npm install ../../../../vscode-css-languageservice -f",
     "install-server-next": "yarn add vscode-languageserver@next",
-    "install-server-local": "npm install ../../../../vscode-languageserver-node/server -f"
+    "install-server-local": "npm install ../../../../vscode-languageserver-node/server -f",
+    "test": "../../../node_modules/.bin/mocha"
   }
 }
diff --git a/extensions/css/server/src/cssServerMain.ts b/extensions/css/server/src/cssServerMain.ts
index c388bebe832..0a63d245559 100644
--- a/extensions/css/server/src/cssServerMain.ts
+++ b/extensions/css/server/src/cssServerMain.ts
@@ -5,22 +5,26 @@
 'use strict';
 
 import {
-	createConnection, IConnection, TextDocuments, InitializeParams, InitializeResult, ServerCapabilities
+	createConnection, IConnection, TextDocuments, InitializeParams, InitializeResult, ServerCapabilities, CompletionTriggerKind
 } from 'vscode-languageserver';
 
-import { TextDocument } from 'vscode-languageserver-types';
+import { TextDocument, CompletionList } from 'vscode-languageserver-types';
 
 import { ConfigurationRequest } from 'vscode-languageserver-protocol/lib/protocol.configuration.proposed';
+import { WorkspaceFolder } from 'vscode-languageserver-protocol/lib/protocol.workspaceFolders.proposed';
 import { DocumentColorRequest, ServerCapabilities as CPServerCapabilities, ColorPresentationRequest } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
 
-import { getCSSLanguageService, getSCSSLanguageService, getLESSLanguageService, LanguageSettings, LanguageService, Stylesheet } from 'vscode-css-languageservice';
+import { getCSSLanguageService, getSCSSLanguageService, getLESSLanguageService, LanguageSettings, LanguageService, Stylesheet, ICompletionParticipant } from 'vscode-css-languageservice';
 import { getLanguageModelCache } from './languageModelCache';
 import { formatError, runSafe } from './utils/errors';
+import { doComplete as emmetDoComplete, updateExtensionsPath as updateEmmetExtensionsPath, getEmmetCompletionParticipants } from 'vscode-emmet-helper';
+import uri from 'vscode-uri';
 
 export interface Settings {
 	css: LanguageSettings;
 	less: LanguageSettings;
 	scss: LanguageSettings;
+	emmet: { [key: string]: any };
 }
 
 // Create a connection for the server.
@@ -49,9 +53,22 @@ connection.onShutdown(() => {
 });
 
 let scopedSettingsSupport = false;
+let workspaceFolders: WorkspaceFolder[] | undefined;
+let emmetSettings = {};
+let currentEmmetExtensionsPath: string;
+const emmetTriggerCharacters = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+
 // After the server has started the client sends an initilize request. The server receives
 // in the passed params the rootPath of the workspace plus the client capabilities.
 connection.onInitialize((params: InitializeParams): InitializeResult => {
+	workspaceFolders = (<any>params).workspaceFolders;
+	if (!Array.isArray(workspaceFolders)) {
+		workspaceFolders = [];
+		if (params.rootPath) {
+			workspaceFolders.push({ name: '', uri: uri.file(params.rootPath).toString() });
+		}
+	}
+
 	function hasClientCapability(name: string) {
 		let keys = name.split('.');
 		let c: any = params.capabilities;
@@ -65,7 +82,7 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
 	let capabilities: ServerCapabilities & CPServerCapabilities = {
 		// Tell the client that the server works in FULL text document sync mode
 		textDocumentSync: documents.syncKind,
-		completionProvider: snippetSupport ? { resolveProvider: false } : undefined,
+		completionProvider: snippetSupport ? { resolveProvider: false, triggerCharacters: emmetTriggerCharacters } : undefined,
 		hoverProvider: true,
 		documentSymbolProvider: true,
 		referencesProvider: true,
@@ -124,6 +141,13 @@ function updateConfiguration(settings: Settings) {
 	documentSettings = {};
 	// Revalidate any open text documents
 	documents.all().forEach(triggerValidation);
+
+	emmetSettings = settings.emmet;
+	if (currentEmmetExtensionsPath !== emmetSettings['extensionsPath']) {
+		currentEmmetExtensionsPath = emmetSettings['extensionsPath'];
+		const workspaceUri = (workspaceFolders && workspaceFolders.length === 1) ? uri.parse(workspaceFolders[0].uri) : null;
+		updateEmmetExtensionsPath(currentEmmetExtensionsPath, workspaceUri ? workspaceUri.fsPath : null);
+	}
 }
 
 let pendingValidationRequests: { [uri: string]: NodeJS.Timer } = {};
@@ -169,11 +193,43 @@ function validateTextDocument(textDocument: TextDocument): void {
 	});
 }
 
+let cachedCompletionList: CompletionList;
+const hexColorRegex = /^#[\d,a-f,A-F]{1,6}$/;
 connection.onCompletion(textDocumentPosition => {
 	return runSafe(() => {
 		let document = documents.get(textDocumentPosition.textDocument.uri);
-		let stylesheet = stylesheets.get(document);
-		return getLanguageService(document).doComplete(document, textDocumentPosition.position, stylesheet)!; /* TODO: remove ! once LS has null annotations */
+		if (cachedCompletionList
+			&& !cachedCompletionList.isIncomplete
+			&& textDocumentPosition.context
+			&& textDocumentPosition.context.triggerKind === CompletionTriggerKind.TriggerForIncompleteCompletions
+		) {
+			let result: CompletionList = emmetDoComplete(document, textDocumentPosition.position, document.languageId, emmetSettings);
+			if (result && result.items) {
+				result.items.push(...cachedCompletionList.items);
+			} else {
+				result = cachedCompletionList;
+				cachedCompletionList = null;
+			}
+			return result;
+		}
+
+		cachedCompletionList = null;
+		let emmetCompletionList: CompletionList = {
+			isIncomplete: true,
+			items: undefined
+		};
+		const emmetCompletionParticipant: ICompletionParticipant = getEmmetCompletionParticipants(document, textDocumentPosition.position, document.languageId, emmetSettings, emmetCompletionList);
+		getLanguageService(document).setCompletionParticipants([emmetCompletionParticipant]);
+
+		const result = getLanguageService(document).doComplete(document, textDocumentPosition.position, stylesheets.get(document))!; /* TODO: remove ! once LS has null annotations */
+		if (emmetCompletionList && emmetCompletionList.items) {
+			cachedCompletionList = result;
+			if (emmetCompletionList.items.length && hexColorRegex.test(emmetCompletionList.items[0].label) && result.items.some(x => x.label === emmetCompletionList.items[0].label)) {
+				emmetCompletionList.items.shift();
+			}
+			return { isIncomplete: true, items: [...emmetCompletionList.items, ...result.items] };
+		}
+		return result;
 	}, null, `Error while computing completions for ${textDocumentPosition.textDocument.uri}`);
 });
 
diff --git a/extensions/css/server/src/test/emmet.test.ts b/extensions/css/server/src/test/emmet.test.ts
new file mode 100644
index 00000000000..ef8441153d7
--- /dev/null
+++ b/extensions/css/server/src/test/emmet.test.ts
@@ -0,0 +1,68 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import 'mocha';
+import * as assert from 'assert';
+import { getCSSLanguageService, getSCSSLanguageService } from 'vscode-css-languageservice/lib/cssLanguageService';
+import { TextDocument, CompletionList } from 'vscode-languageserver-types';
+import { getEmmetCompletionParticipants } from 'vscode-emmet-helper';
+
+suite('Emmet Support', () => {
+
+	const cssLanguageService = getCSSLanguageService();
+	const scssLanguageService = getSCSSLanguageService();
+
+	function assertCompletions(syntax: string, value: string, expectedProposal: string, expectedProposalDoc: string): void {
+		const offset = value.indexOf('|');
+		value = value.substr(0, offset) + value.substr(offset + 1);
+
+		const document = TextDocument.create('test://test/test.' + syntax, syntax, 0, value);
+		const position = document.positionAt(offset);
+		const emmetCompletionList: CompletionList = {
+			isIncomplete: true,
+			items: undefined
+		}
+		const languageService = syntax === 'scss' ? scssLanguageService : cssLanguageService;
+		languageService.setCompletionParticipants([getEmmetCompletionParticipants(document, position, document.languageId, {}, emmetCompletionList)])
+		const stylesheet = languageService.parseStylesheet(document);
+		const list = languageService.doComplete!(document, position, stylesheet);
+
+		assert.ok(list);
+		assert.ok(emmetCompletionList)
+
+		if (expectedProposal && expectedProposalDoc) {
+			let actualLabels = emmetCompletionList!.items.map(c => c.label).sort();
+			let actualDocs = emmetCompletionList!.items.map(c => c.documentation).sort();
+			assert.ok(actualLabels.indexOf(expectedProposal) !== -1, 'Not found:' + expectedProposal + ' is ' + actualLabels.join(', '));
+			assert.ok(actualDocs.indexOf(expectedProposalDoc) !== -1, 'Not found:' + expectedProposalDoc + ' is ' + actualDocs.join(', '));
+		} else {
+			assert.ok(!emmetCompletionList || !emmetCompletionList.items);
+		}
+	}
+
+	test('Css Emmet Completions', function (): any {
+		assertCompletions('css', '.foo { display: none; m10| }', 'margin: 10px;', 'margin: 10px;');
+		assertCompletions('css', 'foo { display: none; pos:f| }', 'position: fixed;', 'position: fixed;');
+		assertCompletions('css', 'foo { display: none; margin: a| }', null, null);
+		assertCompletions('css', 'foo| { display: none; }', null, null);
+		assertCompletions('css', 'foo {| display: none; }', null, null);
+		assertCompletions('css', 'foo { display: none;| }', null, null);
+		assertCompletions('css', 'foo { display: none|; }', null, null);
+		assertCompletions('css', '.foo { display: none; -m-m10| }', 'margin: 10px;', '-moz-margin: 10px;\nmargin: 10px;');
+	});
+
+	test('Scss Emmet Completions', function (): any {
+		assertCompletions('scss', '.foo { display: none; .bar { m10| } }', 'margin: 10px;', 'margin: 10px;');
+		assertCompletions('scss', 'foo { display: none; .bar { pos:f| } }', 'position: fixed;', 'position: fixed;');
+		assertCompletions('scss', 'foo { display: none; margin: a| .bar {}}', null, null);
+		assertCompletions('scss', 'foo| { display: none; }', null, null);
+		assertCompletions('scss', 'foo {| display: none; }', null, null);
+		assertCompletions('scss', 'foo { display: none;| }', null, null);
+		assertCompletions('scss', 'foo { display: none|; }', null, null);
+		assertCompletions('scss', '.foo { display: none; -m-m10| }', 'margin: 10px;', '-moz-margin: 10px;\nmargin: 10px;');
+	});
+
+});
\ No newline at end of file
diff --git a/extensions/css/server/test/mocha.opts b/extensions/css/server/test/mocha.opts
new file mode 100644
index 00000000000..97e8b723ae2
--- /dev/null
+++ b/extensions/css/server/test/mocha.opts
@@ -0,0 +1,3 @@
+--ui tdd
+--useColors true
+./out/test
\ No newline at end of file
diff --git a/extensions/css/server/yarn.lock b/extensions/css/server/yarn.lock
index 5e8284700f9..3deaf65197a 100644
--- a/extensions/css/server/yarn.lock
+++ b/extensions/css/server/yarn.lock
@@ -2,37 +2,57 @@
 # yarn lockfile v1
 
 
+"@emmetio/extract-abbreviation@^0.1.4":
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@emmetio/extract-abbreviation/-/extract-abbreviation-0.1.4.tgz#f5be070db97901ecc37e5204f2ace68242cdcefa"
+
+"@types/mocha@2.2.33":
+  version "2.2.33"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.33.tgz#d79a0061ec270379f4d9e225f4096fb436669def"
+
 "@types/node@7.0.43":
   version "7.0.43"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
 
-vscode-css-languageservice@^3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.5.tgz#8470989c07bbe740db4fa621423e98384d2c342f"
+jsonc-parser@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.0.tgz#ddcc864ae708e60a7a6dd36daea00172fa8d9272"
+
+vscode-css-languageservice@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.6.tgz#0e9230347040ba0161fba941885195215ec9be40"
   dependencies:
-    vscode-languageserver-types "3.5.0"
+    vscode-languageserver-types "^3.6.0-next.1"
     vscode-nls "^2.0.1"
 
-vscode-jsonrpc@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0.tgz#87239d9e166b2d7352245b8a813597804c1d63aa"
-
-vscode-languageserver-protocol@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.0.tgz#067c5cbe27709795398d119692c97ebba1452209"
+vscode-emmet-helper@^1.1.34:
+  version "1.1.35"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.35.tgz#1a704811d573df55cb313e232d5b2e6ea6dca96c"
   dependencies:
-    vscode-jsonrpc "^3.5.0"
-    vscode-languageserver-types "^3.5.0"
+    "@emmetio/extract-abbreviation" "^0.1.4"
+    jsonc-parser "^1.0.0"
+    vscode-languageserver-types "^3.6.0-next.1"
 
-vscode-languageserver-types@3.5.0, vscode-languageserver-types@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz#e48d79962f0b8e02de955e3f524908e2b19c0374"
+vscode-jsonrpc@^3.6.0-next.1:
+  version "3.6.0-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0-next.1.tgz#3cb463dffe5842d6aec16718ca9252708cd6aabe"
 
-vscode-languageserver@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-3.5.0.tgz#d28099bc6ddda8c1dd16b707e454e1b1ddae0dba"
+vscode-languageserver-protocol@^3.6.0-next.5:
+  version "3.6.0-next.5"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0-next.5.tgz#ed2ec2db759826f753c0a13977dfb2bedc4d31b3"
   dependencies:
-    vscode-languageserver-protocol "^3.5.0"
+    vscode-jsonrpc "^3.6.0-next.1"
+    vscode-languageserver-types "^3.6.0-next.1"
+
+vscode-languageserver-types@^3.6.0-next.1:
+  version "3.6.0-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.6.0-next.1.tgz#98e488d3f87b666b4ee1a3d89f0023e246d358f3"
+
+vscode-languageserver@^4.0.0-next.4:
+  version "4.0.0-next.4"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-4.0.0-next.4.tgz#162440b15bedaab07e1676f046e4d9b8578b3d92"
+  dependencies:
+    vscode-languageserver-protocol "^3.6.0-next.5"
     vscode-uri "^1.0.1"
 
 vscode-nls@^2.0.1:
diff --git a/extensions/css/syntaxes/css.tmLanguage.json b/extensions/css/syntaxes/css.tmLanguage.json
index 4c734ddba93..a8fc2fe565e 100644
--- a/extensions/css/syntaxes/css.tmLanguage.json
+++ b/extensions/css/syntaxes/css.tmLanguage.json
@@ -5,13 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/atom/language-css/commit/2bc1e294e2440ad91197263cd9f95dc4b00bab2f",
-	"scopeName": "source.css",
 	"name": "CSS",
-	"fileTypes": [
-		"css",
-		"css.erb"
-	],
-	"firstLineMatch": "(?xi)\n# Emacs modeline\n-\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n  css\n(?=[\\s;]|(?<![-*])-\\*-).*?-\\*-\n|\n# Vim modeline\n(?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n  css\n(?=\\s|:|$)",
+	"scopeName": "source.css",
 	"patterns": [
 		{
 			"include": "#comment-block"
diff --git a/extensions/css/yarn.lock b/extensions/css/yarn.lock
index d7ec451f0e1..7ab2a57b25f 100644
--- a/extensions/css/yarn.lock
+++ b/extensions/css/yarn.lock
@@ -6,26 +6,26 @@
   version "7.0.43"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
 
-vscode-jsonrpc@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0.tgz#87239d9e166b2d7352245b8a813597804c1d63aa"
+vscode-jsonrpc@^3.6.0-next.1:
+  version "3.6.0-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0-next.1.tgz#3cb463dffe5842d6aec16718ca9252708cd6aabe"
 
-vscode-languageclient@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-3.5.0.tgz#36d02cc186a8365a4467719a290fb200a9ae490a"
+vscode-languageclient@^4.0.0-next.9:
+  version "4.0.0-next.9"
+  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-4.0.0-next.9.tgz#2a06568f46ee9de3490f85e227d3740a21a03d3a"
   dependencies:
-    vscode-languageserver-protocol "^3.5.0"
+    vscode-languageserver-protocol "^3.6.0-next.5"
 
-vscode-languageserver-protocol@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.0.tgz#067c5cbe27709795398d119692c97ebba1452209"
+vscode-languageserver-protocol@^3.6.0-next.5:
+  version "3.6.0-next.5"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0-next.5.tgz#ed2ec2db759826f753c0a13977dfb2bedc4d31b3"
   dependencies:
-    vscode-jsonrpc "^3.5.0"
-    vscode-languageserver-types "^3.5.0"
+    vscode-jsonrpc "^3.6.0-next.1"
+    vscode-languageserver-types "^3.6.0-next.1"
 
-vscode-languageserver-types@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz#e48d79962f0b8e02de955e3f524908e2b19c0374"
+vscode-languageserver-types@^3.6.0-next.1:
+  version "3.6.0-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.6.0-next.1.tgz#98e488d3f87b666b4ee1a3d89f0023e246d358f3"
 
 vscode-nls@^3.2.1:
   version "3.2.1"
diff --git a/extensions/diff/package.json b/extensions/diff/package.json
index a62e57243c3..79d69c4e472 100644
--- a/extensions/diff/package.json
+++ b/extensions/diff/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "diff",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/diff/package.nls.json b/extensions/diff/package.nls.json
new file mode 100644
index 00000000000..2159c202e68
--- /dev/null
+++ b/extensions/diff/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Diff File Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching and other language features in Diff files"
+}
\ No newline at end of file
diff --git a/extensions/diff/syntaxes/diff.tmLanguage.json b/extensions/diff/syntaxes/diff.tmLanguage.json
index e0d60de1081..d60bbb145f7 100644
--- a/extensions/diff/syntaxes/diff.tmLanguage.json
+++ b/extensions/diff/syntaxes/diff.tmLanguage.json
@@ -5,14 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/textmate/diff.tmbundle/commit/0593bb775eab1824af97ef2172fd38822abd97d7",
-	"fileTypes": [
-		"patch",
-		"diff",
-		"rej"
-	],
-	"firstLineMatch": "(?x)^\n\t\t(===\\ modified\\ file\n\t\t|==== \\s* // .+ \\s - \\s .+ \\s+ ====\n\t\t|Index:\\ \n\t\t|---\\ [^%\\n]\n\t\t|\\*\\*\\*.*\\d{4}\\s*$\n\t\t|\\d+(,\\d+)* (a|d|c) \\d+(,\\d+)* $\n\t\t|diff\\ --git\\ \n\t\t|commit\\ [0-9a-f]{40}$\n\t\t)",
-	"keyEquivalent": "^~D",
 	"name": "Diff",
+	"scopeName": "source.diff",
 	"patterns": [
 		{
 			"captures": {
@@ -162,7 +156,5 @@
 			"match": "^Only in .*: .*$\\n?",
 			"name": "meta.diff.only-in"
 		}
-	],
-	"scopeName": "source.diff",
-	"uuid": "7E848FF4-708E-11D9-97B4-0011242E4184"
+	]
 }
\ No newline at end of file
diff --git a/extensions/docker/package.json b/extensions/docker/package.json
index e58f0826419..905cca458a9 100644
--- a/extensions/docker/package.json
+++ b/extensions/docker/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "docker",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/docker/package.nls.json b/extensions/docker/package.nls.json
new file mode 100644
index 00000000000..3a8c10f1a23
--- /dev/null
+++ b/extensions/docker/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Docker Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching and other language features in Docker files"
+}
\ No newline at end of file
diff --git a/extensions/docker/syntaxes/docker.tmLanguage.json b/extensions/docker/syntaxes/docker.tmLanguage.json
index 44a028e7858..f7f414636c4 100644
--- a/extensions/docker/syntaxes/docker.tmLanguage.json
+++ b/extensions/docker/syntaxes/docker.tmLanguage.json
@@ -5,10 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/moby/moby/commit/abd39744c6f3ed854500e423f5fabf952165161f",
-	"fileTypes": [
-		"Dockerfile"
-	],
 	"name": "Dockerfile",
+	"scopeName": "source.dockerfile",
 	"patterns": [
 		{
 			"captures": {
@@ -100,7 +98,5 @@
 			"comment": "comment.line",
 			"match": "^(\\s*)((#).*$\\n?)"
 		}
-	],
-	"scopeName": "source.dockerfile",
-	"uuid": "a39d8795-59d2-49af-aa00-fe74ee29576e"
+	]
 }
\ No newline at end of file
diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index 61134ba415a..5974d63911d 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -337,7 +337,7 @@
         "@emmetio/html-matcher": "^0.3.3",
         "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode",
         "@emmetio/math-expression": "^0.1.1",
-        "vscode-emmet-helper": "^1.1.25",
+        "vscode-emmet-helper": "^1.1.36",
         "vscode-languageserver-types": "^3.5.0",
         "image-size": "^0.5.2",
         "vscode-nls": "3.2.1"
diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts
index f0349269969..309b345c28a 100644
--- a/extensions/emmet/src/abbreviationActions.ts
+++ b/extensions/emmet/src/abbreviationActions.ts
@@ -10,6 +10,12 @@ import { getEmmetHelper, getNode, getInnerRange, getMappingForIncludedLanguages,
 const trimRegex = /[\u00a0]*[\d|#|\-|\*|\u2022]+\.?/;
 const hexColorRegex = /^#\d+$/;
 
+const inlineElements = ['a', 'abbr', 'acronym', 'applet', 'b', 'basefont', 'bdo',
+	'big', 'br', 'button', 'cite', 'code', 'del', 'dfn', 'em', 'font', 'i',
+	'iframe', 'img', 'input', 'ins', 'kbd', 'label', 'map', 'object', 'q',
+	's', 'samp', 'select', 'small', 'span', 'strike', 'strong', 'sub', 'sup',
+	'textarea', 'tt', 'u', 'var'];
+
 interface ExpandAbbreviationInput {
 	syntax: string;
 	abbreviation: string;
@@ -62,7 +68,8 @@ export function wrapWithAbbreviation(args: any) {
 			const preceedingWhiteSpace = matches ? matches[1].length : 0;
 
 			rangeToReplace = new vscode.Range(rangeToReplace.start.line, rangeToReplace.start.character + preceedingWhiteSpace, rangeToReplace.end.line, rangeToReplace.end.character);
-			expandAbbrList.push({ syntax, abbreviation, rangeToReplace, textToWrap: ['\n\t$TM_SELECTED_TEXT\n'], filter });
+			let textToWrap = rangeToReplace.isSingleLine ? ['$TM_SELECTED_TEXT'] : ['\n\t$TM_SELECTED_TEXT\n'];
+			expandAbbrList.push({ syntax, abbreviation, rangeToReplace, textToWrap, filter });
 		});
 
 		return expandAbbreviationInRange(editor, expandAbbrList, true);
@@ -253,12 +260,14 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen
 			if (propertyNode.terminatorToken
 				&& propertyNode.separator
 				&& position.isAfterOrEqual(propertyNode.separatorToken.end)
-				&& position.isBeforeOrEqual(propertyNode.terminatorToken.start)) {
+				&& position.isBeforeOrEqual(propertyNode.terminatorToken.start)
+				&& abbreviation.indexOf(':') === -1) {
 				return hexColorRegex.test(abbreviation);
 			}
 			if (!propertyNode.terminatorToken
 				&& propertyNode.separator
-				&& position.isAfterOrEqual(propertyNode.separatorToken.end)) {
+				&& position.isAfterOrEqual(propertyNode.separatorToken.end)
+				&& abbreviation.indexOf(':') === -1) {
 				return hexColorRegex.test(abbreviation);
 			}
 		}
@@ -433,17 +442,29 @@ function expandAbbr(input: ExpandAbbreviationInput): string | undefined {
 
 	try {
 		// Expand the abbreviation
-		let expandedText = helper.expandAbbreviation(input.abbreviation, expandOptions);
+		let expandedText;
 
 		if (input.textToWrap) {
+			let parsedAbbr = helper.parseAbbreviation(input.abbreviation, expandOptions);
+			if (input.rangeToReplace.isSingleLine && input.textToWrap.length === 1) {
+
+				// Fetch rightmost element in the parsed abbreviation (i.e the element that will contain the wrapped text).
+				let wrappingNode = parsedAbbr;
+				while (wrappingNode && wrappingNode.children && wrappingNode.children.length > 0) {
+					wrappingNode = wrappingNode.children[wrappingNode.children.length - 1];
+				}
+
+				// If wrapping with a block element, insert newline in the text to wrap.
+				if (wrappingNode && inlineElements.indexOf(wrappingNode.name) === -1) {
+					wrappingNode.value = '\n\t' + wrappingNode.value + '\n';
+				}
+			}
+			expandedText = helper.expandAbbreviation(parsedAbbr, expandOptions);
 			// All $anyword would have been escaped by the emmet helper.
 			// Remove the escaping backslash from $TM_SELECTED_TEXT so that VS Code Snippet controller can treat it as a variable
 			expandedText = expandedText.replace('\\$TM_SELECTED_TEXT', '$TM_SELECTED_TEXT');
-
-			// If the expanded text is single line then we dont need the \t and \n we added to $TM_SELECTED_TEXT earlier
-			if (input.textToWrap.length === 1 && expandedText.indexOf('\n') === -1) {
-				expandedText = expandedText.replace(/\s*\$TM_SELECTED_TEXT\s*/, '$TM_SELECTED_TEXT');
-			}
+		} else {
+			expandedText = helper.expandAbbreviation(input.abbreviation, expandOptions);
 		}
 
 		return expandedText;
diff --git a/extensions/emmet/src/extension.ts b/extensions/emmet/src/extension.ts
index 3079a1764fe..0f7364a7de8 100644
--- a/extensions/emmet/src/extension.ts
+++ b/extensions/emmet/src/extension.ts
@@ -142,6 +142,7 @@ export function activate(context: vscode.ExtensionContext) {
  */
 const languageMappingForCompletionProviders: Map<string, string> = new Map<string, string>();
 const completionProvidersMapping: Map<string, vscode.Disposable> = new Map<string, vscode.Disposable>();
+const languagesToSkipCompletionProviders = ['html', 'css', 'scss', 'less'];
 
 function registerCompletionProviders(context: vscode.ExtensionContext) {
 	let completionProvider = new DefaultCompletionItemProvider();
@@ -169,7 +170,7 @@ function registerCompletionProviders(context: vscode.ExtensionContext) {
 	});
 
 	Object.keys(LANGUAGE_MODES).forEach(language => {
-		if (!languageMappingForCompletionProviders.has(language)) {
+		if (languagesToSkipCompletionProviders.indexOf(language) === -1 && !languageMappingForCompletionProviders.has(language)) {
 			const provider = vscode.languages.registerCompletionItemProvider(language, completionProvider, ...LANGUAGE_MODES[language]);
 			context.subscriptions.push(provider);
 
diff --git a/extensions/emmet/src/test/cssAbbreviationAction.test.ts b/extensions/emmet/src/test/cssAbbreviationAction.test.ts
index 39fc7df5755..4f07358638b 100644
--- a/extensions/emmet/src/test/cssAbbreviationAction.test.ts
+++ b/extensions/emmet/src/test/cssAbbreviationAction.test.ts
@@ -14,9 +14,9 @@ const completionProvider = new DefaultCompletionItemProvider();
 const cssContents = `
 .boo {
 	margin: 20px 10px;
-	m10
+	pos:f
 	background-image: url('tryme.png');
-	m10
+	pos:f
 }
 
 .boo .hoo {
@@ -57,9 +57,9 @@ suite('Tests for Expand Abbreviations (CSS)', () => {
 
 	test('Expand abbreviation (CSS)', () => {
 		return withRandomFileEditor(cssContents, 'css', (editor, doc) => {
-			editor.selections = [new Selection(3, 1, 3, 4), new Selection(5, 1, 5, 4)];
+			editor.selections = [new Selection(3, 1, 3, 6), new Selection(5, 1, 5, 6)];
 			return expandEmmetAbbreviation(null).then(() => {
-				assert.equal(editor.document.getText(), cssContents.replace(/m10/g, 'margin: 10px;'));
+				assert.equal(editor.document.getText(), cssContents.replace(/pos:f/g, 'position: fixed;'));
 				return Promise.resolve();
 			});
 		});
@@ -243,22 +243,22 @@ nav#
 	});
 
 	test('Expand abbreviation in completion list (CSS)', () => {
-		const abbreviation = 'm10';
-		const expandedText = 'margin: 10px;';
+		const abbreviation = 'pos:f';
+		const expandedText = 'position: fixed;';
 
 		return withRandomFileEditor(cssContents, 'css', (editor, doc) => {
-			editor.selection = new Selection(3, 1, 3, 4);
+			editor.selection = new Selection(3, 1, 3, 6);
 			const cancelSrc = new CancellationTokenSource();
-			const completionPromise1 = completionProvider.provideCompletionItems(editor.document, new Position(3, 4), cancelSrc.token);
-			const completionPromise2 = completionProvider.provideCompletionItems(editor.document, new Position(5, 4), cancelSrc.token);
+			const completionPromise1 = completionProvider.provideCompletionItems(editor.document, new Position(3, 6), cancelSrc.token);
+			const completionPromise2 = completionProvider.provideCompletionItems(editor.document, new Position(5, 6), cancelSrc.token);
 			if (!completionPromise1 || !completionPromise2) {
-				assert.equal(1, 2, `Problem with expanding m10`);
+				assert.equal(1, 2, `Problem with expanding pos:f`);
 				return Promise.resolve();
 			}
 
 			const callBack = (completionList: CompletionList) => {
 				if (!completionList.items || !completionList.items.length) {
-					assert.equal(1, 2, `Problem with expanding m10`);
+					assert.equal(1, 2, `Problem with expanding pos:f`);
 					return;
 				}
 				const emmetCompletionItem = completionList.items[0];
diff --git a/extensions/emmet/src/test/wrapWithAbbreviation.test.ts b/extensions/emmet/src/test/wrapWithAbbreviation.test.ts
index 801b24b273e..0862af36db9 100644
--- a/extensions/emmet/src/test/wrapWithAbbreviation.test.ts
+++ b/extensions/emmet/src/test/wrapWithAbbreviation.test.ts
@@ -197,6 +197,31 @@ suite('Tests for Wrap with Abbreviations', () => {
 		});
 	});
 
+	test('Wrap with multiline abbreviation doesnt add extra spaces', () => {
+		// Issue #29898
+		const contents = `
+	hello
+	`;
+		const expectedContents = `
+	<ul>
+		<li><a href="">hello</a></li>
+	</ul>
+	`;
+
+		return withRandomFileEditor(contents, 'html', (editor, doc) => {
+			editor.selections = [new Selection(1, 2, 1, 2)];
+			const promise = wrapWithAbbreviation({ abbreviation: 'ul>li>a' });
+			if (!promise) {
+				assert.equal(1, 2, 'Wrap returned undefined instead of promise.');
+				return Promise.resolve();
+			}
+			return promise.then(() => {
+				assert.equal(editor.document.getText(), expectedContents);
+				return Promise.resolve();
+			});
+		});
+	});
+
 	test('Wrap individual lines with abbreviation', () => {
 		const contents = `
 	<ul class="nav main">
diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
index fde2c573dd3..5ed8c9e55f6 100644
--- a/extensions/emmet/src/util.ts
+++ b/extensions/emmet/src/util.ts
@@ -8,7 +8,6 @@ import parse from '@emmetio/html-matcher';
 import parseStylesheet from '@emmetio/css-parser';
 import { Node, HtmlNode, CssToken, Property, Rule } from 'EmmetNode';
 import { DocumentStreamReader } from './bufferStream';
-import * as path from 'path';
 
 let _emmetHelper: any;
 let _currentExtensionsPath: string | undefined = undefined;
@@ -26,17 +25,9 @@ export function resolveUpdateExtensionsPath() {
 		return;
 	}
 	let extensionsPath = vscode.workspace.getConfiguration('emmet')['extensionsPath'];
-	if (extensionsPath && !path.isAbsolute(extensionsPath)) {
-		extensionsPath = path.join(vscode.workspace.rootPath || '', extensionsPath);
-	}
 	if (_currentExtensionsPath !== extensionsPath) {
 		_currentExtensionsPath = extensionsPath;
-		if (_currentExtensionsPath && !path.isAbsolute(_currentExtensionsPath)) {
-			vscode.window.showErrorMessage('The path provided in emmet.extensionsPath setting should be absolute path');
-			_emmetHelper.updateExtensionsPath();
-			return;
-		}
-		_emmetHelper.updateExtensionsPath(_currentExtensionsPath).then(null, (err: string) => vscode.window.showErrorMessage(err));
+		_emmetHelper.updateExtensionsPath(extensionsPath, vscode.workspace.rootPath).then(null, (err: string) => vscode.window.showErrorMessage(err));
 	}
 }
 
@@ -63,7 +54,6 @@ const emmetModes = ['html', 'pug', 'slim', 'haml', 'xml', 'xsl', 'jsx', 'css', '
 // For other languages, users will have to use `emmet.includeLanguages` or
 // language specific extensions can provide emmet completion support
 export const MAPPED_MODES: Object = {
-	'handlebars': 'html',
 	'php': 'html'
 };
 
diff --git a/extensions/emmet/yarn.lock b/extensions/emmet/yarn.lock
index 9162b566dc1..8c866dc3db7 100644
--- a/extensions/emmet/yarn.lock
+++ b/extensions/emmet/yarn.lock
@@ -2052,22 +2052,22 @@ vinyl@~2.0.1:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
-vscode-emmet-helper@^1.1.25:
-  version "1.1.25"
-  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.25.tgz#2c43df3e8502d420fb91032826fc0cb6efee5611"
+vscode-emmet-helper@^1.1.36:
+  version "1.1.36"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.36.tgz#537cbf91041a3d426f6f24dd9834550a26e61685"
   dependencies:
     "@emmetio/extract-abbreviation" "^0.1.4"
     jsonc-parser "^1.0.0"
-    vscode-languageserver-types "^3.0.3"
-
-vscode-languageserver-types@^3.0.3:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.3.0.tgz#8964dc7c2247536fbefd2d6836bf3febac80dd00"
+    vscode-languageserver-types "^3.6.0-next.1"
 
 vscode-languageserver-types@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz#e48d79962f0b8e02de955e3f524908e2b19c0374"
 
+vscode-languageserver-types@^3.6.0-next.1:
+  version "3.6.0-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.6.0-next.1.tgz#98e488d3f87b666b4ee1a3d89f0023e246d358f3"
+
 vscode-nls@3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
diff --git a/extensions/extension-editing/package.json b/extensions/extension-editing/package.json
index 6c13e41f4a1..1068667eb1c 100644
--- a/extensions/extension-editing/package.json
+++ b/extensions/extension-editing/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "extension-editing",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.0.1",
 	"publisher": "vscode",
 	"engines": {
diff --git a/extensions/extension-editing/package.nls.json b/extensions/extension-editing/package.nls.json
new file mode 100644
index 00000000000..89325ce28d9
--- /dev/null
+++ b/extensions/extension-editing/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Package File Editing",
+	"description": "Provides intelli-sense for VS Code extension points and linting capabilities in Package json files"
+}
\ No newline at end of file
diff --git a/extensions/fsharp/package.json b/extensions/fsharp/package.json
index b0ca0ae5af2..616dce6c703 100644
--- a/extensions/fsharp/package.json
+++ b/extensions/fsharp/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "fsharp",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/fsharp/package.nls.json b/extensions/fsharp/package.nls.json
new file mode 100644
index 00000000000..9c2a0992ae4
--- /dev/null
+++ b/extensions/fsharp/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "F# Language Features",
+	"description": "Provides Syntax highlighting, Folding, Bracket matching, Snippets and other language features in F# files"
+}
\ No newline at end of file
diff --git a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json b/extensions/fsharp/syntaxes/fsharp.tmLanguage.json
index a47bc570fbe..eb16f2829ad 100644
--- a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json
+++ b/extensions/fsharp/syntaxes/fsharp.tmLanguage.json
@@ -7,11 +7,6 @@
 	"version": "https://github.com/ionide/ionide-fsgrammar/commit/9aa4b1055e3173225bc0d4b4e48542c2450beb99",
 	"name": "fsharp",
 	"scopeName": "source.fsharp",
-	"fileTypes": [
-		"fs"
-	],
-	"foldingStartMarker": "",
-	"foldingStopMarker": "",
 	"patterns": [
 		{
 			"include": "#comments"
diff --git a/extensions/git/.vscodeignore b/extensions/git/.vscodeignore
index bbb6314c1b9..436567b7d69 100644
--- a/extensions/git/.vscodeignore
+++ b/extensions/git/.vscodeignore
@@ -1,4 +1,5 @@
 src/**
 test/**
 out/test/**
-tsconfig.json
\ No newline at end of file
+tsconfig.json
+build/**
\ No newline at end of file
diff --git a/extensions/git/OSSREADME.json b/extensions/git/OSSREADME.json
index 0e3ddd52faf..347ae77f6e5 100644
--- a/extensions/git/OSSREADME.json
+++ b/extensions/git/OSSREADME.json
@@ -1,29 +1,42 @@
 // ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
-[{
-	"name": "textmate/git.tmbundle",
-	"version": "0.0.0",
-	"license": "MIT",
-	"repositoryURL": "https://github.com/textmate/git.tmbundle",
-	"licenseDetail": [
-		"Copyright (c) 2008 Tim Harper",
-		"",
-		"Permission is hereby granted, free of charge, to any person obtaining",
-		"a copy of this software and associated documentation files (the\"",
-		"Software\"), to deal in the Software without restriction, including",
-		"without limitation the rights to use, copy, modify, merge, publish,",
-		"distribute, sublicense, and/or sell copies of the Software, and to",
-		"permit persons to whom the Software is furnished to do so, subject to",
-		"the following conditions:",
-		"",
-		"The above copyright notice and this permission notice shall be",
-		"included in all copies or substantial portions of the Software.",
-		"",
-		"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,",
-		"EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF",
-		"MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND",
-		"NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE",
-		"LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
-		"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION",
-		"WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
-	]
-}]
\ No newline at end of file
+[
+	{
+		"name": "textmate/git.tmbundle",
+		"version": "0.0.0",
+		"license": "MIT",
+		"repositoryURL": "https://github.com/textmate/git.tmbundle",
+		"licenseDetail": [
+			"Copyright (c) 2008 Tim Harper",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining",
+			"a copy of this software and associated documentation files (the\"",
+			"Software\"), to deal in the Software without restriction, including",
+			"without limitation the rights to use, copy, modify, merge, publish,",
+			"distribute, sublicense, and/or sell copies of the Software, and to",
+			"permit persons to whom the Software is furnished to do so, subject to",
+			"the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be",
+			"included in all copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,",
+			"EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF",
+			"MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND",
+			"NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE",
+			"LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
+			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION",
+			"WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		"name": "textmate/diff.tmbundle",
+		"version": "0.0.0",
+		"repositoryURL": "https://github.com/textmate/diff.tmbundle",
+		"licenseDetail": [
+			"Permission to copy, use, modify, sell and distribute this",
+			"software is granted. This software is provided \"as is\" without",
+			"express or implied warranty, and with no claim as to its",
+			"suitability for any purpose."
+		]
+	}
+]
\ No newline at end of file
diff --git a/extensions/git/README.md b/extensions/git/README.md
new file mode 100644
index 00000000000..b97ec81e9a0
--- /dev/null
+++ b/extensions/git/README.md
@@ -0,0 +1,2 @@
+# Git integration for Visual Studio Code
+
diff --git a/extensions/gitsyntax/build/update-grammars.js b/extensions/git/build/update-grammars.js
similarity index 100%
rename from extensions/gitsyntax/build/update-grammars.js
rename to extensions/git/build/update-grammars.js
diff --git a/extensions/gitsyntax/diff.language-configuration.json b/extensions/git/languages/diff.language-configuration.json
similarity index 100%
rename from extensions/gitsyntax/diff.language-configuration.json
rename to extensions/git/languages/diff.language-configuration.json
diff --git a/extensions/gitsyntax/git-commit.language-configuration.json b/extensions/git/languages/git-commit.language-configuration.json
similarity index 100%
rename from extensions/gitsyntax/git-commit.language-configuration.json
rename to extensions/git/languages/git-commit.language-configuration.json
diff --git a/extensions/gitsyntax/git-rebase.language-configuration.json b/extensions/git/languages/git-rebase.language-configuration.json
similarity index 100%
rename from extensions/gitsyntax/git-rebase.language-configuration.json
rename to extensions/git/languages/git-rebase.language-configuration.json
diff --git a/extensions/git/package.json b/extensions/git/package.json
index 0d1fe1fd519..c4c754dc258 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -1,8 +1,8 @@
 {
   "name": "git",
+  "displayName": "%displayName%",
+  "description": "%description%",
   "publisher": "vscode",
-  "displayName": "git",
-  "description": "Git",
   "version": "0.0.1",
   "engines": {
     "vscode": "^1.5.0"
@@ -16,9 +16,11 @@
     "*"
   ],
   "main": "./out/main",
+  "icon": "resources/icons/git.png",
   "scripts": {
     "compile": "gulp compile-extension:git",
-    "watch": "gulp watch-extension:git"
+    "watch": "gulp watch-extension:git",
+    "update-grammar": "node ./build/update-grammars.js"
   },
   "contributes": {
     "commands": [
@@ -1020,13 +1022,75 @@
           "highContrast": "#8db9e2"
         }
       }
-    ]
+    ],
+    "languages": [
+      {
+        "id": "git-commit",
+        "aliases": [
+          "Git Commit Message",
+          "git-commit"
+        ],
+        "filenames": [
+          "COMMIT_EDITMSG",
+          "MERGE_MSG"
+        ],
+        "configuration": "./languages/git-commit.language-configuration.json"
+      },
+      {
+        "id": "git-rebase",
+        "aliases": [
+          "Git Rebase Message",
+          "git-rebase"
+        ],
+        "filenames": [
+          "git-rebase-todo"
+        ],
+        "configuration": "./languages/git-rebase.language-configuration.json"
+      },
+      {
+        "id": "diff",
+        "aliases": [
+          "Diff",
+          "diff"
+        ],
+        "extensions": [
+          ".patch",
+          ".diff",
+          ".rej"
+        ],
+        "configuration": "./languages/diff.language-configuration.json"
+      }
+    ],
+    "grammars": [
+      {
+        "language": "git-commit",
+        "scopeName": "text.git-commit",
+        "path": "./syntaxes/git-commit.tmLanguage.json"
+      },
+      {
+        "language": "git-rebase",
+        "scopeName": "text.git-rebase",
+        "path": "./syntaxes/git-rebase.tmLanguage.json"
+      },
+      {
+        "language": "diff",
+        "scopeName": "source.diff",
+        "path": "./syntaxes/diff.tmLanguage.json"
+      }
+    ],
+    "configurationDefaults": {
+      "[git-commit]": {
+        "editor.rulers": [
+          72
+        ]
+      }
+    }
   },
   "dependencies": {
     "byline": "^5.0.0",
     "file-type": "^7.2.0",
     "iconv-lite": "0.4.19",
-    "vscode-extension-telemetry": "0.0.11",
+    "vscode-extension-telemetry": "0.0.13",
     "vscode-nls": "^3.2.1",
     "which": "^1.3.0"
   },
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
index b3bed912bff..6910adcbdad 100644
--- a/extensions/git/package.nls.json
+++ b/extensions/git/package.nls.json
@@ -1,4 +1,6 @@
 {
+	"displayName": "Git",
+	"description": "Git SCM Integration",
 	"command.clone": "Clone",
 	"command.init": "Initialize Repository",
 	"command.close": "Close Repository",
diff --git a/extensions/git/resources/icons/git.png b/extensions/git/resources/icons/git.png
new file mode 100644
index 00000000000..51f4ae5404f
Binary files /dev/null and b/extensions/git/resources/icons/git.png differ
diff --git a/extensions/git/src/autofetch.ts b/extensions/git/src/autofetch.ts
index ef309483297..f76dd7db388 100644
--- a/extensions/git/src/autofetch.ts
+++ b/extensions/git/src/autofetch.ts
@@ -57,7 +57,7 @@ export class AutoFetcher {
 		const readMore: MessageItem = { title: localize('read more', "Read More") };
 		const no: MessageItem = { isCloseAffordance: true, title: localize('no', "No") };
 		const askLater: MessageItem = { title: localize('not now', "Ask Me Later") };
-		const result = await window.showInformationMessage(localize('suggest auto fetch', "Would you like Code to periodically run `git fetch`?"), yes, readMore, no, askLater);
+		const result = await window.showInformationMessage(localize('suggest auto fetch', "Would you like Code to periodically run 'git fetch'?"), yes, readMore, no, askLater);
 
 		if (result === askLater) {
 			return;
diff --git a/extensions/gitsyntax/syntaxes/diff.tmLanguage.json b/extensions/git/syntaxes/diff.tmLanguage.json
similarity index 90%
rename from extensions/gitsyntax/syntaxes/diff.tmLanguage.json
rename to extensions/git/syntaxes/diff.tmLanguage.json
index e0d60de1081..d60bbb145f7 100644
--- a/extensions/gitsyntax/syntaxes/diff.tmLanguage.json
+++ b/extensions/git/syntaxes/diff.tmLanguage.json
@@ -5,14 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/textmate/diff.tmbundle/commit/0593bb775eab1824af97ef2172fd38822abd97d7",
-	"fileTypes": [
-		"patch",
-		"diff",
-		"rej"
-	],
-	"firstLineMatch": "(?x)^\n\t\t(===\\ modified\\ file\n\t\t|==== \\s* // .+ \\s - \\s .+ \\s+ ====\n\t\t|Index:\\ \n\t\t|---\\ [^%\\n]\n\t\t|\\*\\*\\*.*\\d{4}\\s*$\n\t\t|\\d+(,\\d+)* (a|d|c) \\d+(,\\d+)* $\n\t\t|diff\\ --git\\ \n\t\t|commit\\ [0-9a-f]{40}$\n\t\t)",
-	"keyEquivalent": "^~D",
 	"name": "Diff",
+	"scopeName": "source.diff",
 	"patterns": [
 		{
 			"captures": {
@@ -162,7 +156,5 @@
 			"match": "^Only in .*: .*$\\n?",
 			"name": "meta.diff.only-in"
 		}
-	],
-	"scopeName": "source.diff",
-	"uuid": "7E848FF4-708E-11D9-97B4-0011242E4184"
+	]
 }
\ No newline at end of file
diff --git a/extensions/gitsyntax/syntaxes/git-commit.tmLanguage.json b/extensions/git/syntaxes/git-commit.tmLanguage.json
similarity index 95%
rename from extensions/gitsyntax/syntaxes/git-commit.tmLanguage.json
rename to extensions/git/syntaxes/git-commit.tmLanguage.json
index 5b2ccacd56d..c2b8d628ab0 100644
--- a/extensions/gitsyntax/syntaxes/git-commit.tmLanguage.json
+++ b/extensions/git/syntaxes/git-commit.tmLanguage.json
@@ -5,13 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/textmate/git.tmbundle/commit/93897a78c6e52bef13dadc0d4091d203c5facb40",
-	"fileTypes": [
-		"COMMIT_EDITMSG",
-		"MERGE_MSG"
-	],
-	"foldingStartMarker": "^\\+\\+\\+",
-	"foldingStopMarker": "^---",
 	"name": "Git Commit Message",
+	"scopeName": "text.git-commit",
 	"patterns": [
 		{
 			"begin": "\\A(?!# Please enter the commit message)",
@@ -142,7 +137,5 @@
 				}
 			]
 		}
-	},
-	"scopeName": "text.git-commit",
-	"uuid": "BFE83C06-8508-44BE-A975-95A57BF619A7"
+	}
 }
\ No newline at end of file
diff --git a/extensions/gitsyntax/syntaxes/git-rebase.tmLanguage.json b/extensions/git/syntaxes/git-rebase.tmLanguage.json
similarity index 92%
rename from extensions/gitsyntax/syntaxes/git-rebase.tmLanguage.json
rename to extensions/git/syntaxes/git-rebase.tmLanguage.json
index 89ef957a1b9..3ee481bede1 100644
--- a/extensions/gitsyntax/syntaxes/git-rebase.tmLanguage.json
+++ b/extensions/git/syntaxes/git-rebase.tmLanguage.json
@@ -5,10 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/textmate/git.tmbundle/commit/d1db42c2d71948662098183a6df519fb53a7a15b",
-	"fileTypes": [
-		"git-rebase-todo"
-	],
 	"name": "Git Rebase Message",
+	"scopeName": "text.git-rebase",
 	"patterns": [
 		{
 			"captures": {
@@ -34,7 +32,5 @@
 			"match": "^\\s*(pick|p|reword|r|edit|e|squash|s|fixup|f|exec|x|drop|d)\\s+([0-9a-f]+)\\s+(.*)$",
 			"name": "meta.commit-command.git-rebase"
 		}
-	],
-	"scopeName": "text.git-rebase",
-	"uuid": "7F1CC209-5F6D-486A-8180-09FA282381A1"
+	]
 }
\ No newline at end of file
diff --git a/extensions/gitsyntax/test/colorize-fixtures/COMMIT_EDITMSG b/extensions/git/test/colorize-fixtures/COMMIT_EDITMSG
similarity index 100%
rename from extensions/gitsyntax/test/colorize-fixtures/COMMIT_EDITMSG
rename to extensions/git/test/colorize-fixtures/COMMIT_EDITMSG
diff --git a/extensions/gitsyntax/test/colorize-fixtures/example.diff b/extensions/git/test/colorize-fixtures/example.diff
similarity index 100%
rename from extensions/gitsyntax/test/colorize-fixtures/example.diff
rename to extensions/git/test/colorize-fixtures/example.diff
diff --git a/extensions/gitsyntax/test/colorize-fixtures/git-rebase-todo b/extensions/git/test/colorize-fixtures/git-rebase-todo
similarity index 100%
rename from extensions/gitsyntax/test/colorize-fixtures/git-rebase-todo
rename to extensions/git/test/colorize-fixtures/git-rebase-todo
diff --git a/extensions/gitsyntax/test/colorize-results/COMMIT_EDITMSG.json b/extensions/git/test/colorize-results/COMMIT_EDITMSG.json
similarity index 100%
rename from extensions/gitsyntax/test/colorize-results/COMMIT_EDITMSG.json
rename to extensions/git/test/colorize-results/COMMIT_EDITMSG.json
diff --git a/extensions/gitsyntax/test/colorize-results/example_diff.json b/extensions/git/test/colorize-results/example_diff.json
similarity index 100%
rename from extensions/gitsyntax/test/colorize-results/example_diff.json
rename to extensions/git/test/colorize-results/example_diff.json
diff --git a/extensions/gitsyntax/test/colorize-results/git-rebase-todo.json b/extensions/git/test/colorize-results/git-rebase-todo.json
similarity index 100%
rename from extensions/gitsyntax/test/colorize-results/git-rebase-todo.json
rename to extensions/git/test/colorize-results/git-rebase-todo.json
diff --git a/extensions/git/yarn.lock b/extensions/git/yarn.lock
index f840f51b49f..93801131a77 100644
--- a/extensions/git/yarn.lock
+++ b/extensions/git/yarn.lock
@@ -253,9 +253,9 @@ supports-color@3.1.2:
   dependencies:
     has-flag "^1.0.0"
 
-vscode-extension-telemetry@0.0.11:
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.11.tgz#f2dde487f01d2b079f55ab47a0247f5a772c4e06"
+vscode-extension-telemetry@0.0.13:
+  version "0.0.13"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.13.tgz#8a4438cbb0a9f9f8ad65479e4ec08683aa4de0f7"
   dependencies:
     applicationinsights "1.0.1"
 
diff --git a/extensions/gitsyntax/.vscodeignore b/extensions/gitsyntax/.vscodeignore
deleted file mode 100644
index 30c5d19d6c3..00000000000
--- a/extensions/gitsyntax/.vscodeignore
+++ /dev/null
@@ -1,2 +0,0 @@
-test/**
-build/**
\ No newline at end of file
diff --git a/extensions/gitsyntax/OSSREADME.json b/extensions/gitsyntax/OSSREADME.json
deleted file mode 100644
index 347ae77f6e5..00000000000
--- a/extensions/gitsyntax/OSSREADME.json
+++ /dev/null
@@ -1,42 +0,0 @@
-// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
-[
-	{
-		"name": "textmate/git.tmbundle",
-		"version": "0.0.0",
-		"license": "MIT",
-		"repositoryURL": "https://github.com/textmate/git.tmbundle",
-		"licenseDetail": [
-			"Copyright (c) 2008 Tim Harper",
-			"",
-			"Permission is hereby granted, free of charge, to any person obtaining",
-			"a copy of this software and associated documentation files (the\"",
-			"Software\"), to deal in the Software without restriction, including",
-			"without limitation the rights to use, copy, modify, merge, publish,",
-			"distribute, sublicense, and/or sell copies of the Software, and to",
-			"permit persons to whom the Software is furnished to do so, subject to",
-			"the following conditions:",
-			"",
-			"The above copyright notice and this permission notice shall be",
-			"included in all copies or substantial portions of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,",
-			"EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF",
-			"MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND",
-			"NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE",
-			"LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
-			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION",
-			"WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
-		]
-	},
-	{
-		"name": "textmate/diff.tmbundle",
-		"version": "0.0.0",
-		"repositoryURL": "https://github.com/textmate/diff.tmbundle",
-		"licenseDetail": [
-			"Permission to copy, use, modify, sell and distribute this",
-			"software is granted. This software is provided \"as is\" without",
-			"express or implied warranty, and with no claim as to its",
-			"suitability for any purpose."
-		]
-	}
-]
\ No newline at end of file
diff --git a/extensions/gitsyntax/package.json b/extensions/gitsyntax/package.json
deleted file mode 100644
index 306713af50b..00000000000
--- a/extensions/gitsyntax/package.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  "name": "gitsyntax",
-  "publisher": "vscode",
-  "displayName": "gitsyntax",
-  "description": "Git Syntax",
-  "version": "0.0.1",
-  "engines": {
-    "vscode": "^1.5.0"
-  },
-  "categories": [
-    "Other"
-  ],
-  "scripts": {
-    "update-grammar": "node ./build/update-grammars.js"
-  },
-  "contributes": {
-    "languages": [
-      {
-        "id": "git-commit",
-        "aliases": [
-          "Git Commit Message",
-          "git-commit"
-        ],
-        "filenames": [
-          "COMMIT_EDITMSG",
-          "MERGE_MSG"
-        ],
-        "configuration": "./git-commit.language-configuration.json"
-      },
-      {
-        "id": "git-rebase",
-        "aliases": [
-          "Git Rebase Message",
-          "git-rebase"
-        ],
-        "filenames": [
-          "git-rebase-todo"
-        ],
-        "configuration": "./git-rebase.language-configuration.json"
-      },
-      {
-        "id": "diff",
-        "aliases": [
-          "Diff",
-          "diff"
-        ],
-        "extensions": [
-          ".patch",
-          ".diff",
-          ".rej"
-        ],
-        "configuration": "./diff.language-configuration.json"
-      }
-    ],
-    "grammars": [
-      {
-        "language": "git-commit",
-        "scopeName": "text.git-commit",
-        "path": "./syntaxes/git-commit.tmLanguage.json"
-      },
-      {
-        "language": "git-rebase",
-        "scopeName": "text.git-rebase",
-        "path": "./syntaxes/git-rebase.tmLanguage.json"
-      },
-      {
-        "language": "diff",
-        "scopeName": "source.diff",
-        "path": "./syntaxes/diff.tmLanguage.json"
-      }
-    ],
-    "configurationDefaults": {
-      "[git-commit]": {
-        "editor.rulers": [
-          72
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/extensions/go/syntaxes/go.tmLanguage.json b/extensions/go/syntaxes/go.tmLanguage.json
index f4e17874a84..bc73a1d91bd 100644
--- a/extensions/go/syntaxes/go.tmLanguage.json
+++ b/extensions/go/syntaxes/go.tmLanguage.json
@@ -5,14 +5,9 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/atom/language-go/commit/b6fd68f74efa109679e31fe6f4a41ac105262d0e",
-	"scopeName": "source.go",
 	"name": "Go",
+	"scopeName": "source.go",
 	"comment": "Go language",
-	"fileTypes": [
-		"go"
-	],
-	"foldingStartMarker": "({|\\()\\s*$",
-	"foldingStopMarker": "(}|\\))\\s*$",
 	"patterns": [
 		{
 			"include": "#comments"
diff --git a/extensions/groovy/package.json b/extensions/groovy/package.json
index 56f91c9dda4..169b38d6588 100644
--- a/extensions/groovy/package.json
+++ b/extensions/groovy/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "groovy",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/groovy/package.nls.json b/extensions/groovy/package.nls.json
new file mode 100644
index 00000000000..6579bc61876
--- /dev/null
+++ b/extensions/groovy/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Groovy Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching, Snippets and other language features in Groovy files"
+}
\ No newline at end of file
diff --git a/extensions/groovy/syntaxes/groovy.tmLanguage.json b/extensions/groovy/syntaxes/groovy.tmLanguage.json
index 9e8be43b53b..57ebab39405 100644
--- a/extensions/groovy/syntaxes/groovy.tmLanguage.json
+++ b/extensions/groovy/syntaxes/groovy.tmLanguage.json
@@ -5,14 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/textmate/groovy.tmbundle/commit/85d8f7c97ae473ccb9473f6c8d27e4ec957f4be1",
-	"fileTypes": [
-		"groovy",
-		"gvy"
-	],
-	"foldingStartMarker": "(\\{\\s*$|^\\s*// \\{\\{\\{)",
-	"foldingStopMarker": "^\\s*(\\}|// \\}\\}\\}$)",
-	"keyEquivalent": "^~G",
 	"name": "Groovy",
+	"scopeName": "source.groovy",
 	"patterns": [
 		{
 			"captures": {
@@ -1385,7 +1379,5 @@
 				}
 			]
 		}
-	},
-	"scopeName": "source.groovy",
-	"uuid": "B3A64888-EBBB-4436-8D9E-F1169C5D7613"
+	}
 }
\ No newline at end of file
diff --git a/extensions/handlebars/package.json b/extensions/handlebars/package.json
index 2f70eb6f100..a0bcf1b6deb 100644
--- a/extensions/handlebars/package.json
+++ b/extensions/handlebars/package.json
@@ -1,5 +1,7 @@
 {
-  "name": "handlebars",
+	"name": "handlebars",
+	"displayName": "%displayName%",
+	"description": "%description%",
   "version": "0.1.0",
   "publisher": "vscode",
   "engines": {
diff --git a/extensions/handlebars/package.nls.json b/extensions/handlebars/package.nls.json
new file mode 100644
index 00000000000..9af7548cf04
--- /dev/null
+++ b/extensions/handlebars/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Handlebars Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching and other language features in Handlebars files"
+}
\ No newline at end of file
diff --git a/extensions/handlebars/syntaxes/Handlebars.tmLanguage.json b/extensions/handlebars/syntaxes/Handlebars.tmLanguage.json
index ddd7547935f..957f16ae035 100644
--- a/extensions/handlebars/syntaxes/Handlebars.tmLanguage.json
+++ b/extensions/handlebars/syntaxes/Handlebars.tmLanguage.json
@@ -6,6 +6,42 @@
 	],
 	"version": "https://github.com/daaain/Handlebars/commit/790f2b0222098a3a236bd9e91bb9a039eeca4d8e",
 	"name": "Handlebars",
+	"scopeName": "text.html.handlebars",
+	"patterns": [
+		{
+			"include": "#yfm"
+		},
+		{
+			"include": "#extends"
+		},
+		{
+			"include": "#block_comments"
+		},
+		{
+			"include": "#comments"
+		},
+		{
+			"include": "#block_helper"
+		},
+		{
+			"include": "#end_block"
+		},
+		{
+			"include": "#else_token"
+		},
+		{
+			"include": "#partial_and_var"
+		},
+		{
+			"include": "#inline_script"
+		},
+		{
+			"include": "#html_tags"
+		},
+		{
+			"include": "text.html.basic"
+		}
+	],
 	"repository": {
 		"html_tags": {
 			"patterns": [
@@ -812,57 +848,5 @@
 				}
 			]
 		}
-	},
-	"scopeName": "text.html.handlebars",
-	"patterns": [
-		{
-			"include": "#yfm"
-		},
-		{
-			"include": "#extends"
-		},
-		{
-			"include": "#block_comments"
-		},
-		{
-			"include": "#comments"
-		},
-		{
-			"include": "#block_helper"
-		},
-		{
-			"include": "#end_block"
-		},
-		{
-			"include": "#else_token"
-		},
-		{
-			"include": "#partial_and_var"
-		},
-		{
-			"include": "#inline_script"
-		},
-		{
-			"include": "#html_tags"
-		},
-		{
-			"include": "text.html.basic"
-		}
-	],
-	"fileTypes": [
-		"handlebars",
-		"handlebars.html",
-		"hbr",
-		"hbrs",
-		"hbs",
-		"hdbs",
-		"hjs",
-		"mu",
-		"mustache",
-		"rac",
-		"stache",
-		"template",
-		"tmpl"
-	],
-	"uuid": "70E91676-DE0A-4266-A2B9-3AD2E535E484"
+	}
 }
\ No newline at end of file
diff --git a/extensions/hlsl/package.json b/extensions/hlsl/package.json
index 280c4563828..22a13fd68cf 100644
--- a/extensions/hlsl/package.json
+++ b/extensions/hlsl/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "hlsl",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/hlsl/package.nls.json b/extensions/hlsl/package.nls.json
new file mode 100644
index 00000000000..44d18a9283a
--- /dev/null
+++ b/extensions/hlsl/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "HLSL Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching and other language features in HLSL files"
+}
\ No newline at end of file
diff --git a/extensions/hlsl/syntaxes/hlsl.tmLanguage.json b/extensions/hlsl/syntaxes/hlsl.tmLanguage.json
index 475923aaca5..dd8f5356fee 100644
--- a/extensions/hlsl/syntaxes/hlsl.tmLanguage.json
+++ b/extensions/hlsl/syntaxes/hlsl.tmLanguage.json
@@ -5,18 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/tgjones/shaders-tmLanguage/commit/cd1ef40f549f9ce2b9e6b73498688de114a85382",
-	"scopeName": "source.hlsl",
 	"name": "HLSL",
-	"fileTypes": [
-		"hlsl",
-		"hlsli",
-		"fx",
-		"fxh",
-		"vsh",
-		"psh",
-		"cginc",
-		"compute"
-	],
+	"scopeName": "source.hlsl",
 	"patterns": [
 		{
 			"name": "comment.line.block.hlsl",
diff --git a/extensions/html/client/src/htmlMain.ts b/extensions/html/client/src/htmlMain.ts
index 6bcce08f9d6..1ddf5f1b665 100644
--- a/extensions/html/client/src/htmlMain.ts
+++ b/extensions/html/client/src/htmlMain.ts
@@ -8,14 +8,12 @@ import * as path from 'path';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
-import { languages, ExtensionContext, IndentAction, Position, TextDocument, Color, ColorInformation, ColorPresentation, Range, CompletionItem, CompletionItemKind, SnippetString } from 'vscode';
+import { languages, ExtensionContext, IndentAction, Position, TextDocument, Range, CompletionItem, CompletionItemKind, SnippetString } from 'vscode';
 import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, RequestType, TextDocumentPositionParams } from 'vscode-languageclient';
 import { EMPTY_ELEMENTS } from './htmlEmptyTagsShared';
 import { activateTagClosing } from './tagClosing';
 import TelemetryReporter from 'vscode-extension-telemetry';
 
-import { DocumentColorRequest, DocumentColorParams, ColorPresentationRequest, ColorPresentationParams } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
-
 namespace TagCloseRequest {
 	export const type: RequestType<TextDocumentPositionParams, string, any, any> = new RequestType('html/tag');
 }
@@ -53,7 +51,7 @@ export function activate(context: ExtensionContext) {
 	let clientOptions: LanguageClientOptions = {
 		documentSelector,
 		synchronize: {
-			configurationSection: ['html', 'css', 'javascript'], // the settings to synchronize
+			configurationSection: ['html', 'css', 'javascript', 'emmet'], // the settings to synchronize
 		},
 		initializationOptions: {
 			embeddedLanguages
@@ -67,37 +65,6 @@ export function activate(context: ExtensionContext) {
 	let disposable = client.start();
 	toDispose.push(disposable);
 	client.onReady().then(() => {
-		disposable = languages.registerColorProvider(documentSelector, {
-			provideDocumentColors(document: TextDocument): Thenable<ColorInformation[]> {
-				let params: DocumentColorParams = {
-					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document)
-				};
-				return client.sendRequest(DocumentColorRequest.type, params).then(symbols => {
-					return symbols.map(symbol => {
-						let range = client.protocol2CodeConverter.asRange(symbol.range);
-						let color = new Color(symbol.color.red, symbol.color.green, symbol.color.blue, symbol.color.alpha);
-						return new ColorInformation(range, color);
-					});
-				});
-			},
-			provideColorPresentations(color, context): Thenable<ColorPresentation[]> {
-				let params: ColorPresentationParams = {
-					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(context.document),
-					color,
-					range: client.code2ProtocolConverter.asRange(context.range)
-				};
-				return client.sendRequest(ColorPresentationRequest.type, params).then(presentations => {
-					return presentations.map(p => {
-						let presentation = new ColorPresentation(p.label);
-						presentation.textEdit = p.textEdit && client.protocol2CodeConverter.asTextEdit(p.textEdit);
-						presentation.additionalTextEdits = p.additionalTextEdits && client.protocol2CodeConverter.asTextEdits(p.additionalTextEdits);
-						return presentation;
-					});
-				});
-			}
-		});
-		toDispose.push(disposable);
-
 		let tagRequestor = (document: TextDocument, position: Position) => {
 			let param = client.code2ProtocolConverter.asTextDocumentPositionParams(document, position);
 			return client.sendRequest(TagCloseRequest.type, param);
diff --git a/extensions/html/client/tsconfig.json b/extensions/html/client/tsconfig.json
index e8d14302454..28f991bea7b 100644
--- a/extensions/html/client/tsconfig.json
+++ b/extensions/html/client/tsconfig.json
@@ -1,11 +1,11 @@
 {
 	"compilerOptions": {
-		"target": "es5",
+		"target": "es6",
 		"module": "commonjs",
 		"outDir": "./out",
 		"noUnusedLocals": true,
 		"lib": [
-			"es5", "es2015.promise"
+			"es2016"
 		],
 		"strict": true
 	}
diff --git a/extensions/html/package.json b/extensions/html/package.json
index 21fc673bf67..7c97ed5ac7c 100644
--- a/extensions/html/package.json
+++ b/extensions/html/package.json
@@ -1,5 +1,7 @@
 {
   "name": "html",
+  "displayName": "%displayName%",
+	"description": "%description%",
   "version": "0.1.0",
   "publisher": "vscode",
   "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
@@ -73,10 +75,12 @@
         "end": "^\\s*<!--\\s*#endregion\\b\\s*(.*?)-->/"
       }
     },
-		"snippets": [{
-			"language": "html",
-			"path": "./snippets/html.snippets.json"
-		}],
+    "snippets": [
+      {
+        "language": "html",
+        "path": "./snippets/html.snippets.json"
+      }
+    ],
     "configuration": {
       "id": "html",
       "order": 20,
@@ -224,11 +228,11 @@
     }
   },
   "dependencies": {
-    "vscode-extension-telemetry": "0.0.11",
-    "vscode-languageclient": "^3.5.0",
+    "vscode-extension-telemetry": "0.0.13",
+    "vscode-languageclient": "^4.0.0-next.9",
     "vscode-nls": "^3.2.1"
   },
   "devDependencies": {
     "@types/node": "7.0.43"
   }
-}
\ No newline at end of file
+}
diff --git a/extensions/html/package.nls.json b/extensions/html/package.nls.json
index c09d8d337bd..4b59c6fba33 100644
--- a/extensions/html/package.nls.json
+++ b/extensions/html/package.nls.json
@@ -1,4 +1,6 @@
 {
+	"displayName": "HTML Language Features",
+	"description": "Provides rich language support for HTML, Razor and Handlebar files.",
 	"html.format.enable.desc": "Enable/disable default HTML formatter",
 	"html.format.wrapLineLength.desc": "Maximum amount of characters per line (0 = disable).",
 	"html.format.unformatted.desc": "List of tags, comma separated, that shouldn't be reformatted. 'null' defaults to all tags listed at https://www.w3.org/TR/html5/dom.html#phrasing-content.",
diff --git a/extensions/html/server/.vscode/launch.json b/extensions/html/server/.vscode/launch.json
index 8ca29fac876..b22e91c41ef 100644
--- a/extensions/html/server/.vscode/launch.json
+++ b/extensions/html/server/.vscode/launch.json
@@ -7,6 +7,7 @@
 			"type": "node",
 			"request": "attach",
 			"port": 6045,
+			"protocol": "inspector",
 			"sourceMaps": true,
 			"outFiles": ["${workspaceFolder}/out/**/*.js"]
 		},
diff --git a/extensions/html/server/package.json b/extensions/html/server/package.json
index 1afa6e9672d..9237e4b8716 100644
--- a/extensions/html/server/package.json
+++ b/extensions/html/server/package.json
@@ -8,9 +8,11 @@
     "node": "*"
   },
   "dependencies": {
-    "vscode-css-languageservice": "^3.0.5",
-    "vscode-html-languageservice": "^2.0.15",
-    "vscode-languageserver": "^3.5.0",
+    "vscode-css-languageservice": "^3.0.6",
+    "vscode-emmet-helper": "^1.1.34",
+    "vscode-html-languageservice": "^2.0.16",
+    "vscode-languageserver": "^4.0.0-next.4",
+    "vscode-languageserver-types": "^3.6.0-next.1",
     "vscode-nls": "^3.2.1",
     "vscode-uri": "^1.0.1"
   },
diff --git a/extensions/html/server/src/htmlServerMain.ts b/extensions/html/server/src/htmlServerMain.ts
index cf03f00d561..8d04a8a8590 100644
--- a/extensions/html/server/src/htmlServerMain.ts
+++ b/extensions/html/server/src/htmlServerMain.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { createConnection, IConnection, TextDocuments, InitializeParams, InitializeResult, RequestType, DocumentRangeFormattingRequest, Disposable, DocumentSelector, TextDocumentPositionParams, ServerCapabilities, Position } from 'vscode-languageserver';
-import { TextDocument, Diagnostic, DocumentLink, SymbolInformation } from 'vscode-languageserver-types';
+import { createConnection, IConnection, TextDocuments, InitializeParams, InitializeResult, RequestType, DocumentRangeFormattingRequest, Disposable, DocumentSelector, TextDocumentPositionParams, ServerCapabilities, Position, CompletionTriggerKind } from 'vscode-languageserver';
+import { TextDocument, Diagnostic, DocumentLink, SymbolInformation, CompletionList } from 'vscode-languageserver-types';
 import { getLanguageModes, LanguageModes, Settings } from './modes/languageModes';
 
 import { ConfigurationRequest, ConfigurationParams } from 'vscode-languageserver-protocol/lib/protocol.configuration.proposed';
@@ -17,6 +17,7 @@ import { pushAll } from './utils/arrays';
 import { getDocumentContext } from './utils/documentContext';
 import uri from 'vscode-uri';
 import { formatError, runSafe } from './utils/errors';
+import { doComplete as emmetDoComplete, updateExtensionsPath as updateEmmetExtensionsPath, getEmmetCompletionParticipants } from 'vscode-emmet-helper';
 
 namespace TagCloseRequest {
 	export const type: RequestType<TextDocumentPositionParams, string | null, any, any> = new RequestType('html/tag');
@@ -69,6 +70,10 @@ function getDocumentSettings(textDocument: TextDocument, needsDocumentSettings:
 	return Promise.resolve(void 0);
 }
 
+let emmetSettings = {};
+let currentEmmetExtensionsPath: string;
+const emmetTriggerCharacters = ['!', '.', '}', ':', '*', '$', ']', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+
 // After the server has started the client sends an initilize request. The server receives
 // in the passed params the rootPath of the workspace plus the client capabilites
 connection.onInitialize((params: InitializeParams): InitializeResult => {
@@ -105,7 +110,7 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
 	let capabilities: ServerCapabilities & CPServerCapabilities = {
 		// Tell the client that the server works in FULL text document sync mode
 		textDocumentSync: documents.syncKind,
-		completionProvider: clientSnippetSupport ? { resolveProvider: true, triggerCharacters: ['.', ':', '<', '"', '=', '/'] } : undefined,
+		completionProvider: clientSnippetSupport ? { resolveProvider: true, triggerCharacters: [...emmetTriggerCharacters, '.', ':', '<', '"', '=', '/'] } : undefined,
 		hoverProvider: true,
 		documentHighlightProvider: true,
 		documentRangeFormattingProvider: false,
@@ -167,6 +172,12 @@ connection.onDidChangeConfiguration((change) => {
 		}
 	}
 
+	emmetSettings = globalSettings.emmet;
+	if (currentEmmetExtensionsPath !== emmetSettings['extensionsPath']) {
+		currentEmmetExtensionsPath = emmetSettings['extensionsPath'];
+		const workspaceUri = (workspaceFolders && workspaceFolders.length === 1) ? uri.parse(workspaceFolders[0].uri) : null;
+		updateEmmetExtensionsPath(currentEmmetExtensionsPath, workspaceUri ? workspaceUri.fsPath : null);
+	}
 });
 
 let pendingValidationRequests: { [uri: string]: NodeJS.Timer } = {};
@@ -226,19 +237,56 @@ async function validateTextDocument(textDocument: TextDocument) {
 	}
 }
 
+let cachedCompletionList: CompletionList;
+const hexColorRegex = /^#[\d,a-f,A-F]{1,6}$/;
 connection.onCompletion(async textDocumentPosition => {
 	return runSafe(async () => {
 		let document = documents.get(textDocumentPosition.textDocument.uri);
 		let mode = languageModes.getModeAtPosition(document, textDocumentPosition.position);
-		if (mode && mode.doComplete) {
-			let doComplete = mode.doComplete;
-			if (mode.getId() !== 'html') {
-				connection.telemetry.logEvent({ key: 'html.embbedded.complete', value: { languageId: mode.getId() } });
-			}
-			let settings = await getDocumentSettings(document, () => doComplete.length > 2);
-			return doComplete(document, textDocumentPosition.position, settings);
+		if (!mode || !mode.doComplete) {
+			return { isIncomplete: true, items: [] };
 		}
-		return { isIncomplete: true, items: [] };
+
+		if (cachedCompletionList
+			&& !cachedCompletionList.isIncomplete
+			&& (mode.getId() === 'html' || mode.getId() === 'css')
+			&& textDocumentPosition.context
+			&& textDocumentPosition.context.triggerKind === CompletionTriggerKind.TriggerForIncompleteCompletions
+		) {
+			let result: CompletionList = emmetDoComplete(document, textDocumentPosition.position, mode.getId(), emmetSettings);
+			if (result && result.items) {
+				result.items.push(...cachedCompletionList.items);
+			} else {
+				result = cachedCompletionList;
+				cachedCompletionList = null;
+			}
+			return result;
+		}
+
+		if (mode.getId() !== 'html') {
+			connection.telemetry.logEvent({ key: 'html.embbedded.complete', value: { languageId: mode.getId() } });
+		}
+
+		cachedCompletionList = null;
+		let emmetCompletionList: CompletionList = {
+			isIncomplete: true,
+			items: undefined
+		};
+		if (mode.setCompletionParticipants) {
+			const emmetCompletionParticipant = getEmmetCompletionParticipants(document, textDocumentPosition.position, mode.getId(), emmetSettings, emmetCompletionList);
+			mode.setCompletionParticipants([emmetCompletionParticipant]);
+		}
+
+		let settings = await getDocumentSettings(document, () => mode.doComplete.length > 2);
+		let result = mode.doComplete(document, textDocumentPosition.position, settings);
+		if (emmetCompletionList && emmetCompletionList.items) {
+			cachedCompletionList = result;
+			if (emmetCompletionList.items.length && hexColorRegex.test(emmetCompletionList.items[0].label) && result.items.some(x => x.label === emmetCompletionList.items[0].label)) {
+				emmetCompletionList.items.shift();
+			}
+			return { isIncomplete: true, items: [...emmetCompletionList.items, ...result.items] };
+		}
+		return result;
 	}, null, `Error while computing completions for ${textDocumentPosition.textDocument.uri}`);
 });
 
diff --git a/extensions/html/server/src/modes/cssMode.ts b/extensions/html/server/src/modes/cssMode.ts
index 79565426a32..10d1a48646d 100644
--- a/extensions/html/server/src/modes/cssMode.ts
+++ b/extensions/html/server/src/modes/cssMode.ts
@@ -6,7 +6,7 @@
 
 import { LanguageModelCache, getLanguageModelCache } from '../languageModelCache';
 import { TextDocument, Position, Range } from 'vscode-languageserver-types';
-import { getCSSLanguageService, Stylesheet } from 'vscode-css-languageservice';
+import { getCSSLanguageService, Stylesheet, ICompletionParticipant } from 'vscode-css-languageservice';
 import { LanguageMode, Settings } from './languageModes';
 import { HTMLDocumentRegions, CSS_STYLE_RULE } from './embeddedSupport';
 import { Color } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
@@ -31,6 +31,9 @@ export function getCSSMode(documentRegions: LanguageModelCache<HTMLDocumentRegio
 			let embedded = embeddedCSSDocuments.get(document);
 			return cssLanguageService.doComplete(embedded, position, cssStylesheets.get(embedded));
 		},
+		setCompletionParticipants(registeredCompletionParticipants: ICompletionParticipant[]) {
+			cssLanguageService.setCompletionParticipants(registeredCompletionParticipants);
+		},
 		doHover(document: TextDocument, position: Position) {
 			let embedded = embeddedCSSDocuments.get(document);
 			return cssLanguageService.doHover(embedded, position, cssStylesheets.get(embedded));
diff --git a/extensions/html/server/src/modes/htmlMode.ts b/extensions/html/server/src/modes/htmlMode.ts
index c0146423d67..24dcd14d49c 100644
--- a/extensions/html/server/src/modes/htmlMode.ts
+++ b/extensions/html/server/src/modes/htmlMode.ts
@@ -5,13 +5,14 @@
 'use strict';
 
 import { getLanguageModelCache } from '../languageModelCache';
-import { LanguageService as HTMLLanguageService, HTMLDocument, DocumentContext, FormattingOptions, HTMLFormatConfiguration } from 'vscode-html-languageservice';
+import { LanguageService as HTMLLanguageService, HTMLDocument, DocumentContext, FormattingOptions, HTMLFormatConfiguration, TokenType } from 'vscode-html-languageservice';
 import { TextDocument, Position, Range } from 'vscode-languageserver-types';
 import { LanguageMode, Settings } from './languageModes';
 
 export function getHTMLMode(htmlLanguageService: HTMLLanguageService): LanguageMode {
 	let globalSettings: Settings = {};
 	let htmlDocuments = getLanguageModelCache<HTMLDocument>(10, 60, document => htmlLanguageService.parseHTMLDocument(document));
+	let completionParticipants = [];
 	return {
 		getId() {
 			return 'html';
@@ -25,7 +26,23 @@ export function getHTMLMode(htmlLanguageService: HTMLLanguageService): LanguageM
 			if (doAutoComplete) {
 				options.hideAutoCompleteProposals = true;
 			}
-			return htmlLanguageService.doComplete(document, position, htmlDocuments.get(document), options);
+
+			const htmlDocument = htmlDocuments.get(document);
+			const offset = document.offsetAt(position);
+			const node = htmlDocument.findNodeBefore(offset);
+			const scanner = htmlLanguageService.createScanner(document.getText(), node.start);
+			let token = scanner.scan();
+			while (token !== TokenType.EOS && scanner.getTokenOffset() <= offset) {
+				if (token === TokenType.Content && offset <= scanner.getTokenEnd()) {
+					completionParticipants.forEach(participant => { if (participant.onHtmlContent) { participant.onHtmlContent(); } });
+					break;
+				}
+				token = scanner.scan();
+			}
+			return htmlLanguageService.doComplete(document, position, htmlDocument, options);
+		},
+		setCompletionParticipants(registeredCompletionParticipants: any[]) {
+			completionParticipants = registeredCompletionParticipants;
 		},
 		doHover(document: TextDocument, position: Position) {
 			return htmlLanguageService.doHover(document, position, htmlDocuments.get(document));
diff --git a/extensions/html/server/src/modes/languageModes.ts b/extensions/html/server/src/modes/languageModes.ts
index d1a461a1648..721ee9a4e65 100644
--- a/extensions/html/server/src/modes/languageModes.ts
+++ b/extensions/html/server/src/modes/languageModes.ts
@@ -24,6 +24,7 @@ export interface Settings {
 	css?: any;
 	html?: any;
 	javascript?: any;
+	emmet?: { [key: string]: any };
 }
 
 export interface SettingProvider {
@@ -35,6 +36,7 @@ export interface LanguageMode {
 	configure?: (options: Settings) => void;
 	doValidation?: (document: TextDocument, settings?: Settings) => Diagnostic[];
 	doComplete?: (document: TextDocument, position: Position, settings?: Settings) => CompletionList | null;
+	setCompletionParticipants?: (registeredCompletionParticipants: any[]) => void;
 	doResolve?: (document: TextDocument, item: CompletionItem) => CompletionItem | null;
 	doHover?: (document: TextDocument, position: Position) => Hover | null;
 	doSignatureHelp?: (document: TextDocument, position: Position) => SignatureHelp | null;
diff --git a/extensions/html/server/src/test/emmet.test.ts b/extensions/html/server/src/test/emmet.test.ts
new file mode 100644
index 00000000000..3f0b9f8407b
--- /dev/null
+++ b/extensions/html/server/src/test/emmet.test.ts
@@ -0,0 +1,70 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import 'mocha';
+import * as assert from 'assert';
+import { getHTMLMode } from '../modes/htmlMode';
+import { TextDocument, CompletionList } from 'vscode-languageserver-types';
+import { getLanguageModelCache } from '../languageModelCache';
+
+import { getLanguageService } from 'vscode-html-languageservice';
+import * as embeddedSupport from '../modes/embeddedSupport';
+import { getEmmetCompletionParticipants } from 'vscode-emmet-helper';
+import { getCSSMode } from '../modes/cssMode';
+
+suite('Emmet Support', () => {
+
+	const htmlLanguageService = getLanguageService();
+
+	function assertCompletions(syntax: string, value: string, expectedProposal: string, expectedProposalDoc: string): void {
+		const offset = value.indexOf('|');
+		value = value.substr(0, offset) + value.substr(offset + 1);
+
+		const document = TextDocument.create('test://test/test.' + syntax, syntax, 0, value);
+		const position = document.positionAt(offset);
+		const documentRegions = getLanguageModelCache<embeddedSupport.HTMLDocumentRegions>(10, 60, document => embeddedSupport.getDocumentRegions(htmlLanguageService, document));
+		const mode = syntax == 'html' ? getHTMLMode(htmlLanguageService) : getCSSMode(documentRegions);
+		const emmetCompletionList: CompletionList = {
+			isIncomplete: true,
+			items: undefined
+		}
+		mode.setCompletionParticipants([getEmmetCompletionParticipants(document, position, document.languageId, {}, emmetCompletionList)])
+
+		const list = mode.doComplete!(document, position);
+		assert.ok(list);
+		assert.ok(emmetCompletionList)
+
+
+		if (expectedProposal && expectedProposalDoc) {
+			let actualLabels = emmetCompletionList!.items.map(c => c.label).sort();
+			let actualDocs = emmetCompletionList!.items.map(c => c.documentation).sort();
+			assert.ok(actualLabels.indexOf(expectedProposal) !== -1, 'Not found:' + expectedProposal + ' is ' + actualLabels.join(', '));
+			assert.ok(actualDocs.indexOf(expectedProposalDoc) !== -1, 'Not found:' + expectedProposalDoc + ' is ' + actualDocs.join(', '));
+		} else {
+			assert.ok(!emmetCompletionList || !emmetCompletionList.items);
+		}
+
+	}
+
+	test('Html Emmet Completions', function (): any {
+		assertCompletions('html', 'ul|', 'ul', '<ul>|</ul>');
+		assertCompletions('html', '<ul|', null, null);
+		assertCompletions('html', '<html>ul|</html>', 'ul', '<ul>|</ul>');
+		assertCompletions('html', '<img src=|', null, null);
+		assertCompletions('html', '<div class=|/>', null, null);
+	});
+
+	test('Css Emmet Completions', function (): any {
+		assertCompletions('css', '<style>.foo { display: none; m10| }</style>', 'margin: 10px;', 'margin: 10px;');
+		assertCompletions('css', '<style>foo { display: none; pos:f| }</style>', 'position: fixed;', 'position: fixed;');
+		assertCompletions('css', '<style>foo { display: none; margin: a| }</style>', null, null);
+		assertCompletions('css', '<style>foo| { display: none; }</style>', null, null);
+		assertCompletions('css', '<style>foo {| display: none; }</style>', null, null);
+		assertCompletions('css', '<style>foo { display: none;| }</style>', null, null);
+		assertCompletions('css', '<style>foo { display: none|; }</style>', null, null);
+		assertCompletions('css', '<style>.foo { display: none; -m-m10| }</style>', 'margin: 10px;', '-moz-margin: 10px;\nmargin: 10px;');
+	});
+});
\ No newline at end of file
diff --git a/extensions/html/server/yarn.lock b/extensions/html/server/yarn.lock
index bd284a09edd..13bfdd813f7 100644
--- a/extensions/html/server/yarn.lock
+++ b/extensions/html/server/yarn.lock
@@ -2,6 +2,10 @@
 # yarn lockfile v1
 
 
+"@emmetio/extract-abbreviation@^0.1.4":
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@emmetio/extract-abbreviation/-/extract-abbreviation-0.1.4.tgz#f5be070db97901ecc37e5204f2ace68242cdcefa"
+
 "@types/mocha@2.2.33":
   version "2.2.33"
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.33.tgz#d79a0061ec270379f4d9e225f4096fb436669def"
@@ -10,41 +14,53 @@
   version "7.0.43"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
 
-vscode-css-languageservice@^3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.5.tgz#8470989c07bbe740db4fa621423e98384d2c342f"
+jsonc-parser@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.0.tgz#ddcc864ae708e60a7a6dd36daea00172fa8d9272"
+
+vscode-css-languageservice@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.6.tgz#0e9230347040ba0161fba941885195215ec9be40"
   dependencies:
-    vscode-languageserver-types "3.5.0"
+    vscode-languageserver-types "^3.6.0-next.1"
     vscode-nls "^2.0.1"
 
-vscode-html-languageservice@^2.0.15:
-  version "2.0.15"
-  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-2.0.15.tgz#e3ec34c4d62bc636f8a16c9b474e5851ca13aab0"
+vscode-emmet-helper@^1.1.34:
+  version "1.1.35"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.35.tgz#1a704811d573df55cb313e232d5b2e6ea6dca96c"
   dependencies:
-    vscode-languageserver-types "3.5.0"
+    "@emmetio/extract-abbreviation" "^0.1.4"
+    jsonc-parser "^1.0.0"
+    vscode-languageserver-types "^3.6.0-next.1"
+
+vscode-html-languageservice@^2.0.16:
+  version "2.0.16"
+  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-2.0.16.tgz#db5e8307caddedc1acdb5a1fffb919bb9a1184cb"
+  dependencies:
+    vscode-languageserver-types "^3.6.0-next.1"
     vscode-nls "^2.0.2"
     vscode-uri "^1.0.1"
 
-vscode-jsonrpc@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0.tgz#87239d9e166b2d7352245b8a813597804c1d63aa"
+vscode-jsonrpc@^3.6.0-next.1:
+  version "3.6.0-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0-next.1.tgz#3cb463dffe5842d6aec16718ca9252708cd6aabe"
 
-vscode-languageserver-protocol@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.0.tgz#067c5cbe27709795398d119692c97ebba1452209"
+vscode-languageserver-protocol@^3.6.0-next.5:
+  version "3.6.0-next.5"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0-next.5.tgz#ed2ec2db759826f753c0a13977dfb2bedc4d31b3"
   dependencies:
-    vscode-jsonrpc "^3.5.0"
-    vscode-languageserver-types "^3.5.0"
+    vscode-jsonrpc "^3.6.0-next.1"
+    vscode-languageserver-types "^3.6.0-next.1"
 
-vscode-languageserver-types@3.5.0, vscode-languageserver-types@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz#e48d79962f0b8e02de955e3f524908e2b19c0374"
+vscode-languageserver-types@^3.6.0-next.1:
+  version "3.6.0-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.6.0-next.1.tgz#98e488d3f87b666b4ee1a3d89f0023e246d358f3"
 
-vscode-languageserver@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-3.5.0.tgz#d28099bc6ddda8c1dd16b707e454e1b1ddae0dba"
+vscode-languageserver@^4.0.0-next.4:
+  version "4.0.0-next.4"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-4.0.0-next.4.tgz#162440b15bedaab07e1676f046e4d9b8578b3d92"
   dependencies:
-    vscode-languageserver-protocol "^3.5.0"
+    vscode-languageserver-protocol "^3.6.0-next.5"
     vscode-uri "^1.0.1"
 
 vscode-nls@^2.0.1, vscode-nls@^2.0.2:
diff --git a/extensions/html/syntaxes/html.tmLanguage.json b/extensions/html/syntaxes/html.tmLanguage.json
index 0efe7ca55f0..6b9b1f58e7d 100644
--- a/extensions/html/syntaxes/html.tmLanguage.json
+++ b/extensions/html/syntaxes/html.tmLanguage.json
@@ -5,16 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/textmate/html.tmbundle/commit/a723f08ebd49c67c22aca08dd8f17d0bf836ec93",
-	"fileTypes": [
-		"html",
-		"htm",
-		"shtml",
-		"xhtml",
-		"inc",
-		"tmpl",
-		"tpl"
-	],
-	"firstLineMatch": "<(?i:(!DOCTYPE\\s*)?html)",
+	"name": "HTML",
+	"scopeName": "text.html.basic",
 	"injections": {
 		"R:text.html - (comment.block, text.html source)": {
 			"comment": "Use R: to ensure this matches after any other injections.",
@@ -26,8 +18,6 @@
 			]
 		}
 	},
-	"keyEquivalent": "^~H",
-	"name": "HTML",
 	"patterns": [
 		{
 			"begin": "(<)([a-zA-Z][a-zA-Z0-9:-]*)(?=[^>]*></\\2>)",
@@ -746,7 +736,5 @@
 			"match": "(?<==)(?:[^\\s<>/'\"]|/(?!>))+",
 			"name": "string.unquoted.html"
 		}
-	},
-	"scopeName": "text.html.basic",
-	"uuid": "17994EC8-6B1D-11D9-AC3A-000D93589AF6"
+	}
 }
\ No newline at end of file
diff --git a/extensions/html/yarn.lock b/extensions/html/yarn.lock
index 47c5c2e51b7..293e9314996 100644
--- a/extensions/html/yarn.lock
+++ b/extensions/html/yarn.lock
@@ -28,32 +28,32 @@ semver@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
-vscode-extension-telemetry@0.0.11:
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.11.tgz#f2dde487f01d2b079f55ab47a0247f5a772c4e06"
+vscode-extension-telemetry@0.0.13:
+  version "0.0.13"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.13.tgz#8a4438cbb0a9f9f8ad65479e4ec08683aa4de0f7"
   dependencies:
     applicationinsights "1.0.1"
 
-vscode-jsonrpc@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0.tgz#87239d9e166b2d7352245b8a813597804c1d63aa"
+vscode-jsonrpc@^3.6.0-next.1:
+  version "3.6.0-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0-next.1.tgz#3cb463dffe5842d6aec16718ca9252708cd6aabe"
 
-vscode-languageclient@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-3.5.0.tgz#36d02cc186a8365a4467719a290fb200a9ae490a"
+vscode-languageclient@^4.0.0-next.9:
+  version "4.0.0-next.9"
+  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-4.0.0-next.9.tgz#2a06568f46ee9de3490f85e227d3740a21a03d3a"
   dependencies:
-    vscode-languageserver-protocol "^3.5.0"
+    vscode-languageserver-protocol "^3.6.0-next.5"
 
-vscode-languageserver-protocol@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.0.tgz#067c5cbe27709795398d119692c97ebba1452209"
+vscode-languageserver-protocol@^3.6.0-next.5:
+  version "3.6.0-next.5"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0-next.5.tgz#ed2ec2db759826f753c0a13977dfb2bedc4d31b3"
   dependencies:
-    vscode-jsonrpc "^3.5.0"
-    vscode-languageserver-types "^3.5.0"
+    vscode-jsonrpc "^3.6.0-next.1"
+    vscode-languageserver-types "^3.6.0-next.1"
 
-vscode-languageserver-types@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz#e48d79962f0b8e02de955e3f524908e2b19c0374"
+vscode-languageserver-types@^3.6.0-next.1:
+  version "3.6.0-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.6.0-next.1.tgz#98e488d3f87b666b4ee1a3d89f0023e246d358f3"
 
 vscode-nls@^3.2.1:
   version "3.2.1"
diff --git a/extensions/ini/package.json b/extensions/ini/package.json
index bfb7bb52215..46c5fcb3473 100644
--- a/extensions/ini/package.json
+++ b/extensions/ini/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "ini",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/ini/package.nls.json b/extensions/ini/package.nls.json
new file mode 100644
index 00000000000..6299868a6ee
--- /dev/null
+++ b/extensions/ini/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Ini Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching and other language features in Ini files"
+}
\ No newline at end of file
diff --git a/extensions/ini/syntaxes/ini.tmLanguage.json b/extensions/ini/syntaxes/ini.tmLanguage.json
index ff87d4c6dc8..bd1496149f7 100644
--- a/extensions/ini/syntaxes/ini.tmLanguage.json
+++ b/extensions/ini/syntaxes/ini.tmLanguage.json
@@ -5,12 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/textmate/ini.tmbundle/commit/2af0cbb0704940f967152616f2f1ff0aae6287a6",
-	"fileTypes": [
-		"ini",
-		"conf"
-	],
-	"keyEquivalent": "^~I",
 	"name": "Ini",
+	"scopeName": "source.ini",
 	"patterns": [
 		{
 			"begin": "(^[ \\t]+)?(?=#)",
@@ -113,7 +109,5 @@
 			},
 			"name": "string.quoted.double.ini"
 		}
-	],
-	"scopeName": "source.ini",
-	"uuid": "77DC23B6-8A90-11D9-BAA4-000A9584EC8C"
+	]
 }
\ No newline at end of file
diff --git a/extensions/java/package.json b/extensions/java/package.json
index 6493004d0a8..73c9b13f493 100644
--- a/extensions/java/package.json
+++ b/extensions/java/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "java",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/java/package.nls.json b/extensions/java/package.nls.json
new file mode 100644
index 00000000000..a53c62ed548
--- /dev/null
+++ b/extensions/java/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Java Language Features",
+	"description": "Provides Syntax highlighting, Folding, Bracket matching, Snippets and other language features in Java files"
+}
\ No newline at end of file
diff --git a/extensions/java/syntaxes/java.tmLanguage.json b/extensions/java/syntaxes/java.tmLanguage.json
index 5be7bc9f4ee..0d29f449e02 100644
--- a/extensions/java/syntaxes/java.tmLanguage.json
+++ b/extensions/java/syntaxes/java.tmLanguage.json
@@ -5,12 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/atom/language-java/commit/5c2863da1425d61914d2e04ef31b86f8c5883c5f",
-	"scopeName": "source.java",
 	"name": "Java",
-	"fileTypes": [
-		"java",
-		"bsh"
-	],
+	"scopeName": "source.java",
 	"patterns": [
 		{
 			"begin": "\\b(package)\\b\\s*",
diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
index 9411c748bee..a8527fe9618 100644
--- a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
@@ -4,16 +4,9 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/24c7fb5254f50dad85eae03836b1b9ff92ecf273",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/77d21fd8d3f750fcf67bdf7436f4e46565cba350",
 	"name": "JavaScript (with React support)",
 	"scopeName": "source.js",
-	"fileTypes": [
-		".js",
-		".jsx",
-		".es6",
-		".mjs"
-	],
-	"uuid": "805375ec-d614-41f5-8993-5843fe63ea82",
 	"patterns": [
 		{
 			"include": "#directives"
@@ -3157,6 +3150,10 @@
 				{
 					"name": "keyword.operator.ternary.js",
 					"match": "(\\?|\\:)"
+				},
+				{
+					"name": "keyword.operator.expression.infer.js",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))infer(?=\\s+[_$[:alpha:]])"
 				}
 			]
 		},
diff --git a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
index c9cb79391f9..72550eeab02 100644
--- a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
@@ -4,16 +4,9 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/24c7fb5254f50dad85eae03836b1b9ff92ecf273",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/77d21fd8d3f750fcf67bdf7436f4e46565cba350",
 	"name": "JavaScript (with React support)",
 	"scopeName": "source.js.jsx",
-	"fileTypes": [
-		".js",
-		".jsx",
-		".es6",
-		".mjs"
-	],
-	"uuid": "805375ec-d614-41f5-8993-5843fe63ea82",
 	"patterns": [
 		{
 			"include": "#directives"
@@ -3157,6 +3150,10 @@
 				{
 					"name": "keyword.operator.ternary.js.jsx",
 					"match": "(\\?|\\:)"
+				},
+				{
+					"name": "keyword.operator.expression.infer.js.jsx",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))infer(?=\\s+[_$[:alpha:]])"
 				}
 			]
 		},
diff --git a/extensions/json/package.json b/extensions/json/package.json
index f551c4f5de8..0f976e9b2f6 100644
--- a/extensions/json/package.json
+++ b/extensions/json/package.json
@@ -1,5 +1,7 @@
 {
   "name": "json",
+  "displayName": "%displayName%",
+	"description": "%description%",
   "version": "0.1.0",
   "publisher": "vscode",
   "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
@@ -162,8 +164,8 @@
     }
   },
   "dependencies": {
-    "vscode-extension-telemetry": "0.0.11",
-    "vscode-languageclient": "^4.0.0-next.7",
+    "vscode-extension-telemetry": "0.0.13",
+    "vscode-languageclient": "^4.0.0-next.9",
     "vscode-nls": "^3.2.1"
   },
   "devDependencies": {
diff --git a/extensions/json/package.nls.json b/extensions/json/package.nls.json
index 31385fd819f..f9d52e8ebcf 100644
--- a/extensions/json/package.nls.json
+++ b/extensions/json/package.nls.json
@@ -1,4 +1,6 @@
 {
+	"displayName": "JSON Language Features",
+	"description": "Provides rich language support for JSON files.",
 	"json.schemas.desc": "Associate schemas to JSON files in the current project",
 	"json.schemas.url.desc": "A URL to a schema or a relative path to a schema in the current directory",
 	"json.schemas.fileMatch.desc": "An array of file patterns to match against when resolving JSON files to schemas.",
diff --git a/extensions/json/syntaxes/JSON.tmLanguage.json b/extensions/json/syntaxes/JSON.tmLanguage.json
index f37355667bf..910045be39e 100644
--- a/extensions/json/syntaxes/JSON.tmLanguage.json
+++ b/extensions/json/syntaxes/JSON.tmLanguage.json
@@ -5,21 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/Microsoft/vscode-JSON.tmLanguage/commit/9bd83f1c252b375e957203f21793316203f61f70",
-	"fileTypes": [
-		"json",
-		"sublime-settings",
-		"sublime-menu",
-		"sublime-keymap",
-		"sublime-mousemap",
-		"sublime-theme",
-		"sublime-build",
-		"sublime-project",
-		"sublime-completions"
-	],
-	"foldingStartMarker": "(?x)       # turn on extended mode\n  ^        # a line beginning with\n  \\s*      # some optional space\n  [{\\[]    # the start of an object or array\n  (?!      # but not followed by\n    .*     # whatever\n    [}\\]]  # and the close of an object or array\n    ,?     # an optional comma\n    \\s*    # some optional space\n    $      # at the end of the line\n  )\n  |        # ...or...\n  [{\\[]    # the start of an object or array\n  \\s*      # some optional space\n  $        # at the end of the line",
-	"foldingStopMarker": "(?x)     # turn on extended mode\n  ^      # a line beginning with\n  \\s*    # some optional space\n  [}\\]]  # and the close of an object or array",
-	"keyEquivalent": "^~J",
 	"name": "JSON (Javascript Next)",
+	"scopeName": "source.json",
 	"patterns": [
 		{
 			"include": "#value"
@@ -222,7 +209,5 @@
 				}
 			]
 		}
-	},
-	"scopeName": "source.json",
-	"uuid": "8f97457b-516e-48ce-83c7-08ae12fb327a"
+	}
 }
\ No newline at end of file
diff --git a/extensions/json/yarn.lock b/extensions/json/yarn.lock
index 8c75b70d8f0..293e9314996 100644
--- a/extensions/json/yarn.lock
+++ b/extensions/json/yarn.lock
@@ -28,9 +28,9 @@ semver@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
-vscode-extension-telemetry@0.0.11:
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.11.tgz#f2dde487f01d2b079f55ab47a0247f5a772c4e06"
+vscode-extension-telemetry@0.0.13:
+  version "0.0.13"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.13.tgz#8a4438cbb0a9f9f8ad65479e4ec08683aa4de0f7"
   dependencies:
     applicationinsights "1.0.1"
 
@@ -38,15 +38,15 @@ vscode-jsonrpc@^3.6.0-next.1:
   version "3.6.0-next.1"
   resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0-next.1.tgz#3cb463dffe5842d6aec16718ca9252708cd6aabe"
 
-vscode-languageclient@^4.0.0-next.7:
-  version "4.0.0-next.7"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-4.0.0-next.7.tgz#d4d22937a46ad6c0884a678158c4d4a2269a747e"
+vscode-languageclient@^4.0.0-next.9:
+  version "4.0.0-next.9"
+  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-4.0.0-next.9.tgz#2a06568f46ee9de3490f85e227d3740a21a03d3a"
   dependencies:
-    vscode-languageserver-protocol "^3.6.0-next.4"
+    vscode-languageserver-protocol "^3.6.0-next.5"
 
-vscode-languageserver-protocol@^3.6.0-next.4:
-  version "3.6.0-next.4"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0-next.4.tgz#5b9940e4d6afafd5b63f9731dbd3a9bcc65b3719"
+vscode-languageserver-protocol@^3.6.0-next.5:
+  version "3.6.0-next.5"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0-next.5.tgz#ed2ec2db759826f753c0a13977dfb2bedc4d31b3"
   dependencies:
     vscode-jsonrpc "^3.6.0-next.1"
     vscode-languageserver-types "^3.6.0-next.1"
diff --git a/extensions/less/package.json b/extensions/less/package.json
index b23dfe356b9..4858278fbb8 100644
--- a/extensions/less/package.json
+++ b/extensions/less/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "less",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/less/package.nls.json b/extensions/less/package.nls.json
new file mode 100644
index 00000000000..b21d1cfdddb
--- /dev/null
+++ b/extensions/less/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Less Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching and other language features in Less files."
+}
\ No newline at end of file
diff --git a/extensions/less/syntaxes/less.tmLanguage.json b/extensions/less/syntaxes/less.tmLanguage.json
index f2265b29229..c301adc44ca 100644
--- a/extensions/less/syntaxes/less.tmLanguage.json
+++ b/extensions/less/syntaxes/less.tmLanguage.json
@@ -7,14 +7,6 @@
 	"version": "https://github.com/atom/language-less/commit/b5b3438916bd617fe2b61e090b438c3e27034fc1",
 	"name": "Less",
 	"scopeName": "source.css.less",
-	"fileTypes": [
-		"less",
-		"less.erb",
-		"rc",
-		"gtkrc",
-		"gtkrc-2.0",
-		"themerc"
-	],
 	"patterns": [
 		{
 			"include": "#strings"
diff --git a/extensions/log/package.json b/extensions/log/package.json
index 04d399d172d..ab8b0da1c9d 100644
--- a/extensions/log/package.json
+++ b/extensions/log/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "log",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": {
diff --git a/extensions/log/package.nls.json b/extensions/log/package.nls.json
new file mode 100644
index 00000000000..a5d3018fbc6
--- /dev/null
+++ b/extensions/log/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Log",
+	"description": "Provides Syntax highlighting for files with .log extension"
+}
\ No newline at end of file
diff --git a/extensions/log/syntaxes/log.tmLanguage.json b/extensions/log/syntaxes/log.tmLanguage.json
index deb8ac61113..d5bb91c8f1e 100644
--- a/extensions/log/syntaxes/log.tmLanguage.json
+++ b/extensions/log/syntaxes/log.tmLanguage.json
@@ -5,11 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/emilast/vscode-logfile-highlighter/commit/8196aa2cc8dd9b1eda431203857e5317866facec",
-	"scopeName": "text.log",
-	"fileTypes": [
-		"log"
-	],
 	"name": "Log file",
+	"scopeName": "text.log",
 	"patterns": [
 		{
 			"match": "\\b(DEBUG)\\b|(?i)\\b(debug)\\:",
@@ -96,6 +93,5 @@
 			"match": "\\b([\\w]+\\.)+(\\w)+\\b",
 			"name": "constant.language log.constant"
 		}
-	],
-	"uuid": "E81BB6AB-CAC7-4C27-9A79-4137A4693EBD"
+	]
 }
\ No newline at end of file
diff --git a/extensions/lua/package.json b/extensions/lua/package.json
index 067fde1aeee..df3a9a1e723 100644
--- a/extensions/lua/package.json
+++ b/extensions/lua/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "lua",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/lua/package.nls.json b/extensions/lua/package.nls.json
new file mode 100644
index 00000000000..e8b420e63dd
--- /dev/null
+++ b/extensions/lua/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Lua Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching and other language features in Lua files"
+}
\ No newline at end of file
diff --git a/extensions/lua/syntaxes/lua.tmLanguage.json b/extensions/lua/syntaxes/lua.tmLanguage.json
index 5e82e236cb7..8adc657f806 100644
--- a/extensions/lua/syntaxes/lua.tmLanguage.json
+++ b/extensions/lua/syntaxes/lua.tmLanguage.json
@@ -5,15 +5,9 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/textmate/lua.tmbundle/commit/42da2c6ff5d86c068f72520f856190f413911a80",
-	"comment": "Lua Syntax: version 0.8",
-	"fileTypes": [
-		"lua",
-		"p8",
-		"rockspec"
-	],
-	"firstLineMatch": "\\A#!.*?\\blua(\\d+(\\.\\d+)?)?\\b|\\A--\\s+-\\*-\\s*lua\\s*-\\*-",
-	"keyEquivalent": "^~L",
 	"name": "Lua",
+	"scopeName": "source.lua",
+	"comment": "Lua Syntax: version 0.8",
 	"patterns": [
 		{
 			"begin": "\\b((local\\b)\\s+)?(function)\\s*(\\s+[a-zA-Z_][a-zA-Z0-9_]*(\\.[a-zA-Z_][a-zA-Z0-9_]*)*(:[a-zA-Z_][a-zA-Z0-9_]*)?\\s*)?(\\()",
@@ -277,7 +271,5 @@
 				}
 			]
 		}
-	},
-	"scopeName": "source.lua",
-	"uuid": "93E017CC-6F27-11D9-90EB-000D93589AF7"
+	}
 }
\ No newline at end of file
diff --git a/extensions/make/package.json b/extensions/make/package.json
index 59ed17b7955..afae76d5461 100644
--- a/extensions/make/package.json
+++ b/extensions/make/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "make",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/make/package.nls.json b/extensions/make/package.nls.json
new file mode 100644
index 00000000000..186bfcefb8c
--- /dev/null
+++ b/extensions/make/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Make Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching and other language features in Make files"
+}
\ No newline at end of file
diff --git a/extensions/make/syntaxes/make.tmLanguage.json b/extensions/make/syntaxes/make.tmLanguage.json
index b149c2c17b8..505336ac862 100644
--- a/extensions/make/syntaxes/make.tmLanguage.json
+++ b/extensions/make/syntaxes/make.tmLanguage.json
@@ -5,13 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/fadeevab/make.tmbundle/commit/43e1a67476dea3ddefbb4f0ee7901834b31b8bee",
-	"fileTypes": [
-		"Makefile",
-		"makefile",
-		"GNUmakefile",
-		"OCamlMakefile"
-	],
 	"name": "Makefile",
+	"scopeName": "source.makefile",
 	"patterns": [
 		{
 			"include": "#comment"
@@ -500,7 +495,5 @@
 				}
 			]
 		}
-	},
-	"scopeName": "source.makefile",
-	"uuid": "FF1825E8-6B1C-11D9-B883-000D93589AF6"
+	}
 }
\ No newline at end of file
diff --git a/extensions/markdown/media/loading.js b/extensions/markdown/media/loading.js
index 7889d432ef7..720ff7fb204 100644
--- a/extensions/markdown/media/loading.js
+++ b/extensions/markdown/media/loading.js
@@ -31,6 +31,6 @@
 		window.parent.postMessage({
 			command: 'did-click-link',
 			data: `command:_markdown.onPreviewStyleLoadError?${encodeURIComponent(JSON.stringify(args))}`
-		}, 'file://');
+		}, '*');
 	});
 }());
\ No newline at end of file
diff --git a/extensions/markdown/media/main.js b/extensions/markdown/media/main.js
index 1d9bf7a3608..42bac764d7a 100644
--- a/extensions/markdown/media/main.js
+++ b/extensions/markdown/media/main.js
@@ -35,9 +35,9 @@
 	 */
 	function postMessage(command, args) {
 		window.parent.postMessage({
-			command: 'did-click-link',
-			data: `command:${command}?${encodeURIComponent(JSON.stringify(args))}`
-		}, 'file://');
+			command,
+			args
+		}, '*');
 	}
 
 	/**
@@ -155,9 +155,10 @@
 		if (previous) {
 			if (next) {
 				const betweenProgress = (offset - window.scrollY - previous.element.getBoundingClientRect().top) / (next.element.getBoundingClientRect().top - previous.element.getBoundingClientRect().top);
-				return previous.line + betweenProgress * (next.line - previous.line);
+				const line = previous.line + betweenProgress * (next.line - previous.line);
+				return Math.max(line, 0);
 			} else {
-				return previous.line;
+				return Math.max(previous.line, 0);
 			}
 		}
 		return null;
@@ -232,7 +233,7 @@
 		}
 
 		// Ignore clicks on links
-		for (let node = event.target; node; node = node.parentNode) {
+		for (let node = /** @type {HTMLElement} */(event.target); node; node = /** @type {HTMLElement} */(node.parentNode)) {
 			if (node.tagName === "A") {
 				return;
 			}
@@ -255,13 +256,13 @@
 		/** @type {*} */
 		let node = event.target;
 		while (node) {
-			if (node.tagName && node.tagName.toLowerCase() === 'a' && node.href) {
+			if (node.tagName && node.tagName === 'A' && node.href) {
 				if (node.getAttribute('href').startsWith('#')) {
 					break;
 				}
-				if (node.href.startsWith('file://')) {
-					const [path, fragment] = node.href.replace(/^file:\/\//i, '').split('#');
-					postMessage('_markdown.openDocumentLink', { path, fragment });
+				if (node.href.startsWith('file://') || node.href.startsWith('vscode-workspace-resource:')) {
+					const [path, fragment] = node.href.replace(/^(file:\/\/|vscode-workspace-resource:)/i, '').split('#');
+					postMessage('_markdown.openDocumentLink', [{ path, fragment }]);
 					event.preventDefault();
 					event.stopPropagation();
 					break;
diff --git a/extensions/markdown/package.json b/extensions/markdown/package.json
index 3d21ee28667..a3b4df103e1 100644
--- a/extensions/markdown/package.json
+++ b/extensions/markdown/package.json
@@ -2,6 +2,7 @@
 	"name": "vscode-markdown",
 	"displayName": "VS Code Markdown",
 	"description": "Markdown for VS Code",
+	"enableProposedApi": true,
 	"version": "0.2.0",
 	"publisher": "Microsoft",
 	"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
@@ -138,17 +139,17 @@
 				},
 				{
 					"command": "markdown.showSource",
-					"when": "resourceScheme == markdown",
+					"when": "markdownPreview",
 					"group": "navigation"
 				},
 				{
 					"command": "markdown.refreshPreview",
-					"when": "resourceScheme == markdown",
+					"when": "markdownPreview",
 					"group": "1_markdown"
 				},
 				{
 					"command": "markdown.showPreviewSecuritySelector",
-					"when": "resourceScheme == markdown",
+					"when": "markdownPreview",
 					"group": "1_markdown"
 				}
 			],
@@ -172,7 +173,7 @@
 				},
 				{
 					"command": "markdown.showSource",
-					"when": "resourceScheme == markdown",
+					"when": "markdownPreview",
 					"group": "navigation"
 				},
 				{
@@ -181,7 +182,7 @@
 				},
 				{
 					"command": "markdown.showPreviewSecuritySelector",
-					"when": "resourceScheme == markdown"
+					"when": "markdownPreview"
 				}
 			]
 		},
@@ -313,7 +314,7 @@
 		"highlight.js": "9.5.0",
 		"markdown-it": "^8.4.0",
 		"markdown-it-named-headers": "0.0.4",
-		"vscode-extension-telemetry": "^0.0.11",
+		"vscode-extension-telemetry": "^0.0.13",
 		"vscode-nls": "^3.2.1"
 	},
 	"devDependencies": {
diff --git a/extensions/markdown/src/commands/refreshPreview.ts b/extensions/markdown/src/commands/refreshPreview.ts
index 93cc0fcf761..107e565da28 100644
--- a/extensions/markdown/src/commands/refreshPreview.ts
+++ b/extensions/markdown/src/commands/refreshPreview.ts
@@ -5,28 +5,23 @@
 
 import * as vscode from 'vscode';
 import { Command } from '../commandManager';
-import { isMarkdownFile, MDDocumentContentProvider, getMarkdownUri } from '../features/previewContentProvider';
+import { isMarkdownFile, getMarkdownUri, MarkdownPreviewWebviewManager } from '../features/previewContentProvider';
 
 export class RefreshPreviewCommand implements Command {
 	public readonly id = 'markdown.refreshPreview';
 
 	public constructor(
-		private readonly contentProvider: MDDocumentContentProvider
+		private readonly webviewManager: MarkdownPreviewWebviewManager
 	) { }
 
 	public execute(resource: string | undefined) {
 		if (resource) {
 			const source = vscode.Uri.parse(resource);
-			this.contentProvider.update(source);
+			this.webviewManager.update(source);
 		} else if (vscode.window.activeTextEditor && isMarkdownFile(vscode.window.activeTextEditor.document)) {
-			this.contentProvider.update(getMarkdownUri(vscode.window.activeTextEditor.document.uri));
+			this.webviewManager.update(getMarkdownUri(vscode.window.activeTextEditor.document.uri));
 		} else {
-			// update all generated md documents
-			for (const document of vscode.workspace.textDocuments) {
-				if (document.uri.scheme === MDDocumentContentProvider.scheme) {
-					this.contentProvider.update(document.uri);
-				}
-			}
+			this.webviewManager.updateAll();
 		}
 	}
 }
\ No newline at end of file
diff --git a/extensions/markdown/src/commands/showPreview.ts b/extensions/markdown/src/commands/showPreview.ts
index e3cb65f0a3f..5383c686496 100644
--- a/extensions/markdown/src/commands/showPreview.ts
+++ b/extensions/markdown/src/commands/showPreview.ts
@@ -3,15 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vscode-nls';
-const localize = nls.loadMessageBundle();
-
 import * as vscode from 'vscode';
-import * as path from 'path';
 
 import { Command } from '../commandManager';
-import { ExtensionContentSecurityPolicyArbiter } from '../security';
-import { getMarkdownUri, } from '../features/previewContentProvider';
+import { MarkdownPreviewWebviewManager, } from '../features/previewContentProvider';
 import { TelemetryReporter } from '../telemetryReporter';
 
 
@@ -36,7 +31,7 @@ function getViewColumn(sideBySide: boolean): vscode.ViewColumn | undefined {
 }
 
 function showPreview(
-	cspArbiter: ExtensionContentSecurityPolicyArbiter,
+	webviewManager: MarkdownPreviewWebviewManager,
 	telemetryReporter: TelemetryReporter,
 	uri?: vscode.Uri,
 	sideBySide: boolean = false,
@@ -58,34 +53,29 @@ function showPreview(
 		return;
 	}
 
-	const thenable = vscode.commands.executeCommand('vscode.previewHtml',
-		getMarkdownUri(resource),
-		getViewColumn(sideBySide),
-		localize('previewTitle', 'Preview {0}', path.basename(resource.fsPath)),
-		{
-			allowScripts: true,
-			allowSvgs: cspArbiter.shouldAllowSvgsForResource(resource)
-		});
+	const view = webviewManager.create(
+		resource,
+		getViewColumn(sideBySide) || vscode.ViewColumn.Active);
 
 	telemetryReporter.sendTelemetryEvent('openPreview', {
 		where: sideBySide ? 'sideBySide' : 'inPlace',
 		how: (uri instanceof vscode.Uri) ? 'action' : 'pallete'
 	});
 
-	return thenable;
+	return view;
 }
 
 export class ShowPreviewCommand implements Command {
 	public readonly id = 'markdown.showPreview';
 
 	public constructor(
-		private readonly cspArbiter: ExtensionContentSecurityPolicyArbiter,
+		private readonly webviewManager: MarkdownPreviewWebviewManager,
 		private readonly telemetryReporter: TelemetryReporter
 	) { }
 
 	public execute(mainUri?: vscode.Uri, allUris?: vscode.Uri[]) {
 		for (const uri of (allUris || [mainUri])) {
-			showPreview(this.cspArbiter, this.telemetryReporter, uri, false);
+			showPreview(this.webviewManager, this.telemetryReporter, uri, false);
 		}
 	}
 }
@@ -94,11 +84,11 @@ export class ShowPreviewToSideCommand implements Command {
 	public readonly id = 'markdown.showPreviewToSide';
 
 	public constructor(
-		private readonly cspArbiter: ExtensionContentSecurityPolicyArbiter,
+		private readonly webviewManager: MarkdownPreviewWebviewManager,
 		private readonly telemetryReporter: TelemetryReporter
 	) { }
 
 	public execute(uri?: vscode.Uri) {
-		showPreview(this.cspArbiter, this.telemetryReporter, uri, true);
+		showPreview(this.webviewManager, this.telemetryReporter, uri, true);
 	}
 }
diff --git a/extensions/markdown/src/extension.ts b/extensions/markdown/src/extension.ts
index 2c64c561fe9..524bbe3fcd1 100644
--- a/extensions/markdown/src/extension.ts
+++ b/extensions/markdown/src/extension.ts
@@ -14,7 +14,7 @@ import { loadDefaultTelemetryReporter } from './telemetryReporter';
 import { loadMarkdownExtensions } from './markdownExtensions';
 import LinkProvider from './features/documentLinkProvider';
 import MDDocumentSymbolProvider from './features/documentSymbolProvider';
-import { MDDocumentContentProvider, getMarkdownUri, isMarkdownFile } from './features/previewContentProvider';
+import { MarkdownContentProvider, getMarkdownUri, isMarkdownFile, MarkdownPreviewWebviewManager } from './features/previewContentProvider';
 
 
 export function activate(context: vscode.ExtensionContext) {
@@ -27,22 +27,23 @@ export function activate(context: vscode.ExtensionContext) {
 
 	const selector = 'markdown';
 
-	const contentProvider = new MDDocumentContentProvider(engine, context, cspArbiter, logger);
-	context.subscriptions.push(vscode.workspace.registerTextDocumentContentProvider(MDDocumentContentProvider.scheme, contentProvider));
-
+	const contentProvider = new MarkdownContentProvider(engine, context, cspArbiter, logger);
 	loadMarkdownExtensions(contentProvider, engine);
 
+	const webviewManager = new MarkdownPreviewWebviewManager(contentProvider);
+	context.subscriptions.push(webviewManager);
+
 	context.subscriptions.push(vscode.languages.registerDocumentSymbolProvider(selector, new MDDocumentSymbolProvider(engine)));
 	context.subscriptions.push(vscode.languages.registerDocumentLinkProvider(selector, new LinkProvider()));
 
-	const previewSecuritySelector = new PreviewSecuritySelector(cspArbiter, contentProvider);
+	const previewSecuritySelector = new PreviewSecuritySelector(cspArbiter, webviewManager);
 
 	const commandManager = new CommandManager();
 	context.subscriptions.push(commandManager);
-	commandManager.register(new commands.ShowPreviewCommand(cspArbiter, telemetryReporter));
-	commandManager.register(new commands.ShowPreviewToSideCommand(cspArbiter, telemetryReporter));
+	commandManager.register(new commands.ShowPreviewCommand(webviewManager, telemetryReporter));
+	commandManager.register(new commands.ShowPreviewToSideCommand(webviewManager, telemetryReporter));
 	commandManager.register(new commands.ShowSourceCommand());
-	commandManager.register(new commands.RefreshPreviewCommand(contentProvider));
+	commandManager.register(new commands.RefreshPreviewCommand(webviewManager));
 	commandManager.register(new commands.RevealLineCommand(logger));
 	commandManager.register(new commands.MoveCursorToPositionCommand());
 	commandManager.register(new commands.ShowPreviewSecuritySelectorCommand(previewSecuritySelector));
@@ -50,23 +51,9 @@ export function activate(context: vscode.ExtensionContext) {
 	commandManager.register(new commands.DidClickCommand());
 	commandManager.register(new commands.OpenDocumentLinkCommand(engine));
 
-	context.subscriptions.push(vscode.workspace.onDidSaveTextDocument(document => {
-		if (isMarkdownFile(document)) {
-			const uri = getMarkdownUri(document.uri);
-			contentProvider.update(uri);
-		}
-	}));
-
-	context.subscriptions.push(vscode.workspace.onDidChangeTextDocument(event => {
-		if (isMarkdownFile(event.document)) {
-			const uri = getMarkdownUri(event.document.uri);
-			contentProvider.update(uri);
-		}
-	}));
-
 	context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(() => {
 		logger.updateConfiguration();
-		contentProvider.updateConfiguration();
+		webviewManager.updateConfiguration();
 	}));
 
 	context.subscriptions.push(vscode.window.onDidChangeTextEditorSelection(event => {
diff --git a/extensions/markdown/src/features/previewContentProvider.ts b/extensions/markdown/src/features/previewContentProvider.ts
index c2d984b7d74..a0356d51ce4 100644
--- a/extensions/markdown/src/features/previewContentProvider.ts
+++ b/extensions/markdown/src/features/previewContentProvider.ts
@@ -20,22 +20,22 @@ const previewStrings = {
 
 export function isMarkdownFile(document: vscode.TextDocument) {
 	return document.languageId === 'markdown'
-		&& document.uri.scheme !== MDDocumentContentProvider.scheme; // prevent processing of own documents
+		&& document.uri.scheme !== MarkdownContentProvider.scheme; // prevent processing of own documents
 }
 
 export function getMarkdownUri(uri: vscode.Uri) {
-	if (uri.scheme === MDDocumentContentProvider.scheme) {
+	if (uri.scheme === MarkdownContentProvider.scheme) {
 		return uri;
 	}
 
 	return uri.with({
-		scheme: MDDocumentContentProvider.scheme,
+		scheme: MarkdownContentProvider.scheme,
 		path: uri.path + '.rendered',
 		query: uri.toString()
 	});
 }
 
-class MarkdownPreviewConfig {
+export class MarkdownPreviewConfig {
 	public static getConfigForResource(resource: vscode.Uri) {
 		return new MarkdownPreviewConfig(resource);
 	}
@@ -105,7 +105,7 @@ class MarkdownPreviewConfig {
 	[key: string]: any;
 }
 
-class PreviewConfigManager {
+export class PreviewConfigManager {
 	private previewConfigurationsForWorkspaces = new Map<string, MarkdownPreviewConfig>();
 
 	public loadAndCacheConfiguration(
@@ -136,13 +136,9 @@ class PreviewConfigManager {
 	}
 }
 
-export class MDDocumentContentProvider implements vscode.TextDocumentContentProvider {
+export class MarkdownContentProvider {
 	public static readonly scheme = 'markdown';
 
-	private _onDidChange = new vscode.EventEmitter<vscode.Uri>();
-	private _waiting: boolean = false;
-	private previewConfigurations = new PreviewConfigManager();
-
 	private extraStyles: Array<vscode.Uri> = [];
 	private extraScripts: Array<vscode.Uri> = [];
 
@@ -162,7 +158,9 @@ export class MDDocumentContentProvider implements vscode.TextDocumentContentProv
 	}
 
 	private getMediaPath(mediaFile: string): string {
-		return vscode.Uri.file(this.context.asAbsolutePath(path.join('media', mediaFile))).toString();
+		return vscode.Uri.file(this.context.asAbsolutePath(path.join('media', mediaFile)))
+			.with({ scheme: 'vscode-extension-resource' })
+			.toString();
 	}
 
 	private fixHref(resource: vscode.Uri, href: string): string {
@@ -172,23 +170,29 @@ export class MDDocumentContentProvider implements vscode.TextDocumentContentProv
 
 		// Use href if it is already an URL
 		const hrefUri = vscode.Uri.parse(href);
-		if (['file', 'http', 'https'].indexOf(hrefUri.scheme) >= 0) {
+		if (['http', 'https'].indexOf(hrefUri.scheme) >= 0) {
 			return hrefUri.toString();
 		}
 
 		// Use href as file URI if it is absolute
-		if (path.isAbsolute(href)) {
-			return vscode.Uri.file(href).toString();
+		if (path.isAbsolute(href) || hrefUri.scheme === 'file') {
+			return vscode.Uri.file(href)
+				.with({ scheme: 'vscode-workspace-resource' })
+				.toString();
 		}
 
 		// use a workspace relative path if there is a workspace
 		let root = vscode.workspace.getWorkspaceFolder(resource);
 		if (root) {
-			return vscode.Uri.file(path.join(root.uri.fsPath, href)).toString();
+			return vscode.Uri.file(path.join(root.uri.fsPath, href))
+				.with({ scheme: 'vscode-workspace-resource' })
+				.toString();
 		}
 
 		// otherwise look relative to the markdown file
-		return vscode.Uri.file(path.join(path.dirname(resource.fsPath), href)).toString();
+		return vscode.Uri.file(path.join(path.dirname(resource.fsPath), href))
+			.with({ scheme: 'vscode-workspace-resource' })
+			.toString();
 	}
 
 	private computeCustomStyleSheetIncludes(resource: vscode.Uri, config: MarkdownPreviewConfig): string {
@@ -228,9 +232,10 @@ export class MDDocumentContentProvider implements vscode.TextDocumentContentProv
 			.join('\n');
 	}
 
-	public async provideTextDocumentContent(uri: vscode.Uri): Promise<string> {
-		const sourceUri = vscode.Uri.parse(uri.query);
-
+	public async provideTextDocumentContent(
+		sourceUri: vscode.Uri,
+		previewConfigurations: PreviewConfigManager
+	): Promise<string> {
 		let initialLine: number | undefined = undefined;
 		const editor = vscode.window.activeTextEditor;
 		if (editor && editor.document.uri.toString() === sourceUri.toString()) {
@@ -238,10 +243,10 @@ export class MDDocumentContentProvider implements vscode.TextDocumentContentProv
 		}
 
 		const document = await vscode.workspace.openTextDocument(sourceUri);
-		const config = this.previewConfigurations.loadAndCacheConfiguration(sourceUri);
+		const config = previewConfigurations.loadAndCacheConfiguration(sourceUri);
 
 		const initialData = {
-			previewUri: uri.toString(),
+			previewUri: sourceUri.toString(), // TODO
 			source: sourceUri.toString(),
 			line: initialLine,
 			scrollPreviewWithEditorSelection: config.scrollPreviewWithEditorSelection,
@@ -266,7 +271,7 @@ export class MDDocumentContentProvider implements vscode.TextDocumentContentProv
 				<script src="${this.getMediaPath('csp.js')}" nonce="${nonce}"></script>
 				<script src="${this.getMediaPath('loading.js')}" nonce="${nonce}"></script>
 				${this.getStyles(sourceUri, nonce, config)}
-				<base href="${document.uri.toString(true)}">
+				<base href="${document.uri.with({ scheme: 'vscode-workspace-resource' }).toString(true)}">
 			</head>
 			<body class="vscode-body ${config.scrollBeyondLastLine ? 'scrollBeyondLastLine' : ''} ${config.wordWrap ? 'wordWrap' : ''} ${config.markEditorSelection ? 'showEditorSelection' : ''}">
 				${body}
@@ -276,43 +281,96 @@ export class MDDocumentContentProvider implements vscode.TextDocumentContentProv
 			</html>`;
 	}
 
-	public updateConfiguration() {
-		// update all generated md documents
-		for (const document of vscode.workspace.textDocuments) {
-			if (document.uri.scheme === MDDocumentContentProvider.scheme) {
-				const sourceUri = vscode.Uri.parse(document.uri.query);
-				if (this.previewConfigurations.shouldUpdateConfiguration(sourceUri)) {
-					this.update(document.uri);
-				}
-			}
-		}
-	}
-
-	get onDidChange(): vscode.Event<vscode.Uri> {
-		return this._onDidChange.event;
-	}
-
-	public update(uri: vscode.Uri) {
-		if (!this._waiting) {
-			this._waiting = true;
-			setTimeout(() => {
-				this._waiting = false;
-				this._onDidChange.fire(uri);
-			}, 300);
-		}
-	}
-
 	private getCspForResource(resource: vscode.Uri, nonce: string): string {
 		switch (this.cspArbiter.getSecurityLevelForResource(resource)) {
 			case MarkdownPreviewSecurityLevel.AllowInsecureContent:
-				return `<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' http: https: data:; media-src 'self' http: https: data:; script-src 'nonce-${nonce}'; style-src 'self' 'unsafe-inline' http: https: data:; font-src 'self' http: https: data:;">`;
+				return `<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src vscode-workspace-resource: vscode-extension-resource: http: https: data:; media-src vscode-workspace-resource: vscode-extension-resource: http: https: data:; script-src 'nonce-${nonce}'; style-src vscode-workspace-resource: 'unsafe-inline' http: https: data: vscode-extension-resource:; font-src vscode-workspace-resource: http: https: data:;">`;
 
 			case MarkdownPreviewSecurityLevel.AllowScriptsAndAllContent:
 				return '';
 
 			case MarkdownPreviewSecurityLevel.Strict:
 			default:
-				return `<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data:; media-src 'self' https: data:; script-src 'nonce-${nonce}'; style-src 'self' 'unsafe-inline' https: data:; font-src 'self' https: data:;">`;
+				return `<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src vscode-workspace-resource: vscode-extension-resource: https: data:; media-src vscode-workspace-resource: vscode-extension-resource: https: data:; script-src 'nonce-${nonce}'; style-src vscode-workspace-resource: 'unsafe-inline' https: data: vscode-extension-resource:; font-src vscode-workspace-resource: https: data:;">`;
 		}
 	}
 }
+
+export class MarkdownPreviewWebviewManager {
+	private readonly webviews = new Map<string, vscode.Webview>();
+	private readonly previewConfigurations = new PreviewConfigManager();
+
+	private readonly disposables: vscode.Disposable[] = [];
+
+	public constructor(
+		private readonly contentProvider: MarkdownContentProvider
+	) {
+		vscode.workspace.onDidSaveTextDocument(document => {
+			this.update(document.uri);
+		}, null, this.disposables);
+
+		vscode.workspace.onDidChangeTextDocument(event => {
+			this.update(event.document.uri);
+		}, null, this.disposables);
+	}
+
+	public dispose(): void {
+		while (this.disposables.length) {
+			const item = this.disposables.pop();
+			if (item) {
+				item.dispose();
+			}
+		}
+		this.webviews.clear();
+	}
+
+	public update(uri: vscode.Uri) {
+		const webview = this.webviews.get(uri.fsPath);
+		if (webview) {
+			this.contentProvider.provideTextDocumentContent(uri, this.previewConfigurations).then(x => webview.html = x);
+		}
+	}
+
+	public updateAll() {
+		for (const resource of this.webviews.keys()) {
+			const sourceUri = vscode.Uri.parse(resource);
+			this.update(sourceUri);
+		}
+	}
+
+	public updateConfiguration() {
+		for (const resource of this.webviews.keys()) {
+			const sourceUri = vscode.Uri.parse(resource);
+			if (this.previewConfigurations.shouldUpdateConfiguration(sourceUri)) {
+				this.update(sourceUri);
+			}
+		}
+	}
+
+	public create(
+		resource: vscode.Uri,
+		viewColumn: vscode.ViewColumn
+	) {
+		const view = vscode.window.createWebview(
+			localize('previewTitle', 'Preview {0}', path.basename(resource.fsPath)),
+			viewColumn,
+			{ enableScripts: true });
+
+		this.contentProvider.provideTextDocumentContent(resource, this.previewConfigurations).then(x => view.html = x);
+
+		view.onMessage(e => {
+			vscode.commands.executeCommand(e.command, ...e.args);
+		});
+
+		view.onBecameActive(() => {
+			vscode.commands.executeCommand('setContext', 'markdownPreview', true);
+		});
+
+		view.onBecameInactive(() => {
+			vscode.commands.executeCommand('setContext', 'markdownPreview', false);
+		});
+
+		this.webviews.set(resource.fsPath, view);
+		return view;
+	}
+}
\ No newline at end of file
diff --git a/extensions/markdown/src/markdownEngine.ts b/extensions/markdown/src/markdownEngine.ts
index 8650479e524..44fe586602c 100644
--- a/extensions/markdown/src/markdownEngine.ts
+++ b/extensions/markdown/src/markdownEngine.ts
@@ -152,7 +152,7 @@ export class MarkdownEngine {
 					if (fragment) {
 						uri = uri.with({ fragment });
 					}
-					return normalizeLink(uri.toString(true));
+					return normalizeLink(uri.with({ scheme: 'vscode-workspace-resource' }).toString(true));
 				}
 			} catch (e) {
 				// noop
diff --git a/extensions/markdown/src/markdownExtensions.ts b/extensions/markdown/src/markdownExtensions.ts
index 4504cf3dfe0..6bba131e107 100644
--- a/extensions/markdown/src/markdownExtensions.ts
+++ b/extensions/markdown/src/markdownExtensions.ts
@@ -6,20 +6,17 @@
 import * as vscode from 'vscode';
 import * as path from 'path';
 
-import { MDDocumentContentProvider } from './features/previewContentProvider';
+import { MarkdownContentProvider } from './features/previewContentProvider';
 import { MarkdownEngine } from './markdownEngine';
 
-const resolveExtensionResources = (extension: vscode.Extension<any>, stylePath: string): vscode.Uri => {
-	const resource = vscode.Uri.parse(stylePath);
-	if (resource.scheme) {
-		return resource;
-	}
-	return vscode.Uri.file(path.join(extension.extensionPath, stylePath));
+const resolveExtensionResources = (extension: vscode.Extension<any>, resourcePath: string): vscode.Uri => {
+	return vscode.Uri.parse(path.join(extension.extensionPath, resourcePath))
+		.with({ scheme: 'vscode-extension-resource' });
 };
 
 
 export function loadMarkdownExtensions(
-	contentProvider: MDDocumentContentProvider,
+	contentProvider: MarkdownContentProvider,
 	engine: MarkdownEngine
 ) {
 	for (const extension of vscode.extensions.all) {
@@ -50,7 +47,7 @@ function tryLoadMarkdownItPlugins(
 
 function tryLoadPreviewScripts(
 	contributes: any,
-	contentProvider: MDDocumentContentProvider,
+	contentProvider: MarkdownContentProvider,
 	extension: vscode.Extension<any>
 ) {
 	const scripts = contributes['markdown.previewScripts'];
@@ -67,7 +64,7 @@ function tryLoadPreviewScripts(
 
 function tryLoadPreviewStyles(
 	contributes: any,
-	contentProvider: MDDocumentContentProvider,
+	contentProvider: MarkdownContentProvider,
 	extension: vscode.Extension<any>
 ) {
 	const styles = contributes['markdown.previewStyles'];
diff --git a/extensions/markdown/src/security.ts b/extensions/markdown/src/security.ts
index c4625250af0..5978a9102b9 100644
--- a/extensions/markdown/src/security.ts
+++ b/extensions/markdown/src/security.ts
@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 
-import { getMarkdownUri, MDDocumentContentProvider } from './features/previewContentProvider';
+import { getMarkdownUri, MarkdownPreviewWebviewManager } from './features/previewContentProvider';
 
 import * as nls from 'vscode-nls';
 
@@ -90,7 +90,7 @@ export class PreviewSecuritySelector {
 
 	public constructor(
 		private cspArbiter: ContentSecurityPolicyArbiter,
-		private contentProvider: MDDocumentContentProvider
+		private webviewManager: MarkdownPreviewWebviewManager
 	) { }
 
 	public async showSecutitySelectorForResource(resource: vscode.Uri): Promise<void> {
@@ -146,19 +146,12 @@ export class PreviewSecuritySelector {
 		const sourceUri = getMarkdownUri(resource);
 		if (selection.type === 'toggle') {
 			this.cspArbiter.setShouldDisableSecurityWarning(!this.cspArbiter.shouldDisableSecurityWarnings());
-			this.contentProvider.update(sourceUri);
+			this.webviewManager.update(sourceUri);
 			return;
 		}
 
 		await this.cspArbiter.setSecurityLevelForResource(resource, selection.type);
 
-		await vscode.commands.executeCommand('_workbench.htmlPreview.updateOptions',
-			sourceUri,
-			{
-				allowScripts: true,
-				allowSvgs: this.cspArbiter.shouldAllowSvgsForResource(resource)
-			});
-
-		this.contentProvider.update(sourceUri);
+		this.webviewManager.update(sourceUri);
 	}
 }
diff --git a/extensions/markdown/src/typings/ref.d.ts b/extensions/markdown/src/typings/ref.d.ts
index bc057c55878..954bab971e3 100644
--- a/extensions/markdown/src/typings/ref.d.ts
+++ b/extensions/markdown/src/typings/ref.d.ts
@@ -4,4 +4,5 @@
  *--------------------------------------------------------------------------------------------*/
 
 /// <reference path='../../../../src/vs/vscode.d.ts'/>
+/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
 /// <reference types='@types/node'/>
diff --git a/extensions/markdown/syntaxes/markdown.tmLanguage.json b/extensions/markdown/syntaxes/markdown.tmLanguage.json
index 957f09e64fc..bad82f2269a 100644
--- a/extensions/markdown/syntaxes/markdown.tmLanguage.json
+++ b/extensions/markdown/syntaxes/markdown.tmLanguage.json
@@ -4,15 +4,9 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/1ba9efd21c29c70dd87d8402a92ef64666dcb25e",
-	"fileTypes": [
-		"md",
-		"mdown",
-		"markdown",
-		"markdn"
-	],
-	"keyEquivalent": "^~M",
+	"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/73687e96144eff4db45a9a00655bfe87c73b023d",
 	"name": "Markdown",
+	"scopeName": "text.html.markdown",
 	"patterns": [
 		{
 			"include": "#frontMatter"
@@ -200,621 +194,6 @@
 					],
 					"while": "(^|\\G)\\s*(>) ?"
 				},
-				"fenced_code_block_unknown": {
-					"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?=([^`~]*)?$)",
-					"beginCaptures": {
-						"3": {
-							"name": "punctuation.definition.markdown"
-						},
-						"4": {
-							"name": "fenced_code.block.language"
-						}
-					},
-					"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
-					"endCaptures": {
-						"3": {
-							"name": "punctuation.definition.markdown"
-						}
-					},
-					"name": "markup.fenced_code.block.markdown"
-				},
-				"heading": {
-					"begin": "(?:^|\\G)[ ]{0,3}(#{1,6})\\s*(?=[\\S[^#]])",
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.heading.markdown"
-						}
-					},
-					"contentName": "entity.name.section.markdown",
-					"end": "\\s*(#{1,6})?$\\n?",
-					"name": "markup.heading.markdown",
-					"patterns": [
-						{
-							"include": "#inline"
-						}
-					]
-				},
-				"heading-setext": {
-					"patterns": [
-						{
-							"match": "^(={3,})(?=[ \\t]*$\\n?)",
-							"name": "markup.heading.setext.1.markdown"
-						},
-						{
-							"match": "^(-{3,})(?=[ \\t]*$\\n?)",
-							"name": "markup.heading.setext.2.markdown"
-						}
-					]
-				},
-				"html": {
-					"patterns": [
-						{
-							"begin": "(^|\\G)\\s*(<!--)",
-							"captures": {
-								"1": {
-									"name": "punctuation.definition.comment.html"
-								},
-								"2": {
-									"name": "punctuation.definition.comment.html"
-								}
-							},
-							"end": "(-->)",
-							"name": "comment.block.html"
-						},
-						{
-							"begin": "(^|\\G)\\s*(?=<(script|style|pre)(\\s|$|>)(?!.*?</(script|style|pre)>))",
-							"end": "(?=.*</(script|style|pre)>)",
-							"patterns": [
-								{
-									"begin": "(\\s*|$)",
-									"patterns": [
-										{
-											"include": "text.html.basic"
-										}
-									],
-									"while": "^(?!.*</(script|style|pre)>)"
-								}
-							]
-						},
-						{
-							"begin": "(^|\\G)\\s*(?=</?(address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h1|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul)(\\s|$|/?>))",
-							"patterns": [
-								{
-									"include": "text.html.basic"
-								}
-							],
-							"while": "^(?!\\s*$)"
-						},
-						{
-							"begin": "(^|\\G)\\s*(?=(<[a-zA-Z0-9\\-](/?>|\\s.*?>)|</[a-zA-Z0-9\\-]>)\\s*$)",
-							"patterns": [
-								{
-									"include": "text.html.basic"
-								}
-							],
-							"while": "^(?!\\s*$)"
-						}
-					]
-				},
-				"link-def": {
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.constant.markdown"
-						},
-						"2": {
-							"name": "constant.other.reference.link.markdown"
-						},
-						"3": {
-							"name": "punctuation.definition.constant.markdown"
-						},
-						"4": {
-							"name": "punctuation.separator.key-value.markdown"
-						},
-						"5": {
-							"name": "punctuation.definition.link.markdown"
-						},
-						"6": {
-							"name": "markup.underline.link.markdown"
-						},
-						"7": {
-							"name": "punctuation.definition.link.markdown"
-						},
-						"8": {
-							"name": "string.other.link.description.title.markdown"
-						},
-						"9": {
-							"name": "punctuation.definition.string.begin.markdown"
-						},
-						"10": {
-							"name": "punctuation.definition.string.end.markdown"
-						},
-						"11": {
-							"name": "string.other.link.description.title.markdown"
-						},
-						"12": {
-							"name": "punctuation.definition.string.begin.markdown"
-						},
-						"13": {
-							"name": "punctuation.definition.string.end.markdown"
-						}
-					},
-					"match": "^(?x:\n  \\s*\t\t\t\t\t\t# Leading whitespace\n  (\\[)(.+?)(\\])(:)\t\t# Reference name\n  [ \\t]*\t\t\t\t\t# Optional whitespace\n  (<?)(\\S+?)(>?)\t\t\t# The url\n  [ \\t]*\t\t\t\t\t# Optional whitespace\n  (?:\n      ((\\().+?(\\)))\t\t# Match title in quotes…\n    | ((\").+?(\"))\t\t# or in parens.\n  )?\t\t\t\t\t\t# Title is optional\n  \\s*\t\t\t\t\t\t# Optional whitespace\n  $\n)\n",
-					"name": "meta.link.reference.def.markdown"
-				},
-				"list_paragraph": {
-					"begin": "(^|\\G)(?=\\S)(?![*+->]\\s|[0-9]+\\.\\s)",
-					"name": "meta.paragraph.markdown",
-					"patterns": [
-						{
-							"include": "#inline"
-						},
-						{
-							"include": "text.html.basic"
-						},
-						{
-							"include": "#heading-setext"
-						}
-					],
-					"while": "(^|\\G)(?!\\s*$|#|[ ]{0,3}([-*_>][ ]{2,}){3,}[ \\t]*$\\n?|[ ]{0,3}[*+->]|[ ]{0,3}[0-9]+\\.)"
-				},
-				"lists": {
-					"patterns": [
-						{
-							"begin": "(^|\\G)([ ]{0,3})([*+-])([ ]{1,3}|\\t)",
-							"beginCaptures": {
-								"3": {
-									"name": "beginning.punctuation.definition.list.markdown"
-								}
-							},
-							"comment": "Currently does not support un-indented second lines.",
-							"name": "markup.list.unnumbered.markdown",
-							"patterns": [
-								{
-									"include": "#block"
-								},
-								{
-									"include": "#list_paragraph"
-								}
-							],
-							"while": "((^|\\G)([ ]{4}|\\t))|(^[ \\t]*$)"
-						},
-						{
-							"begin": "(^|\\G)([ ]{0,3})([0-9]+\\.)([ ]{1,3}|\\t)",
-							"beginCaptures": {
-								"3": {
-									"name": "beginning.punctuation.definition.list.markdown"
-								}
-							},
-							"name": "markup.list.numbered.markdown",
-							"patterns": [
-								{
-									"include": "#block"
-								},
-								{
-									"include": "#list_paragraph"
-								}
-							],
-							"while": "((^|\\G)([ ]{4}|\\t))|(^[ \\t]*$)"
-						}
-					]
-				},
-				"paragraph": {
-					"begin": "(^|\\G)[ ]{0,3}(?=\\S)",
-					"name": "meta.paragraph.markdown",
-					"patterns": [
-						{
-							"include": "#inline"
-						},
-						{
-							"include": "text.html.basic"
-						},
-						{
-							"include": "#heading-setext"
-						}
-					],
-					"while": "(^|\\G)((?=\\s*[-=]{3,}\\s*$)|[ ]{4,}(?=\\S))"
-				},
-				"raw_block": {
-					"begin": "(^|\\G)([ ]{4}|\\t)",
-					"name": "markup.raw.block.markdown",
-					"while": "(^|\\G)([ ]{4}|\\t)"
-				},
-				"separator": {
-					"match": "(^|\\G)[ ]{0,3}([*-_])([ ]{0,2}\\2){2,}[ \\t]*$\\n?",
-					"name": "meta.separator.markdown"
-				}
-			}
-		},
-		"frontMatter": {
-			"begin": "\\A-{3}\\s*$",
-			"contentName": "meta.embedded.block.frontmatter",
-			"patterns": [
-				{
-					"include": "source.yaml"
-				}
-			],
-			"while": "^(?!(-{3}|\\.{3})\\s*$)"
-		},
-		"inline": {
-			"patterns": [
-				{
-					"include": "#ampersand"
-				},
-				{
-					"include": "#bracket"
-				},
-				{
-					"include": "#bold"
-				},
-				{
-					"include": "#italic"
-				},
-				{
-					"include": "#raw"
-				},
-				{
-					"include": "#escape"
-				},
-				{
-					"include": "#image-inline"
-				},
-				{
-					"include": "#image-ref"
-				},
-				{
-					"include": "#link-email"
-				},
-				{
-					"include": "#link-inet"
-				},
-				{
-					"include": "#link-inline"
-				},
-				{
-					"include": "#link-ref"
-				},
-				{
-					"include": "#link-ref-literal"
-				}
-			],
-			"repository": {
-				"ampersand": {
-					"comment": "Markdown will convert this for us. We match it so that the HTML grammar will not mark it up as invalid.",
-					"match": "&(?!([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+);)",
-					"name": "meta.other.valid-ampersand.markdown"
-				},
-				"bold": {
-					"begin": "(?x)\n (\\*\\*|__)(?=\\S)\t\t\t\t\t\t\t\t# Open\n (?=\n   (\n     <[^>]*+>\t\t\t\t\t\t\t# HTML tags\n     | (?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>\n                       # Raw\n     | \\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+\t\t\t# Escapes\n     | \\[\n     (\n         (?<square>\t\t\t\t\t# Named group\n           [^\\[\\]\\\\]\t\t\t\t# Match most chars\n           | \\\\.\t\t\t\t\t\t# Escaped chars\n           | \\[ \\g<square>*+ \\]\t\t# Nested brackets\n         )*+\n       \\]\n       (\n         (\t\t\t\t\t\t\t# Reference Link\n           [ ]?\t\t\t\t\t# Optional space\n           \\[[^\\]]*+\\]\t\t\t\t# Ref name\n         )\n         | (\t\t\t\t\t\t\t# Inline Link\n           \\(\t\t\t\t\t\t# Opening paren\n             [ \\t]*+\t\t\t\t# Optional whitespace\n             <?(.*?)>?\t\t\t# URL\n             [ \\t]*+\t\t\t\t# Optional whitespace\n             (\t\t\t\t\t# Optional Title\n               (?<title>['\"])\n               (.*?)\n               \\k<title>\n             )?\n           \\)\n         )\n       )\n     )\n     | (?!(?<=\\S)\\1).\t\t\t\t\t\t# Everything besides\n                       # style closer\n   )++\n   (?<=\\S)\\1\t\t\t\t\t\t\t\t# Close\n )\n",
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.bold.markdown"
-						}
-					},
-					"end": "(?<=\\S)(\\1)",
-					"name": "markup.bold.markdown",
-					"patterns": [
-						{
-							"applyEndPatternLast": 1,
-							"begin": "(?=<[^>]*?>)",
-							"end": "(?<=>)",
-							"patterns": [
-								{
-									"include": "text.html.basic"
-								}
-							]
-						},
-						{
-							"include": "#escape"
-						},
-						{
-							"include": "#ampersand"
-						},
-						{
-							"include": "#bracket"
-						},
-						{
-							"include": "#raw"
-						},
-						{
-							"include": "#italic"
-						},
-						{
-							"include": "#image-inline"
-						},
-						{
-							"include": "#link-inline"
-						},
-						{
-							"include": "#link-inet"
-						},
-						{
-							"include": "#link-email"
-						},
-						{
-							"include": "#image-ref"
-						},
-						{
-							"include": "#link-ref-literal"
-						},
-						{
-							"include": "#link-ref"
-						}
-					]
-				},
-				"bracket": {
-					"comment": "Markdown will convert this for us. We match it so that the HTML grammar will not mark it up as invalid.",
-					"match": "<(?![a-z/?\\$!])",
-					"name": "meta.other.valid-bracket.markdown"
-				},
-				"escape": {
-					"match": "\\\\[-`*_#+.!(){}\\[\\]\\\\>]",
-					"name": "constant.character.escape.markdown"
-				},
-				"image-inline": {
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.string.begin.markdown"
-						},
-						"2": {
-							"name": "string.other.link.description.markdown"
-						},
-						"4": {
-							"name": "punctuation.definition.string.end.markdown"
-						},
-						"5": {
-							"name": "punctuation.definition.metadata.markdown"
-						},
-						"6": {
-							"name": "punctuation.definition.link.markdown"
-						},
-						"7": {
-							"name": "markup.underline.link.image.markdown"
-						},
-						"8": {
-							"name": "punctuation.definition.link.markdown"
-						},
-						"9": {
-							"name": "string.other.link.description.title.markdown"
-						},
-						"10": {
-							"name": "punctuation.definition.string.markdown"
-						},
-						"11": {
-							"name": "punctuation.definition.string.markdown"
-						},
-						"12": {
-							"name": "string.other.link.description.title.markdown"
-						},
-						"13": {
-							"name": "punctuation.definition.string.markdown"
-						},
-						"14": {
-							"name": "punctuation.definition.string.markdown"
-						},
-						"15": {
-							"name": "punctuation.definition.metadata.markdown"
-						}
-					},
-					"match": "(?x:\n  (\\!\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])\n                # Match the link text.\n  (\\()\t\t\t\t\t\t# Opening paren for url\n    (<?)(\\S+?)(>?)\t\t\t# The url\n    [ \\t]*\t\t\t\t\t# Optional whitespace\n    (?:\n        ((\\().+?(\\)))\t\t# Match title in parens…\n      | ((\").+?(\"))\t\t# or in quotes.\n    )?\t\t\t\t\t\t# Title is optional\n    \\s*\t\t\t\t\t\t# Optional whitespace\n  (\\))\n)\n",
-					"name": "meta.image.inline.markdown"
-				},
-				"image-ref": {
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.string.begin.markdown"
-						},
-						"2": {
-							"name": "string.other.link.description.markdown"
-						},
-						"4": {
-							"name": "punctuation.definition.string.begin.markdown"
-						},
-						"5": {
-							"name": "punctuation.definition.constant.markdown"
-						},
-						"6": {
-							"name": "constant.other.reference.link.markdown"
-						},
-						"7": {
-							"name": "punctuation.definition.constant.markdown"
-						}
-					},
-					"match": "(\\!\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])[ ]?(\\[)(.*?)(\\])",
-					"name": "meta.image.reference.markdown"
-				},
-				"italic": {
-					"begin": "(?x) (\\*\\b|\\b_)(?=\\S)\t\t\t\t\t\t\t\t# Open\n  (?=\n    (\n      <[^>]*+>\t\t\t\t\t\t\t# HTML tags\n      | (?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>\n                        # Raw\n      | \\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+\t\t\t# Escapes\n      | \\[\n      (\n          (?<square>\t\t\t\t\t# Named group\n            [^\\[\\]\\\\]\t\t\t\t# Match most chars\n            | \\\\.\t\t\t\t\t\t# Escaped chars\n            | \\[ \\g<square>*+ \\]\t\t# Nested brackets\n          )*+\n        \\]\n        (\n          (\t\t\t\t\t\t\t# Reference Link\n            [ ]?\t\t\t\t\t# Optional space\n            \\[[^\\]]*+\\]\t\t\t\t# Ref name\n          )\n          | (\t\t\t\t\t\t\t# Inline Link\n            \\(\t\t\t\t\t\t# Opening paren\n              [ \\t]*+\t\t\t\t# Optional whtiespace\n              <?(.*?)>?\t\t\t# URL\n              [ \\t]*+\t\t\t\t# Optional whtiespace\n              (\t\t\t\t\t# Optional Title\n                (?<title>['\"])\n                (.*?)\n                \\k<title>\n              )?\n            \\)\n          )\n        )\n      )\n      | \\1\\1\t\t\t\t\t\t\t\t# Must be bold closer\n      | (?!(?<=\\S)\\1).\t\t\t\t\t\t# Everything besides\n                        # style closer\n    )++\n    (?<=\\S)\\1\t\t\t\t\t\t\t\t# Close\n  )\n",
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.italic.markdown"
-						}
-					},
-					"end": "(?<=\\S)(\\1)((?!\\1)|(?=\\1\\1))",
-					"name": "markup.italic.markdown",
-					"patterns": [
-						{
-							"applyEndPatternLast": 1,
-							"begin": "(?=<[^>]*?>)",
-							"end": "(?<=>)",
-							"patterns": [
-								{
-									"include": "text.html.basic"
-								}
-							]
-						},
-						{
-							"include": "#escape"
-						},
-						{
-							"include": "#ampersand"
-						},
-						{
-							"include": "#bracket"
-						},
-						{
-							"include": "#raw"
-						},
-						{
-							"include": "#bold"
-						},
-						{
-							"include": "#image-inline"
-						},
-						{
-							"include": "#link-inline"
-						},
-						{
-							"include": "#link-inet"
-						},
-						{
-							"include": "#link-email"
-						},
-						{
-							"include": "#image-ref"
-						},
-						{
-							"include": "#link-ref-literal"
-						},
-						{
-							"include": "#link-ref"
-						}
-					]
-				},
-				"link-email": {
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.link.markdown"
-						},
-						"2": {
-							"name": "markup.underline.link.markdown"
-						},
-						"4": {
-							"name": "punctuation.definition.link.markdown"
-						}
-					},
-					"match": "(<)((?:mailto:)?[-.\\w]+@[-a-z0-9]+(\\.[-a-z0-9]+)*\\.[a-z]+)(>)",
-					"name": "meta.link.email.lt-gt.markdown"
-				},
-				"link-inet": {
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.link.markdown"
-						},
-						"2": {
-							"name": "markup.underline.link.markdown"
-						},
-						"3": {
-							"name": "punctuation.definition.link.markdown"
-						}
-					},
-					"match": "(<)((?:https?|ftp)://.*?)(>)",
-					"name": "meta.link.inet.markdown"
-				},
-				"link-inline": {
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.string.begin.markdown"
-						},
-						"2": {
-							"name": "string.other.link.title.markdown"
-						},
-						"4": {
-							"name": "punctuation.definition.string.end.markdown"
-						},
-						"5": {
-							"name": "punctuation.definition.metadata.markdown"
-						},
-						"6": {
-							"name": "punctuation.definition.link.markdown"
-						},
-						"7": {
-							"name": "markup.underline.link.markdown"
-						},
-						"8": {
-							"name": "punctuation.definition.link.markdown"
-						},
-						"9": {
-							"name": "string.other.link.description.title.markdown"
-						},
-						"10": {
-							"name": "punctuation.definition.string.begin.markdown"
-						},
-						"11": {
-							"name": "punctuation.definition.string.end.markdown"
-						},
-						"12": {
-							"name": "string.other.link.description.title.markdown"
-						},
-						"13": {
-							"name": "punctuation.definition.string.begin.markdown"
-						},
-						"14": {
-							"name": "punctuation.definition.string.end.markdown"
-						},
-						"15": {
-							"name": "punctuation.definition.metadata.markdown"
-						}
-					},
-					"match": "(?x:\n    (\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])\n                  # Match the link text.\n    (\\()\t\t\t\t\t\t# Opening paren for url\n      (<?)(.*?)(>?)\t\t\t# The url\n      [ \\t]*\t\t\t\t\t# Optional whitespace\n      (?:\n          ((\\().+?(\\)))\t\t# Match title in parens…\n        | ((\").+?(\"))\t\t# or in quotes.\n      )?\t\t\t\t\t\t# Title is optional\n      \\s*\t\t\t\t\t\t# Optional whitespace\n    (\\))\n  )\n",
-					"name": "meta.link.inline.markdown"
-				},
-				"link-ref": {
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.string.begin.markdown"
-						},
-						"2": {
-							"name": "string.other.link.title.markdown"
-						},
-						"4": {
-							"name": "punctuation.definition.string.end.markdown"
-						},
-						"5": {
-							"name": "punctuation.definition.constant.begin.markdown"
-						},
-						"6": {
-							"name": "constant.other.reference.link.markdown"
-						},
-						"7": {
-							"name": "punctuation.definition.constant.end.markdown"
-						}
-					},
-					"match": "(\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])(\\[)([^\\]]*+)(\\])",
-					"name": "meta.link.reference.markdown"
-				},
-				"link-ref-literal": {
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.string.begin.markdown"
-						},
-						"2": {
-							"name": "string.other.link.title.markdown"
-						},
-						"4": {
-							"name": "punctuation.definition.string.end.markdown"
-						},
-						"5": {
-							"name": "punctuation.definition.constant.begin.markdown"
-						},
-						"6": {
-							"name": "punctuation.definition.constant.end.markdown"
-						}
-					},
-					"match": "(\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])[ ]?(\\[)(\\])",
-					"name": "meta.link.reference.literal.markdown"
-				},
-				"raw": {
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.raw.markdown"
-						},
-						"3": {
-							"name": "punctuation.definition.raw.markdown"
-						}
-					},
-					"match": "(`+)([^`]|(?!(?<!`)\\1(?!`))`)*+(\\1)",
-					"name": "markup.inline.raw.string.markdown"
-				},
 				"fenced_code_block_css": {
 					"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(css|css.erb)(\\s+[^`~]*)?$)",
 					"name": "markup.fenced_code.block.markdown",
@@ -1142,7 +521,7 @@
 									"include": "text.html.basic"
 								},
 								{
-									"include": "text.html.php#language"
+									"include": "source.php"
 								}
 							]
 						}
@@ -2269,10 +1648,626 @@
 							]
 						}
 					]
+				},
+				"fenced_code_block_unknown": {
+					"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?=([^`~]*)?$)",
+					"beginCaptures": {
+						"3": {
+							"name": "punctuation.definition.markdown"
+						},
+						"4": {
+							"name": "fenced_code.block.language"
+						}
+					},
+					"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
+					"endCaptures": {
+						"3": {
+							"name": "punctuation.definition.markdown"
+						}
+					},
+					"name": "markup.fenced_code.block.markdown"
+				},
+				"heading": {
+					"begin": "(?:^|\\G)[ ]{0,3}(#{1,6})\\s*(?=[\\S[^#]])",
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.heading.markdown"
+						}
+					},
+					"contentName": "entity.name.section.markdown",
+					"end": "\\s*(#{1,6})?$\\n?",
+					"name": "markup.heading.markdown",
+					"patterns": [
+						{
+							"include": "#inline"
+						}
+					]
+				},
+				"heading-setext": {
+					"patterns": [
+						{
+							"match": "^(={3,})(?=[ \\t]*$\\n?)",
+							"name": "markup.heading.setext.1.markdown"
+						},
+						{
+							"match": "^(-{3,})(?=[ \\t]*$\\n?)",
+							"name": "markup.heading.setext.2.markdown"
+						}
+					]
+				},
+				"html": {
+					"patterns": [
+						{
+							"begin": "(^|\\G)\\s*(<!--)",
+							"captures": {
+								"1": {
+									"name": "punctuation.definition.comment.html"
+								},
+								"2": {
+									"name": "punctuation.definition.comment.html"
+								}
+							},
+							"end": "(-->)",
+							"name": "comment.block.html"
+						},
+						{
+							"begin": "(^|\\G)\\s*(?=<(script|style|pre)(\\s|$|>)(?!.*?</(script|style|pre)>))",
+							"end": "(?=.*</(script|style|pre)>)",
+							"patterns": [
+								{
+									"begin": "(\\s*|$)",
+									"patterns": [
+										{
+											"include": "text.html.basic"
+										}
+									],
+									"while": "^(?!.*</(script|style|pre)>)"
+								}
+							]
+						},
+						{
+							"begin": "(^|\\G)\\s*(?=</?(address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h1|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul)(\\s|$|/?>))",
+							"patterns": [
+								{
+									"include": "text.html.basic"
+								}
+							],
+							"while": "^(?!\\s*$)"
+						},
+						{
+							"begin": "(^|\\G)\\s*(?=(<[a-zA-Z0-9\\-](/?>|\\s.*?>)|</[a-zA-Z0-9\\-]>)\\s*$)",
+							"patterns": [
+								{
+									"include": "text.html.basic"
+								}
+							],
+							"while": "^(?!\\s*$)"
+						}
+					]
+				},
+				"link-def": {
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.constant.markdown"
+						},
+						"2": {
+							"name": "constant.other.reference.link.markdown"
+						},
+						"3": {
+							"name": "punctuation.definition.constant.markdown"
+						},
+						"4": {
+							"name": "punctuation.separator.key-value.markdown"
+						},
+						"5": {
+							"name": "punctuation.definition.link.markdown"
+						},
+						"6": {
+							"name": "markup.underline.link.markdown"
+						},
+						"7": {
+							"name": "punctuation.definition.link.markdown"
+						},
+						"8": {
+							"name": "string.other.link.description.title.markdown"
+						},
+						"9": {
+							"name": "punctuation.definition.string.begin.markdown"
+						},
+						"10": {
+							"name": "punctuation.definition.string.end.markdown"
+						},
+						"11": {
+							"name": "string.other.link.description.title.markdown"
+						},
+						"12": {
+							"name": "punctuation.definition.string.begin.markdown"
+						},
+						"13": {
+							"name": "punctuation.definition.string.end.markdown"
+						}
+					},
+					"match": "^(?x:\n  \\s*\t\t\t\t\t\t# Leading whitespace\n  (\\[)(.+?)(\\])(:)\t\t# Reference name\n  [ \\t]*\t\t\t\t\t# Optional whitespace\n  (<?)(\\S+?)(>?)\t\t\t# The url\n  [ \\t]*\t\t\t\t\t# Optional whitespace\n  (?:\n      ((\\().+?(\\)))\t\t# Match title in quotes…\n    | ((\").+?(\"))\t\t# or in parens.\n  )?\t\t\t\t\t\t# Title is optional\n  \\s*\t\t\t\t\t\t# Optional whitespace\n  $\n)\n",
+					"name": "meta.link.reference.def.markdown"
+				},
+				"list_paragraph": {
+					"begin": "(^|\\G)(?=\\S)(?![*+->]\\s|[0-9]+\\.\\s)",
+					"name": "meta.paragraph.markdown",
+					"patterns": [
+						{
+							"include": "#inline"
+						},
+						{
+							"include": "text.html.basic"
+						},
+						{
+							"include": "#heading-setext"
+						}
+					],
+					"while": "(^|\\G)(?!\\s*$|#|[ ]{0,3}([-*_>][ ]{2,}){3,}[ \\t]*$\\n?|[ ]{0,3}[*+->]|[ ]{0,3}[0-9]+\\.)"
+				},
+				"lists": {
+					"patterns": [
+						{
+							"begin": "(^|\\G)([ ]{0,3})([*+-])([ ]{1,3}|\\t)",
+							"beginCaptures": {
+								"3": {
+									"name": "beginning.punctuation.definition.list.markdown"
+								}
+							},
+							"comment": "Currently does not support un-indented second lines.",
+							"name": "markup.list.unnumbered.markdown",
+							"patterns": [
+								{
+									"include": "#block"
+								},
+								{
+									"include": "#list_paragraph"
+								}
+							],
+							"while": "((^|\\G)([ ]{4}|\\t))|(^[ \\t]*$)"
+						},
+						{
+							"begin": "(^|\\G)([ ]{0,3})([0-9]+\\.)([ ]{1,3}|\\t)",
+							"beginCaptures": {
+								"3": {
+									"name": "beginning.punctuation.definition.list.markdown"
+								}
+							},
+							"name": "markup.list.numbered.markdown",
+							"patterns": [
+								{
+									"include": "#block"
+								},
+								{
+									"include": "#list_paragraph"
+								}
+							],
+							"while": "((^|\\G)([ ]{4}|\\t))|(^[ \\t]*$)"
+						}
+					]
+				},
+				"paragraph": {
+					"begin": "(^|\\G)[ ]{0,3}(?=\\S)",
+					"name": "meta.paragraph.markdown",
+					"patterns": [
+						{
+							"include": "#inline"
+						},
+						{
+							"include": "text.html.basic"
+						},
+						{
+							"include": "#heading-setext"
+						}
+					],
+					"while": "(^|\\G)((?=\\s*[-=]{3,}\\s*$)|[ ]{4,}(?=\\S))"
+				},
+				"raw_block": {
+					"begin": "(^|\\G)([ ]{4}|\\t)",
+					"name": "markup.raw.block.markdown",
+					"while": "(^|\\G)([ ]{4}|\\t)"
+				},
+				"separator": {
+					"match": "(^|\\G)[ ]{0,3}([*-_])([ ]{0,2}\\2){2,}[ \\t]*$\\n?",
+					"name": "meta.separator.markdown"
+				}
+			}
+		},
+		"frontMatter": {
+			"begin": "\\A-{3}\\s*$",
+			"contentName": "meta.embedded.block.frontmatter",
+			"patterns": [
+				{
+					"include": "source.yaml"
+				}
+			],
+			"while": "^(?!(-{3}|\\.{3})\\s*$)"
+		},
+		"inline": {
+			"patterns": [
+				{
+					"include": "#ampersand"
+				},
+				{
+					"include": "#bracket"
+				},
+				{
+					"include": "#bold"
+				},
+				{
+					"include": "#italic"
+				},
+				{
+					"include": "#raw"
+				},
+				{
+					"include": "#escape"
+				},
+				{
+					"include": "#image-inline"
+				},
+				{
+					"include": "#image-ref"
+				},
+				{
+					"include": "#link-email"
+				},
+				{
+					"include": "#link-inet"
+				},
+				{
+					"include": "#link-inline"
+				},
+				{
+					"include": "#link-ref"
+				},
+				{
+					"include": "#link-ref-literal"
+				}
+			],
+			"repository": {
+				"ampersand": {
+					"comment": "Markdown will convert this for us. We match it so that the HTML grammar will not mark it up as invalid.",
+					"match": "&(?!([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+);)",
+					"name": "meta.other.valid-ampersand.markdown"
+				},
+				"bold": {
+					"begin": "(?x)\n (\\*\\*|__)(?=\\S)\t\t\t\t\t\t\t\t# Open\n (?=\n   (\n     <[^>]*+>\t\t\t\t\t\t\t# HTML tags\n     | (?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>\n                       # Raw\n     | \\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+\t\t\t# Escapes\n     | \\[\n     (\n         (?<square>\t\t\t\t\t# Named group\n           [^\\[\\]\\\\]\t\t\t\t# Match most chars\n           | \\\\.\t\t\t\t\t\t# Escaped chars\n           | \\[ \\g<square>*+ \\]\t\t# Nested brackets\n         )*+\n       \\]\n       (\n         (\t\t\t\t\t\t\t# Reference Link\n           [ ]?\t\t\t\t\t# Optional space\n           \\[[^\\]]*+\\]\t\t\t\t# Ref name\n         )\n         | (\t\t\t\t\t\t\t# Inline Link\n           \\(\t\t\t\t\t\t# Opening paren\n             [ \\t]*+\t\t\t\t# Optional whitespace\n             <?(.*?)>?\t\t\t# URL\n             [ \\t]*+\t\t\t\t# Optional whitespace\n             (\t\t\t\t\t# Optional Title\n               (?<title>['\"])\n               (.*?)\n               \\k<title>\n             )?\n           \\)\n         )\n       )\n     )\n     | (?!(?<=\\S)\\1).\t\t\t\t\t\t# Everything besides\n                       # style closer\n   )++\n   (?<=\\S)\\1\t\t\t\t\t\t\t\t# Close\n )\n",
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.bold.markdown"
+						}
+					},
+					"end": "(?<=\\S)(\\1)",
+					"name": "markup.bold.markdown",
+					"patterns": [
+						{
+							"applyEndPatternLast": 1,
+							"begin": "(?=<[^>]*?>)",
+							"end": "(?<=>)",
+							"patterns": [
+								{
+									"include": "text.html.basic"
+								}
+							]
+						},
+						{
+							"include": "#escape"
+						},
+						{
+							"include": "#ampersand"
+						},
+						{
+							"include": "#bracket"
+						},
+						{
+							"include": "#raw"
+						},
+						{
+							"include": "#bold"
+						},
+						{
+							"include": "#italic"
+						},
+						{
+							"include": "#image-inline"
+						},
+						{
+							"include": "#link-inline"
+						},
+						{
+							"include": "#link-inet"
+						},
+						{
+							"include": "#link-email"
+						},
+						{
+							"include": "#image-ref"
+						},
+						{
+							"include": "#link-ref-literal"
+						},
+						{
+							"include": "#link-ref"
+						}
+					]
+				},
+				"bracket": {
+					"comment": "Markdown will convert this for us. We match it so that the HTML grammar will not mark it up as invalid.",
+					"match": "<(?![a-z/?\\$!])",
+					"name": "meta.other.valid-bracket.markdown"
+				},
+				"escape": {
+					"match": "\\\\[-`*_#+.!(){}\\[\\]\\\\>]",
+					"name": "constant.character.escape.markdown"
+				},
+				"image-inline": {
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.string.begin.markdown"
+						},
+						"2": {
+							"name": "string.other.link.description.markdown"
+						},
+						"4": {
+							"name": "punctuation.definition.string.end.markdown"
+						},
+						"5": {
+							"name": "punctuation.definition.metadata.markdown"
+						},
+						"6": {
+							"name": "punctuation.definition.link.markdown"
+						},
+						"7": {
+							"name": "markup.underline.link.image.markdown"
+						},
+						"8": {
+							"name": "punctuation.definition.link.markdown"
+						},
+						"9": {
+							"name": "string.other.link.description.title.markdown"
+						},
+						"10": {
+							"name": "punctuation.definition.string.markdown"
+						},
+						"11": {
+							"name": "punctuation.definition.string.markdown"
+						},
+						"12": {
+							"name": "string.other.link.description.title.markdown"
+						},
+						"13": {
+							"name": "punctuation.definition.string.markdown"
+						},
+						"14": {
+							"name": "punctuation.definition.string.markdown"
+						},
+						"15": {
+							"name": "punctuation.definition.metadata.markdown"
+						}
+					},
+					"match": "(?x:\n  (\\!\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])\n                # Match the link text.\n  (\\()\t\t\t\t\t\t# Opening paren for url\n    (<?)(\\S+?)(>?)\t\t\t# The url\n    [ \\t]*\t\t\t\t\t# Optional whitespace\n    (?:\n        ((\\().+?(\\)))\t\t# Match title in parens…\n      | ((\").+?(\"))\t\t# or in quotes.\n    )?\t\t\t\t\t\t# Title is optional\n    \\s*\t\t\t\t\t\t# Optional whitespace\n  (\\))\n)\n",
+					"name": "meta.image.inline.markdown"
+				},
+				"image-ref": {
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.string.begin.markdown"
+						},
+						"2": {
+							"name": "string.other.link.description.markdown"
+						},
+						"4": {
+							"name": "punctuation.definition.string.begin.markdown"
+						},
+						"5": {
+							"name": "punctuation.definition.constant.markdown"
+						},
+						"6": {
+							"name": "constant.other.reference.link.markdown"
+						},
+						"7": {
+							"name": "punctuation.definition.constant.markdown"
+						}
+					},
+					"match": "(\\!\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])[ ]?(\\[)(.*?)(\\])",
+					"name": "meta.image.reference.markdown"
+				},
+				"italic": {
+					"begin": "(?x) (\\*\\b|\\b_)(?=\\S)\t\t\t\t\t\t\t\t# Open\n  (?=\n    (\n      <[^>]*+>\t\t\t\t\t\t\t# HTML tags\n      | (?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>\n                        # Raw\n      | \\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+\t\t\t# Escapes\n      | \\[\n      (\n          (?<square>\t\t\t\t\t# Named group\n            [^\\[\\]\\\\]\t\t\t\t# Match most chars\n            | \\\\.\t\t\t\t\t\t# Escaped chars\n            | \\[ \\g<square>*+ \\]\t\t# Nested brackets\n          )*+\n        \\]\n        (\n          (\t\t\t\t\t\t\t# Reference Link\n            [ ]?\t\t\t\t\t# Optional space\n            \\[[^\\]]*+\\]\t\t\t\t# Ref name\n          )\n          | (\t\t\t\t\t\t\t# Inline Link\n            \\(\t\t\t\t\t\t# Opening paren\n              [ \\t]*+\t\t\t\t# Optional whtiespace\n              <?(.*?)>?\t\t\t# URL\n              [ \\t]*+\t\t\t\t# Optional whtiespace\n              (\t\t\t\t\t# Optional Title\n                (?<title>['\"])\n                (.*?)\n                \\k<title>\n              )?\n            \\)\n          )\n        )\n      )\n      | \\1\\1\t\t\t\t\t\t\t\t# Must be bold closer\n      | (?!(?<=\\S)\\1).\t\t\t\t\t\t# Everything besides\n                        # style closer\n    )++\n    (?<=\\S)\\1\t\t\t\t\t\t\t\t# Close\n  )\n",
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.italic.markdown"
+						}
+					},
+					"end": "(?<=\\S)(\\1)((?!\\1)|(?=\\1\\1))",
+					"name": "markup.italic.markdown",
+					"patterns": [
+						{
+							"applyEndPatternLast": 1,
+							"begin": "(?=<[^>]*?>)",
+							"end": "(?<=>)",
+							"patterns": [
+								{
+									"include": "text.html.basic"
+								}
+							]
+						},
+						{
+							"include": "#escape"
+						},
+						{
+							"include": "#ampersand"
+						},
+						{
+							"include": "#bracket"
+						},
+						{
+							"include": "#raw"
+						},
+						{
+							"include": "#bold"
+						},
+						{
+							"include": "#image-inline"
+						},
+						{
+							"include": "#link-inline"
+						},
+						{
+							"include": "#link-inet"
+						},
+						{
+							"include": "#link-email"
+						},
+						{
+							"include": "#image-ref"
+						},
+						{
+							"include": "#link-ref-literal"
+						},
+						{
+							"include": "#link-ref"
+						}
+					]
+				},
+				"link-email": {
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.link.markdown"
+						},
+						"2": {
+							"name": "markup.underline.link.markdown"
+						},
+						"4": {
+							"name": "punctuation.definition.link.markdown"
+						}
+					},
+					"match": "(<)((?:mailto:)?[-.\\w]+@[-a-z0-9]+(\\.[-a-z0-9]+)*\\.[a-z]+)(>)",
+					"name": "meta.link.email.lt-gt.markdown"
+				},
+				"link-inet": {
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.link.markdown"
+						},
+						"2": {
+							"name": "markup.underline.link.markdown"
+						},
+						"3": {
+							"name": "punctuation.definition.link.markdown"
+						}
+					},
+					"match": "(<)((?:https?|ftp)://.*?)(>)",
+					"name": "meta.link.inet.markdown"
+				},
+				"link-inline": {
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.string.begin.markdown"
+						},
+						"2": {
+							"name": "string.other.link.title.markdown"
+						},
+						"4": {
+							"name": "punctuation.definition.string.end.markdown"
+						},
+						"5": {
+							"name": "punctuation.definition.metadata.markdown"
+						},
+						"6": {
+							"name": "punctuation.definition.link.markdown"
+						},
+						"7": {
+							"name": "markup.underline.link.markdown"
+						},
+						"8": {
+							"name": "punctuation.definition.link.markdown"
+						},
+						"9": {
+							"name": "string.other.link.description.title.markdown"
+						},
+						"10": {
+							"name": "punctuation.definition.string.begin.markdown"
+						},
+						"11": {
+							"name": "punctuation.definition.string.end.markdown"
+						},
+						"12": {
+							"name": "string.other.link.description.title.markdown"
+						},
+						"13": {
+							"name": "punctuation.definition.string.begin.markdown"
+						},
+						"14": {
+							"name": "punctuation.definition.string.end.markdown"
+						},
+						"15": {
+							"name": "punctuation.definition.metadata.markdown"
+						}
+					},
+					"match": "(?x:\n    (\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])\n                  # Match the link text.\n    (\\()\t\t\t\t\t\t# Opening paren for url\n      (<?)(.*?)(>?)\t\t\t# The url\n      [ \\t]*\t\t\t\t\t# Optional whitespace\n      (?:\n          ((\\().+?(\\)))\t\t# Match title in parens…\n        | ((\").+?(\"))\t\t# or in quotes.\n      )?\t\t\t\t\t\t# Title is optional\n      \\s*\t\t\t\t\t\t# Optional whitespace\n    (\\))\n  )\n",
+					"name": "meta.link.inline.markdown"
+				},
+				"link-ref": {
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.string.begin.markdown"
+						},
+						"2": {
+							"name": "string.other.link.title.markdown"
+						},
+						"4": {
+							"name": "punctuation.definition.string.end.markdown"
+						},
+						"5": {
+							"name": "punctuation.definition.constant.begin.markdown"
+						},
+						"6": {
+							"name": "constant.other.reference.link.markdown"
+						},
+						"7": {
+							"name": "punctuation.definition.constant.end.markdown"
+						}
+					},
+					"match": "(\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])(\\[)([^\\]]*+)(\\])",
+					"name": "meta.link.reference.markdown"
+				},
+				"link-ref-literal": {
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.string.begin.markdown"
+						},
+						"2": {
+							"name": "string.other.link.title.markdown"
+						},
+						"4": {
+							"name": "punctuation.definition.string.end.markdown"
+						},
+						"5": {
+							"name": "punctuation.definition.constant.begin.markdown"
+						},
+						"6": {
+							"name": "punctuation.definition.constant.end.markdown"
+						}
+					},
+					"match": "(\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])[ ]?(\\[)(\\])",
+					"name": "meta.link.reference.literal.markdown"
+				},
+				"raw": {
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.raw.markdown"
+						},
+						"3": {
+							"name": "punctuation.definition.raw.markdown"
+						}
+					},
+					"match": "(`+)([^`]|(?!(?<!`)\\1(?!`))`)*+(\\1)",
+					"name": "markup.inline.raw.string.markdown"
 				}
 			}
 		}
-	},
-	"scopeName": "text.html.markdown",
-	"uuid": "0A1D9874-B448-11D9-BD50-000D93B6E43C"
+	}
 }
\ No newline at end of file
diff --git a/extensions/markdown/yarn.lock b/extensions/markdown/yarn.lock
index b1a04b4154c..6a725e5ec59 100644
--- a/extensions/markdown/yarn.lock
+++ b/extensions/markdown/yarn.lock
@@ -1743,9 +1743,9 @@ vinyl@~2.0.1:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
-vscode-extension-telemetry@^0.0.11:
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.11.tgz#f2dde487f01d2b079f55ab47a0247f5a772c4e06"
+vscode-extension-telemetry@^0.0.13:
+  version "0.0.13"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.13.tgz#8a4438cbb0a9f9f8ad65479e4ec08683aa4de0f7"
   dependencies:
     applicationinsights "1.0.1"
 
diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json
index 146b7fd061a..cd4de32ff61 100644
--- a/extensions/merge-conflict/package.json
+++ b/extensions/merge-conflict/package.json
@@ -99,7 +99,7 @@
     }
   },
   "dependencies": {
-    "vscode-extension-telemetry": "0.0.11",
+    "vscode-extension-telemetry": "0.0.13",
     "vscode-nls": "^3.2.1"
   },
   "devDependencies": {
diff --git a/extensions/merge-conflict/yarn.lock b/extensions/merge-conflict/yarn.lock
index 74ebd7c4fcf..30b8b37fab8 100644
--- a/extensions/merge-conflict/yarn.lock
+++ b/extensions/merge-conflict/yarn.lock
@@ -28,9 +28,9 @@ semver@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
-vscode-extension-telemetry@0.0.11:
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.11.tgz#f2dde487f01d2b079f55ab47a0247f5a772c4e06"
+vscode-extension-telemetry@0.0.13:
+  version "0.0.13"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.13.tgz#8a4438cbb0a9f9f8ad65479e4ec08683aa4de0f7"
   dependencies:
     applicationinsights "1.0.1"
 
diff --git a/extensions/npm/README.md b/extensions/npm/README.md
new file mode 100644
index 00000000000..4bca043bc4a
--- /dev/null
+++ b/extensions/npm/README.md
@@ -0,0 +1,13 @@
+# Node npm
+
+**Notice** This is a an extension that is bundled with Visual Studio Code. 
+
+This extension supports running npm scripts defined in the `package.json` as [tasks](https://code.visualstudio.com/docs/editor/tasks). Scripts with the name 'build', 'compile', or 'watch'
+are treated as build tasks.
+
+To run scripts as tasks you use the `Tasks` menu.
+
+## Settings
+- `npm.autoDetect` enable detecting scripts as tasks, the default is `on`.
+- `npm.runSilent` run npm script with the `--silent` option, the default is `false`.
+- `npm.packageManager` the package manager used to run the scripts: `npm` or `yarn`, the default is `npm`.
diff --git a/extensions/npm/images/npm_icon.png b/extensions/npm/images/npm_icon.png
new file mode 100644
index 00000000000..f7f18b560ee
Binary files /dev/null and b/extensions/npm/images/npm_icon.png differ
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index f8e04312c27..be884ffe538 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -1,12 +1,13 @@
 {
   "name": "npm",
   "publisher": "vscode",
-  "description": "Extension to add task support for npm scripts.",
-  "displayName": "Npm support for VSCode",
+  "displayName": "%displayName%",
+	"description": "%description%",
   "version": "0.0.1",
   "engines": {
     "vscode": "0.10.x"
   },
+  "icon": "images/npm_icon.png",
   "categories": [
     "Other"
   ],
diff --git a/extensions/npm/package.nls.json b/extensions/npm/package.nls.json
index 3f537686a6c..211b7768501 100644
--- a/extensions/npm/package.nls.json
+++ b/extensions/npm/package.nls.json
@@ -1,4 +1,6 @@
 {
+	"description": "Extension to add task support for npm scripts.",
+	"displayName": "Npm support for VSCode",
 	"config.npm.autoDetect": "Controls whether auto detection of npm scripts is on or off. Default is on.",
 	"config.npm.runSilent": "Run npm commands with the `--silent` option.",
 	"config.npm.packageManager": "The package manager used to run scripts.",
diff --git a/extensions/objective-c/package.json b/extensions/objective-c/package.json
index 0a5125c3273..a391a6c8394 100644
--- a/extensions/objective-c/package.json
+++ b/extensions/objective-c/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "objective-c",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": {
diff --git a/extensions/objective-c/package.nls.json b/extensions/objective-c/package.nls.json
new file mode 100644
index 00000000000..370c032a469
--- /dev/null
+++ b/extensions/objective-c/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Objective-C Language Features",
+	"description": "Provides Syntax highlighting,Bracket matching and other language features in Objective-C files"
+}
\ No newline at end of file
diff --git a/extensions/objective-c/syntaxes/objective-c++.tmLanguage.json b/extensions/objective-c/syntaxes/objective-c++.tmLanguage.json
index 82ee0f572d3..bd24c9f0ddf 100644
--- a/extensions/objective-c/syntaxes/objective-c++.tmLanguage.json
+++ b/extensions/objective-c/syntaxes/objective-c++.tmLanguage.json
@@ -5,13 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/atom/language-objective-c/commit/7fdf0c40ec1d592a902ed6a7cf5565bdf12e2ae8",
-	"scopeName": "source.objcpp",
-	"fileTypes": [
-		"mm",
-		"M",
-		"h"
-	],
 	"name": "Objective-C++",
+	"scopeName": "source.objcpp",
 	"patterns": [
 		{
 			"include": "source.cpp"
diff --git a/extensions/objective-c/syntaxes/objective-c.tmLanguage.json b/extensions/objective-c/syntaxes/objective-c.tmLanguage.json
index 8ebc5c8a136..b88ebab9eb8 100644
--- a/extensions/objective-c/syntaxes/objective-c.tmLanguage.json
+++ b/extensions/objective-c/syntaxes/objective-c.tmLanguage.json
@@ -5,16 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/atom/language-objective-c/commit/0727e04544f3414c1c339cf15a39a05ea3938cb4",
-	"scopeName": "source.objc",
-	"fileTypes": [
-		"m",
-		"h",
-		"pch",
-		"x",
-		"xm",
-		"xmi"
-	],
 	"name": "Objective-C",
+	"scopeName": "source.objc",
 	"patterns": [
 		{
 			"begin": "((@)(interface|protocol))(?!.+;)\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*((:)(?:\\s*)([A-Za-z][A-Za-z0-9]*))?(\\s|\\n)?",
diff --git a/extensions/perl/package.json b/extensions/perl/package.json
index 9197f588182..1044186d5ae 100644
--- a/extensions/perl/package.json
+++ b/extensions/perl/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "perl",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/perl/package.nls.json b/extensions/perl/package.nls.json
new file mode 100644
index 00000000000..e7324aaa990
--- /dev/null
+++ b/extensions/perl/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Perl Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching and other language features in Perl files"
+}
\ No newline at end of file
diff --git a/extensions/perl/syntaxes/perl.tmLanguage.json b/extensions/perl/syntaxes/perl.tmLanguage.json
index 0564d961110..dc4ceb07b1e 100644
--- a/extensions/perl/syntaxes/perl.tmLanguage.json
+++ b/extensions/perl/syntaxes/perl.tmLanguage.json
@@ -5,19 +5,9 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/textmate/perl.tmbundle/commit/c0b7a4bd65882380522d82a60b536479a62b07c3",
-	"comment": "\n\tTODO:\tInclude RegExp syntax\n",
-	"fileTypes": [
-		"pl",
-		"pm",
-		"pod",
-		"t",
-		"PL",
-		"psgi",
-		"vcl"
-	],
-	"firstLineMatch": "(?x)\n# Hashbang\n^\\#!.*(?:\\s|\\/|(?<=!)\\b)perl(?:$|\\s)\n|\n# Modeline\n(?i:\n  # Emacs\n  -\\*-(?:(?:(?!mode\\s*:)[^:;]+:[^:;]+;)*\\s*mode\\s*:)?\\s*\n\tperl\n  \\s*(?:;[^:;]+:[^:;]+?)*;?\\s*-\\*-\n  |\n  # Vim\n  (?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|(?!^)\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n\tperl\n  (?=\\s|:|$)\n)",
-	"keyEquivalent": "^~P",
 	"name": "Perl",
+	"scopeName": "source.perl",
+	"comment": "\n\tTODO:\tInclude RegExp syntax\n",
 	"patterns": [
 		{
 			"include": "#line_comment"
@@ -2545,7 +2535,5 @@
 				}
 			]
 		}
-	},
-	"scopeName": "source.perl",
-	"uuid": "EDBFE125-6B1C-11D9-9189-000D93589AF6"
+	}
 }
\ No newline at end of file
diff --git a/extensions/perl/syntaxes/perl6.tmLanguage.json b/extensions/perl/syntaxes/perl6.tmLanguage.json
index 109dc422363..89c69ebe79b 100644
--- a/extensions/perl/syntaxes/perl6.tmLanguage.json
+++ b/extensions/perl/syntaxes/perl6.tmLanguage.json
@@ -5,15 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/textmate/perl.tmbundle/commit/d9841a0878239fa43f88c640f8d458590f97e8f5",
-	"fileTypes": [
-		"p6",
-		"pl6",
-		"pm6",
-		"nqp"
-	],
-	"firstLineMatch": "(?x)\n# Hashbang\n^\\#!.*(?:\\s|\\/|(?<=!)\\b)(?:perl6|nqp)(?:$|\\s)\n|\n# Perl 6 pragma\n\\buse\\s+v6\\b\n|\n# Modeline\n(?i:\n  # Emacs\n  -\\*-(?:(?:(?!mode\\s*:)[^:;]+:[^:;]+;)*\\s*mode\\s*:)?\\s*\n\tperl6\n  \\s*(?:;[^:;]+:[^:;]+?)*;?\\s*-\\*-\n  |\n  # Vim\n  (?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|(?!^)\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n\tperl6\n  (?=\\s|:|$)\n)",
-	"keyEquivalent": "^~P",
 	"name": "Perl 6",
+	"scopeName": "source.perl.6",
 	"patterns": [
 		{
 			"begin": "^=begin",
@@ -318,7 +311,5 @@
 				}
 			]
 		}
-	},
-	"scopeName": "source.perl.6",
-	"uuid": "E685440C-0E20-4424-9693-864D5240A269"
+	}
 }
\ No newline at end of file
diff --git a/extensions/php/syntaxes/html.tmLanguage.json b/extensions/php/syntaxes/html.tmLanguage.json
index 747d39b1d0d..1ed6de8d2c9 100644
--- a/extensions/php/syntaxes/html.tmLanguage.json
+++ b/extensions/php/syntaxes/html.tmLanguage.json
@@ -5,26 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/atom/language-php/commit/29c140e1531e0b5e842e5bfd4377f879d8b79cd4",
-	"scopeName": "text.html.php",
 	"name": "PHP",
-	"fileTypes": [
-		"aw",
-		"ctp",
-		"inc",
-		"install",
-		"module",
-		"php",
-		"php_cs",
-		"php3",
-		"php4",
-		"php5",
-		"phpt",
-		"phtml",
-		"profile"
-	],
-	"firstLineMatch": "(?x)\n# Hashbang\n^\\#!.*(?:\\s|\\/)\n  php\\d?\n(?:$|\\s)\n|\n# Modeline\n(?i:\n  # Emacs\n  -\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n    php\n  (?=[\\s;]|(?<![-*])-\\*-).*?-\\*-\n  |\n  # Vim\n  (?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n    (?:php|phtml)\n  (?=\\s|:|$)\n)\n|\n# Regular opening PHP tags\n^\\s*<\\?(?i:php|=|\\s|$)",
-	"foldingStartMarker": "(/\\*|\\{\\s*$|<<<HTML)",
-	"foldingStopMarker": "(\\*/|^\\s*\\}|^HTML;)",
+	"scopeName": "text.html.php",
 	"injections": {
 		"text.html.php - (meta.embedded | meta.tag), L:text.html.php meta.tag, L:text.html.php source.js": {
 			"patterns": [
diff --git a/extensions/powershell/package.json b/extensions/powershell/package.json
index c53e476238b..82b93077a48 100644
--- a/extensions/powershell/package.json
+++ b/extensions/powershell/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "powershell",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/powershell/package.nls.json b/extensions/powershell/package.nls.json
new file mode 100644
index 00000000000..19a93bf4c94
--- /dev/null
+++ b/extensions/powershell/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Powershell Language Features",
+	"description": "Provides Syntax highlighting, Folding, Bracket matching, Snippets and other language features in Powershell files"
+}
\ No newline at end of file
diff --git a/extensions/powershell/syntaxes/powershell.tmLanguage.json b/extensions/powershell/syntaxes/powershell.tmLanguage.json
index d6be0473f78..46eacb336a9 100644
--- a/extensions/powershell/syntaxes/powershell.tmLanguage.json
+++ b/extensions/powershell/syntaxes/powershell.tmLanguage.json
@@ -5,12 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/PowerShell/EditorSyntax/commit/d605150f48952ba4bd28d7b389e97adc1a5d9b76",
-	"fileTypes": [
-		"ps1",
-		"psm1",
-		"psd1"
-	],
 	"name": "PowerShell",
+	"scopeName": "source.powershell",
 	"patterns": [
 		{
 			"begin": "(--%)",
@@ -1064,7 +1060,5 @@
 				}
 			]
 		}
-	},
-	"scopeName": "source.powershell",
-	"uuid": "f8f5ffb0-503e-11df-9879-0800200c9a66"
+	}
 }
\ No newline at end of file
diff --git a/extensions/pug/package.json b/extensions/pug/package.json
index 2d80e2c46d0..81c1b46d907 100644
--- a/extensions/pug/package.json
+++ b/extensions/pug/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "pug",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/pug/package.nls.json b/extensions/pug/package.nls.json
new file mode 100644
index 00000000000..9c42fef1f1c
--- /dev/null
+++ b/extensions/pug/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Pug Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching and other language features in Pug files"
+}
\ No newline at end of file
diff --git a/extensions/pug/syntaxes/pug.tmLanguage.json b/extensions/pug/syntaxes/pug.tmLanguage.json
index 5d5a3db110c..cff09cd9a37 100644
--- a/extensions/pug/syntaxes/pug.tmLanguage.json
+++ b/extensions/pug/syntaxes/pug.tmLanguage.json
@@ -5,10 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/davidrios/jade-tmbundle/commit/f311a516bb29296fcebfdc7da8149b1c79dfb0a1",
-	"fileTypes": [
-		"jade"
-	],
 	"name": "Jade",
+	"scopeName": "text.jade",
 	"patterns": [
 		{
 			"comment": "Doctype declaration.",
@@ -985,7 +983,5 @@
 				}
 			]
 		}
-	},
-	"scopeName": "text.jade",
-	"uuid": "eee6ba25-6ac2-4f7e-9c70-cddf2bd3448b"
+	}
 }
\ No newline at end of file
diff --git a/extensions/python/package.json b/extensions/python/package.json
index 49c9d6ace9f..9de1edf11fd 100644
--- a/extensions/python/package.json
+++ b/extensions/python/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "python",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/python/package.nls.json b/extensions/python/package.nls.json
new file mode 100644
index 00000000000..9f4e16e90a0
--- /dev/null
+++ b/extensions/python/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Python Language Features",
+	"description": "Provides Syntax highlighting, Folding, Bracket matching and other language features in Python files"
+}
\ No newline at end of file
diff --git a/extensions/python/syntaxes/MagicPython.tmLanguage.json b/extensions/python/syntaxes/MagicPython.tmLanguage.json
index 812ddf97357..44a995bc046 100644
--- a/extensions/python/syntaxes/MagicPython.tmLanguage.json
+++ b/extensions/python/syntaxes/MagicPython.tmLanguage.json
@@ -7,27 +7,6 @@
 	"version": "https://github.com/MagicStack/MagicPython/commit/b453f26ed856c9b16a053517c41207e3a72cc7d5",
 	"name": "MagicPython",
 	"scopeName": "source.python",
-	"fileTypes": [
-		"py",
-		"py3",
-		"rpy",
-		"pyw",
-		"cpy",
-		"pyi",
-		"SConstruct",
-		"Sconstruct",
-		"sconstruct",
-		"SConscript",
-		"gyp",
-		"gypi",
-		"wsgi",
-		"kv",
-		"Snakefile",
-		"tac"
-	],
-	"first_line_match": "^#![ \\t]*/.*\\bpython[\\d\\.]*\\b",
-	"firstLineMatch": "^#![ \\t]*/.*\\bpython[\\d\\.]*\\b",
-	"uuid": "742deb57-6e38-4192-bed6-410746efd85d",
 	"patterns": [
 		{
 			"include": "#statement"
diff --git a/extensions/python/syntaxes/MagicRegExp.tmLanguage.json b/extensions/python/syntaxes/MagicRegExp.tmLanguage.json
index 0de066f3677..c7e67436a08 100644
--- a/extensions/python/syntaxes/MagicRegExp.tmLanguage.json
+++ b/extensions/python/syntaxes/MagicRegExp.tmLanguage.json
@@ -7,10 +7,6 @@
 	"version": "https://github.com/MagicStack/MagicPython/commit/361a4964a559481330764a447e7bab88d4f1b01b",
 	"name": "MagicRegExp",
 	"scopeName": "source.regexp.python",
-	"fileTypes": [
-		"re"
-	],
-	"uuid": "39e15186-71e6-11e5-b82c-7c6d62900c7c",
 	"patterns": [
 		{
 			"include": "#regexp-expression"
diff --git a/extensions/r/package.json b/extensions/r/package.json
index 96f89e8c67b..7a983f52899 100644
--- a/extensions/r/package.json
+++ b/extensions/r/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "r",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/r/package.nls.json b/extensions/r/package.nls.json
new file mode 100644
index 00000000000..157646f7eb4
--- /dev/null
+++ b/extensions/r/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "R Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching and other language features in R files"
+}
\ No newline at end of file
diff --git a/extensions/r/syntaxes/r.tmLanguage.json b/extensions/r/syntaxes/r.tmLanguage.json
index 38ce48074cb..d9d295d626f 100644
--- a/extensions/r/syntaxes/r.tmLanguage.json
+++ b/extensions/r/syntaxes/r.tmLanguage.json
@@ -5,17 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/Ikuyadeu/vscode-R/commit/b3ef459a3999160d97ea28f4754fda810417f99f",
-	"fileTypes": [
-		"R",
-		"r",
-		"S",
-		"s",
-		"Rprofile"
-	],
-	"foldingStartMarker": "(\\(\\s*$|\\{\\s*$)",
-	"foldingStopMarker": "(^\\s*\\)|^\\s*\\})",
-	"keyEquivalent": "^~R",
 	"name": "R",
+	"scopeName": "source.r",
 	"patterns": [
 		{
 			"include": "#roxygen"
@@ -549,7 +540,5 @@
 				}
 			]
 		}
-	},
-	"scopeName": "source.r",
-	"uuid": "B2E6B78D-6E70-11D9-A369-000D93B3A10A"
+	}
 }
\ No newline at end of file
diff --git a/extensions/razor/package.json b/extensions/razor/package.json
index 5aa758a9f55..abbde5ab157 100644
--- a/extensions/razor/package.json
+++ b/extensions/razor/package.json
@@ -1,5 +1,7 @@
 {
-  "name": "razor",
+	"name": "razor",
+	"displayName": "%displayName%",
+	"description": "%description%",
   "version": "0.1.0",
   "publisher": "vscode",
   "engines": {
diff --git a/extensions/razor/package.nls.json b/extensions/razor/package.nls.json
new file mode 100644
index 00000000000..67985cc0413
--- /dev/null
+++ b/extensions/razor/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Razor Language Features",
+	"description": "Provides Syntax highlighting, Folding, Bracket matching and other language features in Razor files"
+}
\ No newline at end of file
diff --git a/extensions/razor/syntaxes/cshtml.tmLanguage.json b/extensions/razor/syntaxes/cshtml.tmLanguage.json
index 241e4486800..2995e473ee0 100644
--- a/extensions/razor/syntaxes/cshtml.tmLanguage.json
+++ b/extensions/razor/syntaxes/cshtml.tmLanguage.json
@@ -7,10 +7,6 @@
 	"version": "https://github.com/demyte/language-cshtml/commit/cbf0e35971324e861247145e92f4cbbe0bc42d0e",
 	"name": "ASP.NET Razor",
 	"scopeName": "text.html.cshtml",
-	"fileTypes": [
-		"cshtml",
-		"gohtml"
-	],
 	"patterns": [
 		{
 			"name": "section.embedded.source.cshtml",
diff --git a/extensions/ruby/package.json b/extensions/ruby/package.json
index 43f0d35aaed..0a166b2d8f4 100644
--- a/extensions/ruby/package.json
+++ b/extensions/ruby/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "ruby",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.2.1",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/ruby/package.nls.json b/extensions/ruby/package.nls.json
new file mode 100644
index 00000000000..22f85f2d376
--- /dev/null
+++ b/extensions/ruby/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Ruby Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching and other language features in Ruby files"
+}
\ No newline at end of file
diff --git a/extensions/ruby/syntaxes/ruby.tmLanguage.json b/extensions/ruby/syntaxes/ruby.tmLanguage.json
index 4e11b700132..62fbbc265e5 100644
--- a/extensions/ruby/syntaxes/ruby.tmLanguage.json
+++ b/extensions/ruby/syntaxes/ruby.tmLanguage.json
@@ -5,46 +5,9 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/textmate/ruby.tmbundle/commit/74713556df10fbc7b1f9e99013ab1e34cd836f56",
-	"comment": "\n\tTODO: unresolved issues\n\n\ttext:\n\t\"p <<end\n\tprint me!\n\tend\"\n\tsymptoms:\n\tnot recognized as a heredoc\n\tsolution:\n\tthere is no way to distinguish perfectly between the << operator and the start\n\tof a heredoc. Currently, we require assignment to recognize a heredoc. More\n\trefinement is possible.\n\t• Heredocs with indented terminators (<<-) are always distinguishable, however.\n\t• Nested heredocs are not really supportable at present\n\n\ttext:\n\tprint <<-'THERE' \n\tThis is single quoted. \n\tThe above used #{Time.now} \n\tTHERE \n\tsymtoms:\n\tFrom Programming Ruby p306; should be a non-interpolated heredoc.\n\t\n    text:\n    val?(a):p(b)\n    val?'a':'b'\n    symptoms:\n    ':p' is recognized as a symbol.. its 2 things ':' and 'p'.\n    :'b' has same problem.\n    solution:\n    ternary operator rule, precedence stuff, symbol rule.\n    but also consider 'a.b?(:c)' ??\n",
-	"fileTypes": [
-		"rb",
-		"rbx",
-		"rjs",
-		"Rakefile",
-		"rake",
-		"cgi",
-		"fcgi",
-		"gemspec",
-		"irbrc",
-		"Capfile",
-		"ru",
-		"prawn",
-		"Cheffile",
-		"Guardfile",
-		"Hobofile",
-		"Vagrantfile",
-		".vagrantplugins",
-		"Appraisals",
-		"Rantfile",
-		"Berksfile",
-		"Berksfile.lock",
-		"Thorfile",
-		"Puppetfile",
-		"arb",
-		"Dangerfile",
-		"Brewfile",
-		"Fastfile",
-		"Appfile",
-		"Deliverfile",
-		"Matchfile",
-		"Scanfile",
-		"Snapfile",
-		"Gymfile",
-		"jb"
-	],
-	"firstLineMatch": "(?x)\n# Hashbang\n^\\#!.*(?:\\s|\\/)\n(?:ruby[\\.\\d]*|macruby|rake|jruby|rbx|ruby_executable_hooks)\n(?:$|\\s)\n|\n# Modeline\n(?i:\n    # Emacs\n    -\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n    ruby\n    (?=[\\s;]|(?<![-*])-\\*-).*?-\\*-\n  |\n    # Vim\n    (?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)\n    (?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))\n    (?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*\n    [\\s:]\n    (?:filetype|ft|syntax)\\s*=\n    ruby\n    (?=\\s|:|$)\n)",
-	"keyEquivalent": "^~R",
 	"name": "Ruby",
+	"scopeName": "source.ruby",
+	"comment": "\n\tTODO: unresolved issues\n\n\ttext:\n\t\"p <<end\n\tprint me!\n\tend\"\n\tsymptoms:\n\tnot recognized as a heredoc\n\tsolution:\n\tthere is no way to distinguish perfectly between the << operator and the start\n\tof a heredoc. Currently, we require assignment to recognize a heredoc. More\n\trefinement is possible.\n\t• Heredocs with indented terminators (<<-) are always distinguishable, however.\n\t• Nested heredocs are not really supportable at present\n\n\ttext:\n\tprint <<-'THERE' \n\tThis is single quoted. \n\tThe above used #{Time.now} \n\tTHERE \n\tsymtoms:\n\tFrom Programming Ruby p306; should be a non-interpolated heredoc.\n\t\n    text:\n    val?(a):p(b)\n    val?'a':'b'\n    symptoms:\n    ':p' is recognized as a symbol.. its 2 things ':' and 'p'.\n    :'b' has same problem.\n    solution:\n    ternary operator rule, precedence stuff, symbol rule.\n    but also consider 'a.b?(:c)' ??\n",
 	"patterns": [
 		{
 			"captures": {
@@ -2808,7 +2771,5 @@
 				}
 			]
 		}
-	},
-	"scopeName": "source.ruby",
-	"uuid": "E00B62AC-6B1C-11D9-9B1F-000D93589AF6"
+	}
 }
\ No newline at end of file
diff --git a/extensions/rust/package.json b/extensions/rust/package.json
index a04ca7ef834..0c1b8b7f5b3 100644
--- a/extensions/rust/package.json
+++ b/extensions/rust/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "rust",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/rust/package.nls.json b/extensions/rust/package.nls.json
new file mode 100644
index 00000000000..41b6a3b293b
--- /dev/null
+++ b/extensions/rust/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Rust Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching and other language features in Rust files"
+}
\ No newline at end of file
diff --git a/extensions/rust/syntaxes/rust.tmLanguage.json b/extensions/rust/syntaxes/rust.tmLanguage.json
index 3eacf6ecae6..79b0a69e43a 100644
--- a/extensions/rust/syntaxes/rust.tmLanguage.json
+++ b/extensions/rust/syntaxes/rust.tmLanguage.json
@@ -7,210 +7,6 @@
 	"version": "https://github.com/zargony/atom-language-rust/commit/179f449a69182cae4fcdf644d59d842b7e445f89",
 	"name": "Rust",
 	"scopeName": "source.rust",
-	"fileTypes": [
-		"rs"
-	],
-	"repository": {
-		"block_doc_comment": {
-			"comment": "Block documentation comment",
-			"name": "comment.block.documentation.rust",
-			"begin": "/\\*[\\*!](?![\\*/])",
-			"end": "\\*/",
-			"patterns": [
-				{
-					"include": "#block_doc_comment"
-				},
-				{
-					"include": "#block_comment"
-				}
-			]
-		},
-		"block_comment": {
-			"comment": "Block comment",
-			"name": "comment.block.rust",
-			"begin": "/\\*",
-			"end": "\\*/",
-			"patterns": [
-				{
-					"include": "#block_doc_comment"
-				},
-				{
-					"include": "#block_comment"
-				}
-			]
-		},
-		"line_doc_comment": {
-			"comment": "Single-line documentation comment",
-			"name": "comment.line.documentation.rust",
-			"begin": "//[!/](?=[^/])",
-			"end": "$"
-		},
-		"line_comment": {
-			"comment": "Single-line comment",
-			"name": "comment.line.double-slash.rust",
-			"begin": "//",
-			"end": "$"
-		},
-		"escaped_character": {
-			"name": "constant.character.escape.rust",
-			"match": "\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)"
-		},
-		"string_literal": {
-			"comment": "Double-quote string literal",
-			"name": "string.quoted.double.rust",
-			"begin": "b?\"",
-			"end": "\"",
-			"patterns": [
-				{
-					"include": "#escaped_character"
-				}
-			]
-		},
-		"raw_string_literal": {
-			"comment": "Raw double-quote string literal",
-			"name": "string.quoted.double.raw.rust",
-			"begin": "b?r(#*)\"",
-			"end": "\"\\1"
-		},
-		"sigils": {
-			"comment": "Sigil",
-			"name": "keyword.operator.sigil.rust",
-			"match": "[&*](?=[a-zA-Z0-9_\\(\\[\\|\\\"]+)"
-		},
-		"self": {
-			"comment": "Self variable",
-			"name": "variable.language.rust",
-			"match": "\\bself\\b"
-		},
-		"mut": {
-			"comment": "Mutable storage modifier",
-			"name": "storage.modifier.mut.rust",
-			"match": "\\bmut\\b"
-		},
-		"box": {
-			"comment": "Box storage modifier",
-			"name": "storage.modifier.box.rust",
-			"match": "\\bbox\\b"
-		},
-		"const": {
-			"comment": "Const storage modifier",
-			"name": "storage.modifier.const.rust",
-			"match": "\\bconst\\b"
-		},
-		"pub": {
-			"comment": "Visibility modifier",
-			"name": "storage.modifier.visibility.rust",
-			"match": "\\bpub\\b"
-		},
-		"unsafe": {
-			"comment": "Unsafe code keyword",
-			"name": "keyword.other.unsafe.rust",
-			"match": "\\bunsafe\\b"
-		},
-		"where": {
-			"comment": "Generic where clause",
-			"name": "keyword.other.where.rust",
-			"match": "\\bwhere\\b"
-		},
-		"lifetime": {
-			"comment": "Named lifetime",
-			"name": "storage.modifier.lifetime.rust",
-			"match": "'([a-zA-Z_][a-zA-Z0-9_]*)\\b",
-			"captures": {
-				"1": {
-					"name": "entity.name.lifetime.rust"
-				}
-			}
-		},
-		"ref_lifetime": {
-			"comment": "Reference with named lifetime",
-			"match": "&('([a-zA-Z_][a-zA-Z0-9_]*))\\b",
-			"captures": {
-				"1": {
-					"name": "storage.modifier.lifetime.rust"
-				},
-				"2": {
-					"name": "entity.name.lifetime.rust"
-				}
-			}
-		},
-		"core_types": {
-			"comment": "Built-in/core type",
-			"name": "storage.type.core.rust",
-			"match": "\\b(bool|char|usize|isize|u8|u16|u32|u64|u128|i8|i16|i32|i64|i128|f32|f64|str|Self|Option|Result)\\b"
-		},
-		"core_vars": {
-			"comment": "Core type variant",
-			"name": "support.constant.core.rust",
-			"match": "\\b(Some|None|Ok|Err)\\b"
-		},
-		"core_marker": {
-			"comment": "Core trait (marker)",
-			"name": "support.type.marker.rust",
-			"match": "\\b(Copy|Send|Sized|Sync)\\b"
-		},
-		"core_traits": {
-			"comment": "Core trait",
-			"name": "support.type.core.rust",
-			"match": "\\b(Drop|Fn|FnMut|FnOnce|Clone|PartialEq|PartialOrd|Eq|Ord|AsRef|AsMut|Into|From|Default|Iterator|Extend|IntoIterator|DoubleEndedIterator|ExactSizeIterator)\\b"
-		},
-		"std_types": {
-			"comment": "Standard library type",
-			"name": "storage.class.std.rust",
-			"match": "\\b(Box|String|Vec|Path|PathBuf)\\b"
-		},
-		"std_traits": {
-			"comment": "Standard library trait",
-			"name": "support.type.std.rust",
-			"match": "\\b(ToOwned|ToString)\\b"
-		},
-		"type": {
-			"comment": "A type",
-			"name": "entity.name.type.rust",
-			"match": "\\b([A-Za-z][_A-Za-z0-9]*|_[_A-Za-z0-9]+)\\b"
-		},
-		"type_params": {
-			"comment": "Type parameters",
-			"name": "meta.type_params.rust",
-			"begin": "<(?![=<])",
-			"end": "(?<![-])>",
-			"patterns": [
-				{
-					"include": "#block_comment"
-				},
-				{
-					"include": "#line_comment"
-				},
-				{
-					"include": "#sigils"
-				},
-				{
-					"include": "#mut"
-				},
-				{
-					"include": "#lifetime"
-				},
-				{
-					"include": "#core_types"
-				},
-				{
-					"include": "#core_marker"
-				},
-				{
-					"include": "#core_traits"
-				},
-				{
-					"include": "#std_types"
-				},
-				{
-					"include": "#std_traits"
-				},
-				{
-					"include": "#type_params"
-				}
-			]
-		}
-	},
 	"patterns": [
 		{
 			"comment": "Implementation",
@@ -654,5 +450,206 @@
 				}
 			]
 		}
-	]
+	],
+	"repository": {
+		"block_doc_comment": {
+			"comment": "Block documentation comment",
+			"name": "comment.block.documentation.rust",
+			"begin": "/\\*[\\*!](?![\\*/])",
+			"end": "\\*/",
+			"patterns": [
+				{
+					"include": "#block_doc_comment"
+				},
+				{
+					"include": "#block_comment"
+				}
+			]
+		},
+		"block_comment": {
+			"comment": "Block comment",
+			"name": "comment.block.rust",
+			"begin": "/\\*",
+			"end": "\\*/",
+			"patterns": [
+				{
+					"include": "#block_doc_comment"
+				},
+				{
+					"include": "#block_comment"
+				}
+			]
+		},
+		"line_doc_comment": {
+			"comment": "Single-line documentation comment",
+			"name": "comment.line.documentation.rust",
+			"begin": "//[!/](?=[^/])",
+			"end": "$"
+		},
+		"line_comment": {
+			"comment": "Single-line comment",
+			"name": "comment.line.double-slash.rust",
+			"begin": "//",
+			"end": "$"
+		},
+		"escaped_character": {
+			"name": "constant.character.escape.rust",
+			"match": "\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)"
+		},
+		"string_literal": {
+			"comment": "Double-quote string literal",
+			"name": "string.quoted.double.rust",
+			"begin": "b?\"",
+			"end": "\"",
+			"patterns": [
+				{
+					"include": "#escaped_character"
+				}
+			]
+		},
+		"raw_string_literal": {
+			"comment": "Raw double-quote string literal",
+			"name": "string.quoted.double.raw.rust",
+			"begin": "b?r(#*)\"",
+			"end": "\"\\1"
+		},
+		"sigils": {
+			"comment": "Sigil",
+			"name": "keyword.operator.sigil.rust",
+			"match": "[&*](?=[a-zA-Z0-9_\\(\\[\\|\\\"]+)"
+		},
+		"self": {
+			"comment": "Self variable",
+			"name": "variable.language.rust",
+			"match": "\\bself\\b"
+		},
+		"mut": {
+			"comment": "Mutable storage modifier",
+			"name": "storage.modifier.mut.rust",
+			"match": "\\bmut\\b"
+		},
+		"box": {
+			"comment": "Box storage modifier",
+			"name": "storage.modifier.box.rust",
+			"match": "\\bbox\\b"
+		},
+		"const": {
+			"comment": "Const storage modifier",
+			"name": "storage.modifier.const.rust",
+			"match": "\\bconst\\b"
+		},
+		"pub": {
+			"comment": "Visibility modifier",
+			"name": "storage.modifier.visibility.rust",
+			"match": "\\bpub\\b"
+		},
+		"unsafe": {
+			"comment": "Unsafe code keyword",
+			"name": "keyword.other.unsafe.rust",
+			"match": "\\bunsafe\\b"
+		},
+		"where": {
+			"comment": "Generic where clause",
+			"name": "keyword.other.where.rust",
+			"match": "\\bwhere\\b"
+		},
+		"lifetime": {
+			"comment": "Named lifetime",
+			"name": "storage.modifier.lifetime.rust",
+			"match": "'([a-zA-Z_][a-zA-Z0-9_]*)\\b",
+			"captures": {
+				"1": {
+					"name": "entity.name.lifetime.rust"
+				}
+			}
+		},
+		"ref_lifetime": {
+			"comment": "Reference with named lifetime",
+			"match": "&('([a-zA-Z_][a-zA-Z0-9_]*))\\b",
+			"captures": {
+				"1": {
+					"name": "storage.modifier.lifetime.rust"
+				},
+				"2": {
+					"name": "entity.name.lifetime.rust"
+				}
+			}
+		},
+		"core_types": {
+			"comment": "Built-in/core type",
+			"name": "storage.type.core.rust",
+			"match": "\\b(bool|char|usize|isize|u8|u16|u32|u64|u128|i8|i16|i32|i64|i128|f32|f64|str|Self|Option|Result)\\b"
+		},
+		"core_vars": {
+			"comment": "Core type variant",
+			"name": "support.constant.core.rust",
+			"match": "\\b(Some|None|Ok|Err)\\b"
+		},
+		"core_marker": {
+			"comment": "Core trait (marker)",
+			"name": "support.type.marker.rust",
+			"match": "\\b(Copy|Send|Sized|Sync)\\b"
+		},
+		"core_traits": {
+			"comment": "Core trait",
+			"name": "support.type.core.rust",
+			"match": "\\b(Drop|Fn|FnMut|FnOnce|Clone|PartialEq|PartialOrd|Eq|Ord|AsRef|AsMut|Into|From|Default|Iterator|Extend|IntoIterator|DoubleEndedIterator|ExactSizeIterator)\\b"
+		},
+		"std_types": {
+			"comment": "Standard library type",
+			"name": "storage.class.std.rust",
+			"match": "\\b(Box|String|Vec|Path|PathBuf)\\b"
+		},
+		"std_traits": {
+			"comment": "Standard library trait",
+			"name": "support.type.std.rust",
+			"match": "\\b(ToOwned|ToString)\\b"
+		},
+		"type": {
+			"comment": "A type",
+			"name": "entity.name.type.rust",
+			"match": "\\b([A-Za-z][_A-Za-z0-9]*|_[_A-Za-z0-9]+)\\b"
+		},
+		"type_params": {
+			"comment": "Type parameters",
+			"name": "meta.type_params.rust",
+			"begin": "<(?![=<])",
+			"end": "(?<![-])>",
+			"patterns": [
+				{
+					"include": "#block_comment"
+				},
+				{
+					"include": "#line_comment"
+				},
+				{
+					"include": "#sigils"
+				},
+				{
+					"include": "#mut"
+				},
+				{
+					"include": "#lifetime"
+				},
+				{
+					"include": "#core_types"
+				},
+				{
+					"include": "#core_marker"
+				},
+				{
+					"include": "#core_traits"
+				},
+				{
+					"include": "#std_types"
+				},
+				{
+					"include": "#std_traits"
+				},
+				{
+					"include": "#type_params"
+				}
+			]
+		}
+	}
 }
\ No newline at end of file
diff --git a/extensions/scss/package.json b/extensions/scss/package.json
index 60873e98791..b2bc11406ea 100644
--- a/extensions/scss/package.json
+++ b/extensions/scss/package.json
@@ -1,5 +1,7 @@
 {
     "name": "scss",
+    "displayName": "%displayName%",
+	"description": "%description%",
     "version": "0.1.0",
     "publisher": "vscode",
     "engines": { "vscode": "*" },
diff --git a/extensions/scss/package.nls.json b/extensions/scss/package.nls.json
new file mode 100644
index 00000000000..b38ad298947
--- /dev/null
+++ b/extensions/scss/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "SCSS Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching and other language features in SCSS files."
+}
\ No newline at end of file
diff --git a/extensions/scss/syntaxes/scss.tmLanguage.json b/extensions/scss/syntaxes/scss.tmLanguage.json
index 6e97f761713..80c0c3ad84f 100644
--- a/extensions/scss/syntaxes/scss.tmLanguage.json
+++ b/extensions/scss/syntaxes/scss.tmLanguage.json
@@ -5,15 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/atom/language-sass/commit/a07688bd078f420f56df6221e9263d80e738869b",
-	"scopeName": "source.css.scss",
 	"name": "SCSS",
-	"fileTypes": [
-		"scss",
-		"css.scss",
-		"css.scss.erb",
-		"scss.erb",
-		"scss.liquid"
-	],
+	"scopeName": "source.css.scss",
 	"patterns": [
 		{
 			"include": "#variable_setting"
diff --git a/extensions/shaderlab/package.json b/extensions/shaderlab/package.json
index 2eabed584d2..a5d675b55f1 100644
--- a/extensions/shaderlab/package.json
+++ b/extensions/shaderlab/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "shaderlab",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": {
diff --git a/extensions/shaderlab/package.nls.json b/extensions/shaderlab/package.nls.json
new file mode 100644
index 00000000000..b22f1492629
--- /dev/null
+++ b/extensions/shaderlab/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Shaderlab Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching and other language features in Shaderlab files"
+}
\ No newline at end of file
diff --git a/extensions/shaderlab/syntaxes/shaderlab.tmLanguage.json b/extensions/shaderlab/syntaxes/shaderlab.tmLanguage.json
index 2922a8a5ac3..6b7ad9d7fe2 100644
--- a/extensions/shaderlab/syntaxes/shaderlab.tmLanguage.json
+++ b/extensions/shaderlab/syntaxes/shaderlab.tmLanguage.json
@@ -5,11 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/tgjones/shaders-tmLanguage/commit/c72c8b39380ba5a86c58ceed053b5d965ebf38b3",
-	"scopeName": "source.shaderlab",
 	"name": "ShaderLab",
-	"fileTypes": [
-		"shader"
-	],
+	"scopeName": "source.shaderlab",
 	"patterns": [
 		{
 			"name": "comment.line.double-slash.shaderlab",
diff --git a/extensions/shellscript/package.json b/extensions/shellscript/package.json
index ef9014dc01d..94924aa14b7 100644
--- a/extensions/shellscript/package.json
+++ b/extensions/shellscript/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "shellscript",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/shellscript/package.nls.json b/extensions/shellscript/package.nls.json
new file mode 100644
index 00000000000..e16f6f253a2
--- /dev/null
+++ b/extensions/shellscript/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Shell Script Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching and other language features in Shell Script files"
+}
\ No newline at end of file
diff --git a/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json b/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json
index 874d7d16a00..0089e5aa5c4 100644
--- a/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json
+++ b/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json
@@ -4,35 +4,9 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/atom/language-shellscript/commit/5206d247e33bb4e7ebeb320f10814ecd4132f9eb",
-	"scopeName": "source.shell",
+	"version": "https://github.com/atom/language-shellscript/commit/4c3711edbe8eac6f501976893976b1ac6a043d50",
 	"name": "Shell Script",
-	"fileTypes": [
-		"sh",
-		"bash",
-		"ksh",
-		"zsh",
-		"zsh-theme",
-		"zshenv",
-		"zlogin",
-		"zlogout",
-		"zprofile",
-		"zshrc",
-		"bashrc",
-		"bash_aliases",
-		"bash_profile",
-		"bash_login",
-		"profile",
-		"bash_logout",
-		".textmate_init",
-		"npmrc",
-		"PKGBUILD",
-		"install",
-		"cygport",
-		"bats",
-		"ebuild"
-	],
-	"firstLineMatch": "(?x)\n# Hashbang\n^\\#!.*(?:\\s|\\/)\n  (?:bash|zsh|sh|tcsh|ksh|dash|ash|csh|rc)\n(?:$|\\s)\n|\n# Modeline\n(?i:\n  # Emacs\n  -\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n    (?:shell-script|sh)\n  (?=[\\s;]|(?<![-*])-\\*-).*?-\\*-\n  |\n  # Vim\n  (?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s* set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n    sh\n  (?=\\s|:|$)\n)",
+	"scopeName": "source.shell",
 	"patterns": [
 		{
 			"include": "#comment"
@@ -141,7 +115,7 @@
 			]
 		},
 		"comment": {
-			"begin": "(^\\s+)?(?<=^|\\W)(?=#)(?!#{)",
+			"begin": "(^\\s+)?(?<=^|\\W)(?<!-)(?=#)(?!#{)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.whitespace.comment.leading.shell"
@@ -314,7 +288,7 @@
 		"heredoc": {
 			"patterns": [
 				{
-					"begin": "(<<)-(\"|'|)\\s*(RUBY)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "(<<)-\\s*(\"|'|)\\s*(RUBY)(?=\\s|;|&|<|\"|')\\2",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
@@ -338,7 +312,7 @@
 					]
 				},
 				{
-					"begin": "(<<)(\"|'|)\\s*(RUBY)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "(<<)\\s*(\"|'|)\\s*(RUBY)(?=\\s|;|&|<|\"|')\\2",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
@@ -362,7 +336,7 @@
 					]
 				},
 				{
-					"begin": "(<<)-(\"|'|)\\s*(PYTHON)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "(<<)-\\s*(\"|'|)\\s*(PYTHON)(?=\\s|;|&|<|\"|')\\2",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
@@ -386,7 +360,7 @@
 					]
 				},
 				{
-					"begin": "(<<)(\"|'|)\\s*(PYTHON)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "(<<)\\s*(\"|'|)\\s*(PYTHON)(?=\\s|;|&|<|\"|')\\2",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
@@ -410,7 +384,7 @@
 					]
 				},
 				{
-					"begin": "(<<)-(\"|'|)\\s*(APPLESCRIPT)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "(<<)-\\s*(\"|'|)\\s*(APPLESCRIPT)(?=\\s|;|&|<|\"|')\\2",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
@@ -434,7 +408,7 @@
 					]
 				},
 				{
-					"begin": "(<<)(\"|'|)\\s*(APPLESCRIPT)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "(<<)\\s*(\"|'|)\\s*(APPLESCRIPT)(?=\\s|;|&|<|\"|')\\2",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
@@ -458,7 +432,7 @@
 					]
 				},
 				{
-					"begin": "(<<)-(\"|'|)\\s*(HTML)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "(<<)-\\s*(\"|'|)\\s*(HTML)(?=\\s|;|&|<|\"|')\\2",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
@@ -482,7 +456,7 @@
 					]
 				},
 				{
-					"begin": "(<<)(\"|'|)\\s*(HTML)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "(<<)\\s*(\"|'|)\\s*(HTML)(?=\\s|;|&|<|\"|')\\2",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
@@ -506,7 +480,7 @@
 					]
 				},
 				{
-					"begin": "(<<)-(\"|'|)\\s*(MARKDOWN)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "(<<)-\\s*(\"|'|)\\s*(MARKDOWN)(?=\\s|;|&|<|\"|')\\2",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
@@ -530,7 +504,7 @@
 					]
 				},
 				{
-					"begin": "(<<)(\"|'|)\\s*(MARKDOWN)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "(<<)\\s*(\"|'|)\\s*(MARKDOWN)(?=\\s|;|&|<|\"|')\\2",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
@@ -554,7 +528,7 @@
 					]
 				},
 				{
-					"begin": "(<<)-(\"|'|)\\s*(TEXTILE)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "(<<)-\\s*(\"|'|)\\s*(TEXTILE)(?=\\s|;|&|<|\"|')\\2",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
@@ -578,7 +552,7 @@
 					]
 				},
 				{
-					"begin": "(<<)(\"|'|)\\s*(TEXTILE)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "(<<)\\s*(\"|'|)\\s*(TEXTILE)(?=\\s|;|&|<|\"|')\\2",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
@@ -602,7 +576,7 @@
 					]
 				},
 				{
-					"begin": "(<<)-(\"|'|)\\s*(SHELL)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "(<<)-\\s*(\"|'|)\\s*(SHELL)(?=\\s|;|&|<|\"|')\\2",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
@@ -626,7 +600,7 @@
 					]
 				},
 				{
-					"begin": "(<<)(\"|'|)\\s*(SHELL)(?=\\s|;|&|<|\"|')\\2",
+					"begin": "(<<)\\s*(\"|'|)\\s*(SHELL)(?=\\s|;|&|<|\"|')\\2",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
@@ -650,7 +624,7 @@
 					]
 				},
 				{
-					"begin": "(<<)-(\"|'|)\\s*\\\\?([^;&<\\s]+)\\2",
+					"begin": "(<<)-\\s*(\"|'|)\\s*\\\\?([^;&<\\s]+)\\2",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
@@ -668,7 +642,7 @@
 					"name": "string.unquoted.heredoc.no-indent.shell"
 				},
 				{
-					"begin": "(<<)(\"|'|)\\s*\\\\?([^;&<\\s]+)\\2",
+					"begin": "(<<)\\s*(\"|'|)\\s*\\\\?([^;&<\\s]+)\\2",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.heredoc.shell"
diff --git a/extensions/sql/package.json b/extensions/sql/package.json
index e983778bf36..2bb2b5cde1f 100644
--- a/extensions/sql/package.json
+++ b/extensions/sql/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "sql",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/sql/package.nls.json b/extensions/sql/package.nls.json
new file mode 100644
index 00000000000..baba5622d85
--- /dev/null
+++ b/extensions/sql/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "SQL Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching and other language features in SQL files"
+}
\ No newline at end of file
diff --git a/extensions/sql/syntaxes/sql.tmLanguage.json b/extensions/sql/syntaxes/sql.tmLanguage.json
index 80cb019c448..cf4f9a394da 100644
--- a/extensions/sql/syntaxes/sql.tmLanguage.json
+++ b/extensions/sql/syntaxes/sql.tmLanguage.json
@@ -5,13 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/Microsoft/vscode-mssql/commit/c8effddd6a9df117f3ed45b60b487163950a7ea5",
-	"fileTypes": [
-		"sql",
-		"ddl",
-		"dml"
-	],
-	"keyEquivalent": "^~S",
 	"name": "SQL",
+	"scopeName": "source.sql",
 	"patterns": [
 		{
 			"match": "((?<!@)@)\\b(\\w+)\\b",
@@ -520,7 +515,5 @@
 				}
 			]
 		}
-	},
-	"scopeName": "source.sql",
-	"uuid": "C49120AC-6ECC-11D9-ACC8-000D93589AF6"
+	}
 }
\ No newline at end of file
diff --git a/extensions/swift/package.json b/extensions/swift/package.json
index a9139a22a6d..32bd9376967 100644
--- a/extensions/swift/package.json
+++ b/extensions/swift/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "swift",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/swift/package.nls.json b/extensions/swift/package.nls.json
new file mode 100644
index 00000000000..c1779830247
--- /dev/null
+++ b/extensions/swift/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Swift Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching, Snippets and other language features in Swift files"
+}
\ No newline at end of file
diff --git a/extensions/swift/syntaxes/swift.tmLanguage.json b/extensions/swift/syntaxes/swift.tmLanguage.json
index e2327fa20df..e75e2580e24 100644
--- a/extensions/swift/syntaxes/swift.tmLanguage.json
+++ b/extensions/swift/syntaxes/swift.tmLanguage.json
@@ -5,12 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/freebroccolo/atom-language-swift/commit/fb7c93e0174dea69c8685c00deeb53d480d1d202",
-	"scopeName": "source.swift",
-	"fileTypes": [
-		"swift"
-	],
 	"name": "Swift",
-	"firstLineMatch": "^#!\\s*/.*\\bswift",
+	"scopeName": "source.swift",
 	"patterns": [
 		{
 			"name": "keyword.others.swift",
diff --git a/extensions/theme-abyss/package.json b/extensions/theme-abyss/package.json
index dd1aa7b31a2..4a49e49149e 100644
--- a/extensions/theme-abyss/package.json
+++ b/extensions/theme-abyss/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "theme-abyss",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/theme-abyss/package.nls.json b/extensions/theme-abyss/package.nls.json
new file mode 100644
index 00000000000..48fbcd8583a
--- /dev/null
+++ b/extensions/theme-abyss/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Abyss Theme",
+	"description": "Abyss theme for Visual Studio Code"
+}
\ No newline at end of file
diff --git a/extensions/theme-defaults/package.json b/extensions/theme-defaults/package.json
index 7a48ad6ece2..2e20824eb85 100644
--- a/extensions/theme-defaults/package.json
+++ b/extensions/theme-defaults/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "theme-defaults",
-	"displayName": "Default Themes",
-	"description": "The default light and dark themes (Plus and Visual Studio)",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"categories": [ "Themes" ],
 	"version": "0.1.10",
 	"publisher": "vscode",
diff --git a/extensions/theme-defaults/package.nls.json b/extensions/theme-defaults/package.nls.json
new file mode 100644
index 00000000000..46dee28cf26
--- /dev/null
+++ b/extensions/theme-defaults/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Default Themes",
+	"description": "The default light and dark themes (Plus and Visual Studio)"
+}
\ No newline at end of file
diff --git a/extensions/theme-kimbie-dark/package.json b/extensions/theme-kimbie-dark/package.json
index f22ca5e5f09..c71105d6717 100644
--- a/extensions/theme-kimbie-dark/package.json
+++ b/extensions/theme-kimbie-dark/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "theme-kimbie-dark",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/theme-kimbie-dark/package.nls.json b/extensions/theme-kimbie-dark/package.nls.json
new file mode 100644
index 00000000000..85c736cee8b
--- /dev/null
+++ b/extensions/theme-kimbie-dark/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Kimbie Dark Theme",
+	"description": "Kimbie dark theme for Visual Studio Code"
+}
\ No newline at end of file
diff --git a/extensions/theme-monokai-dimmed/package.json b/extensions/theme-monokai-dimmed/package.json
index 18ed5256ad8..1e59351e87f 100644
--- a/extensions/theme-monokai-dimmed/package.json
+++ b/extensions/theme-monokai-dimmed/package.json
@@ -1,8 +1,12 @@
 {
 	"name": "theme-monokai-dimmed",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
-	"engines": { "vscode": "*" },
+	"engines": {
+		"vscode": "*"
+	},
 	"contributes": {
 		"themes": [
 			{
diff --git a/extensions/theme-monokai-dimmed/package.nls.json b/extensions/theme-monokai-dimmed/package.nls.json
new file mode 100644
index 00000000000..3d93898e2ca
--- /dev/null
+++ b/extensions/theme-monokai-dimmed/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Monokai Dimmed Theme",
+	"description": "Monokai dimmed theme for Visual Studio Code"
+}
\ No newline at end of file
diff --git a/extensions/theme-monokai/package.json b/extensions/theme-monokai/package.json
index 4e4fdd358b7..06aae0fb019 100644
--- a/extensions/theme-monokai/package.json
+++ b/extensions/theme-monokai/package.json
@@ -1,8 +1,12 @@
 {
 	"name": "theme-monokai",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
-	"engines": { "vscode": "*" },
+	"engines": {
+		"vscode": "*"
+	},
 	"contributes": {
 		"themes": [
 			{
diff --git a/extensions/theme-monokai/package.nls.json b/extensions/theme-monokai/package.nls.json
new file mode 100644
index 00000000000..8e8d73c7568
--- /dev/null
+++ b/extensions/theme-monokai/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Monokai Theme",
+	"description": "Monokai theme for Visual Studio Code"
+}
\ No newline at end of file
diff --git a/extensions/theme-quietlight/package.json b/extensions/theme-quietlight/package.json
index b8c78c374c8..7bd6bf1ee2e 100644
--- a/extensions/theme-quietlight/package.json
+++ b/extensions/theme-quietlight/package.json
@@ -1,8 +1,12 @@
 {
 	"name": "theme-quietlight",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
-	"engines": { "vscode": "*" },
+	"engines": {
+		"vscode": "*"
+	},
 	"contributes": {
 		"themes": [
 			{
diff --git a/extensions/theme-quietlight/package.nls.json b/extensions/theme-quietlight/package.nls.json
new file mode 100644
index 00000000000..1873df058e7
--- /dev/null
+++ b/extensions/theme-quietlight/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Quiet Light Theme",
+	"description": "Quiet light theme for Visual Studio Code"
+}
\ No newline at end of file
diff --git a/extensions/theme-red/package.json b/extensions/theme-red/package.json
index f2b0403c694..1b70c041ec8 100644
--- a/extensions/theme-red/package.json
+++ b/extensions/theme-red/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "theme-red",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/theme-red/package.nls.json b/extensions/theme-red/package.nls.json
new file mode 100644
index 00000000000..680fde603ec
--- /dev/null
+++ b/extensions/theme-red/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Red Theme",
+	"description": "Red theme for Visual Studio Code"
+}
\ No newline at end of file
diff --git a/extensions/theme-seti/package.json b/extensions/theme-seti/package.json
index 21c61890555..6d1c27f8cb4 100644
--- a/extensions/theme-seti/package.json
+++ b/extensions/theme-seti/package.json
@@ -2,7 +2,8 @@
 	"name": "vscode-theme-seti",
 	"private": true,
 	"version": "0.1.0",
-    "description": "A file icon theme made out of the Seti UI file icons",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"publisher": "vscode",
 	"scripts": {
 		"update": "node ./build/update-icon-theme.js"
diff --git a/extensions/theme-seti/package.nls.json b/extensions/theme-seti/package.nls.json
new file mode 100644
index 00000000000..173d99ddaa8
--- /dev/null
+++ b/extensions/theme-seti/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Seti File Icon Theme",
+	"description": "A file icon theme made out of the Seti UI file icons"
+}
\ No newline at end of file
diff --git a/extensions/theme-solarized-dark/package.json b/extensions/theme-solarized-dark/package.json
index 3d8f91a8dc4..42d97c21593 100644
--- a/extensions/theme-solarized-dark/package.json
+++ b/extensions/theme-solarized-dark/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "theme-solarized-dark",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/theme-solarized-dark/package.nls.json b/extensions/theme-solarized-dark/package.nls.json
new file mode 100644
index 00000000000..c226e15f3ef
--- /dev/null
+++ b/extensions/theme-solarized-dark/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Solarized Dark Theme",
+	"description": "Solarized dark theme for Visual Studio Code"
+}
\ No newline at end of file
diff --git a/extensions/theme-solarized-light/package.json b/extensions/theme-solarized-light/package.json
index 57570d33cb6..5f3212cff39 100644
--- a/extensions/theme-solarized-light/package.json
+++ b/extensions/theme-solarized-light/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "theme-solarized-light",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/theme-solarized-light/package.nls.json b/extensions/theme-solarized-light/package.nls.json
new file mode 100644
index 00000000000..f7a3d0cee33
--- /dev/null
+++ b/extensions/theme-solarized-light/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Solarized Light Theme",
+	"description": "Solarized light theme for Visual Studio Code"
+}
\ No newline at end of file
diff --git a/extensions/theme-tomorrow-night-blue/package.json b/extensions/theme-tomorrow-night-blue/package.json
index 4600cd59140..9c58e2be3b0 100644
--- a/extensions/theme-tomorrow-night-blue/package.json
+++ b/extensions/theme-tomorrow-night-blue/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "theme-tomorrow-night-blue",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/theme-tomorrow-night-blue/package.nls.json b/extensions/theme-tomorrow-night-blue/package.nls.json
new file mode 100644
index 00000000000..044df352eaf
--- /dev/null
+++ b/extensions/theme-tomorrow-night-blue/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Tomorrow Night Blue Theme",
+	"description": "Tomorrow night blue theme for Visual Studio Code"
+}
\ No newline at end of file
diff --git a/extensions/typescript/package.json b/extensions/typescript/package.json
index 3a94a50c4c3..45bd4019079 100644
--- a/extensions/typescript/package.json
+++ b/extensions/typescript/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "semver": "4.3.6",
-    "vscode-extension-telemetry": "^0.0.11",
+    "vscode-extension-telemetry": "^0.0.13",
     "vscode-nls": "^3.2.1"
   },
   "devDependencies": {
diff --git a/extensions/typescript/src/features/completionItemProvider.ts b/extensions/typescript/src/features/completionItemProvider.ts
index 485f0bb2029..293b2c9cac1 100644
--- a/extensions/typescript/src/features/completionItemProvider.ts
+++ b/extensions/typescript/src/features/completionItemProvider.ts
@@ -464,7 +464,8 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP
 		let hasAddedParameters = false;
 
 		const snippet = new SnippetString();
-		snippet.appendText(item.label || item.insertText as string);
+		const methodName = detail.displayParts.find(part => part.kind === 'methodName');
+		snippet.appendText((methodName && methodName.text) || item.label || item.insertText as string);
 		snippet.appendText('(');
 
 		let parenCount = 0;
diff --git a/extensions/typescript/src/features/jsDocCompletionProvider.ts b/extensions/typescript/src/features/jsDocCompletionProvider.ts
index ab515a9a074..34963657b28 100644
--- a/extensions/typescript/src/features/jsDocCompletionProvider.ts
+++ b/extensions/typescript/src/features/jsDocCompletionProvider.ts
@@ -170,6 +170,12 @@ class TryCompleteJsDocCommand implements Command {
 			if (!res || !res.body) {
 				return undefined;
 			}
+			// Workaround for #43619
+			// docCommentTemplate previously returned undefined for empty jsdoc templates.
+			// TS 2.7 now returns a single line doc comment, which breaks indentation.
+			if (res.body.newText === '/** */') {
+				return undefined;
+			}
 			return TryCompleteJsDocCommand.templateToSnippet(res.body.newText);
 		}, () => undefined);
 	}
diff --git a/extensions/typescript/src/utils/projectStatus.ts b/extensions/typescript/src/utils/projectStatus.ts
index 60e49c4715d..186c1437ced 100644
--- a/extensions/typescript/src/utils/projectStatus.ts
+++ b/extensions/typescript/src/utils/projectStatus.ts
@@ -33,7 +33,7 @@ class ExcludeHintItem {
 	constructor(
 		private readonly telemetryReporter: TelemetryReporter
 	) {
-		this._item = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, Number.MIN_VALUE);
+		this._item = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 98 /* to the right of typescript version status (99) */);
 		this._item.command = 'js.projectStatus.command';
 	}
 
diff --git a/extensions/typescript/src/utils/versionStatus.ts b/extensions/typescript/src/utils/versionStatus.ts
index 69871458646..07169f8046f 100644
--- a/extensions/typescript/src/utils/versionStatus.ts
+++ b/extensions/typescript/src/utils/versionStatus.ts
@@ -14,7 +14,7 @@ export default class VersionStatus {
 	constructor(
 		private readonly normalizePath: (resource: vscode.Uri) => string | null
 	) {
-		this.versionBarEntry = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, Number.MIN_VALUE);
+		this.versionBarEntry = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 99 /* to the right of editor status (100) */);
 		this.onChangeEditorSub = vscode.window.onDidChangeActiveTextEditor(this.showHideStatus, this);
 	}
 
diff --git a/extensions/typescript/syntaxes/TypeScript.tmLanguage.json b/extensions/typescript/syntaxes/TypeScript.tmLanguage.json
index 2eb7cb1ebc6..29fbc3223f5 100644
--- a/extensions/typescript/syntaxes/TypeScript.tmLanguage.json
+++ b/extensions/typescript/syntaxes/TypeScript.tmLanguage.json
@@ -4,13 +4,9 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/24c7fb5254f50dad85eae03836b1b9ff92ecf273",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/77d21fd8d3f750fcf67bdf7436f4e46565cba350",
 	"name": "TypeScript",
 	"scopeName": "source.ts",
-	"fileTypes": [
-		"ts"
-	],
-	"uuid": "ef98eb90-bf9b-11e4-bb52-0800200c9a66",
 	"patterns": [
 		{
 			"include": "#directives"
@@ -3188,6 +3184,10 @@
 				{
 					"name": "keyword.operator.ternary.ts",
 					"match": "(\\?|\\:)"
+				},
+				{
+					"name": "keyword.operator.expression.infer.ts",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))infer(?=\\s+[_$[:alpha:]])"
 				}
 			]
 		},
diff --git a/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json b/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json
index 802b04ec0a3..93d6b162263 100644
--- a/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json
+++ b/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json
@@ -4,13 +4,9 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/24c7fb5254f50dad85eae03836b1b9ff92ecf273",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/77d21fd8d3f750fcf67bdf7436f4e46565cba350",
 	"name": "TypeScriptReact",
 	"scopeName": "source.tsx",
-	"fileTypes": [
-		"tsx"
-	],
-	"uuid": "805375ec-d614-41f5-8993-5843fe63ea82",
 	"patterns": [
 		{
 			"include": "#directives"
@@ -3154,6 +3150,10 @@
 				{
 					"name": "keyword.operator.ternary.tsx",
 					"match": "(\\?|\\:)"
+				},
+				{
+					"name": "keyword.operator.expression.infer.tsx",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))infer(?=\\s+[_$[:alpha:]])"
 				}
 			]
 		},
diff --git a/extensions/typescript/yarn.lock b/extensions/typescript/yarn.lock
index 0fcc8a28cac..bf3aa153c3e 100644
--- a/extensions/typescript/yarn.lock
+++ b/extensions/typescript/yarn.lock
@@ -36,9 +36,9 @@ semver@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
-vscode-extension-telemetry@^0.0.11:
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.11.tgz#f2dde487f01d2b079f55ab47a0247f5a772c4e06"
+vscode-extension-telemetry@^0.0.13:
+  version "0.0.13"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.13.tgz#8a4438cbb0a9f9f8ad65479e4ec08683aa4de0f7"
   dependencies:
     applicationinsights "1.0.1"
 
diff --git a/extensions/vb/package.json b/extensions/vb/package.json
index a28fba94208..f0362290bd8 100644
--- a/extensions/vb/package.json
+++ b/extensions/vb/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "vb",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/vb/package.nls.json b/extensions/vb/package.nls.json
new file mode 100644
index 00000000000..32294f8f111
--- /dev/null
+++ b/extensions/vb/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "Visual Basic Language Features",
+	"description": "Provides Syntax highlighting, Folding, Bracket matching, Snippets and other language features in Visual Basic files"
+}
\ No newline at end of file
diff --git a/extensions/vb/syntaxes/asp-vb-net.tmlanguage.json b/extensions/vb/syntaxes/asp-vb-net.tmlanguage.json
index 3ae4a18ccb0..262f9c9750b 100644
--- a/extensions/vb/syntaxes/asp-vb-net.tmlanguage.json
+++ b/extensions/vb/syntaxes/asp-vb-net.tmlanguage.json
@@ -5,12 +5,9 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/textmate/asp.vb.net.tmbundle/commit/72d44550b3286d0382d7be0624140cf97857ff69",
-	"comment": "Modified from the original ASP bundle. Originally modified by Thomas Aylott subtleGradient.com",
-	"fileTypes": [
-		"vb"
-	],
-	"keyEquivalent": "^~A",
 	"name": "ASP vb.NET",
+	"scopeName": "source.asp.vb.net",
+	"comment": "Modified from the original ASP bundle. Originally modified by Thomas Aylott subtleGradient.com",
 	"patterns": [
 		{
 			"match": "\\n",
@@ -237,7 +234,5 @@
 				}
 			]
 		}
-	},
-	"scopeName": "source.asp.vb.net",
-	"uuid": "7F9C9343-D48E-4E7D-BFE8-F680714DCD3E"
+	}
 }
\ No newline at end of file
diff --git a/extensions/xml/package.json b/extensions/xml/package.json
index 8f8bd0d349a..0c1b701bd49 100644
--- a/extensions/xml/package.json
+++ b/extensions/xml/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "xml",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
diff --git a/extensions/xml/package.nls.json b/extensions/xml/package.nls.json
new file mode 100644
index 00000000000..769ed924b60
--- /dev/null
+++ b/extensions/xml/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "XML Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching and other language features in XML files"
+}
\ No newline at end of file
diff --git a/extensions/xml/syntaxes/xml.tmLanguage.json b/extensions/xml/syntaxes/xml.tmLanguage.json
index dd66c8df2b8..532e3908f25 100644
--- a/extensions/xml/syntaxes/xml.tmLanguage.json
+++ b/extensions/xml/syntaxes/xml.tmLanguage.json
@@ -5,88 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/atom/language-xml/commit/27352842917b911383122bdcf98ed0d69d55c179",
-	"scopeName": "text.xml",
 	"name": "XML",
-	"fileTypes": [
-		"aiml",
-		"atom",
-		"axml",
-		"bpmn",
-		"config",
-		"cpt",
-		"csl",
-		"csproj",
-		"csproj.user",
-		"dae",
-		"dia",
-		"dita",
-		"ditamap",
-		"dtml",
-		"fodg",
-		"fodp",
-		"fods",
-		"fodt",
-		"fsproj",
-		"fxml",
-		"gir",
-		"glade",
-		"gpx",
-		"graphml",
-		"icls",
-		"iml",
-		"isml",
-		"jmx",
-		"jsp",
-		"kst",
-		"launch",
-		"menu",
-		"mxml",
-		"nuspec",
-		"opml",
-		"owl",
-		"pom",
-		"ppj",
-		"proj",
-		"pt",
-		"pubxml",
-		"pubxml.user",
-		"rdf",
-		"rng",
-		"rss",
-		"sdf",
-		"shproj",
-		"siml",
-		"sld",
-		"storyboard",
-		"svg",
-		"targets",
-		"tld",
-		"vbox",
-		"vbox-prev",
-		"vbproj",
-		"vbproj.user",
-		"vcproj",
-		"vcproj.filters",
-		"vcxproj",
-		"vcxproj.filters",
-		"wixmsp",
-		"wixmst",
-		"wixobj",
-		"wixout",
-		"wsdl",
-		"wxs",
-		"xaml",
-		"xbl",
-		"xib",
-		"xlf",
-		"xliff",
-		"xml",
-		"xpdl",
-		"xsd",
-		"xul",
-		"ui"
-	],
-	"firstLineMatch": "(?x)\n# XML declaration\n(?:\n  ^ <\\? xml\n\n  # VersionInfo\n  \\s+ version\n  \\s* = \\s*\n  (['\"])\n    1 \\. [0-9]+\n  \\1\n\n  # EncodingDecl\n  (?:\n    \\s+ encoding\n    \\s* = \\s*\n\n    # EncName\n    (['\"])\n      [A-Za-z]\n      [-A-Za-z0-9._]*\n    \\2\n  )?\n\n  # SDDecl\n  (?:\n    \\s+ standalone\n    \\s* = \\s*\n    (['\"])\n      (?:yes|no)\n    \\3\n  )?\n\n  \\s* \\?>\n)\n|\n# Modeline\n(?i:\n  # Emacs\n  -\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n    xml\n  (?=[\\s;]|(?<![-*])-\\*-).*?-\\*-\n  |\n  # Vim\n  (?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n    xml\n  (?=\\s|:|$)\n)",
+	"scopeName": "text.xml",
 	"patterns": [
 		{
 			"begin": "(<\\?)\\s*([-_a-zA-Z0-9]+)",
diff --git a/extensions/xml/syntaxes/xsl.tmLanguage.json b/extensions/xml/syntaxes/xsl.tmLanguage.json
index 116fe42ea46..c89f50050fe 100644
--- a/extensions/xml/syntaxes/xsl.tmLanguage.json
+++ b/extensions/xml/syntaxes/xsl.tmLanguage.json
@@ -5,12 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/atom/language-xml/commit/507de2ee7daca60cf02e9e21fbeb92bbae73e280",
-	"scopeName": "text.xml.xsl",
 	"name": "XSL",
-	"fileTypes": [
-		"xsl",
-		"xslt"
-	],
+	"scopeName": "text.xml.xsl",
 	"patterns": [
 		{
 			"begin": "(<)(xsl)((:))(template)",
diff --git a/extensions/yaml/package.json b/extensions/yaml/package.json
index 07ea6da422c..edcd5bb3e5f 100644
--- a/extensions/yaml/package.json
+++ b/extensions/yaml/package.json
@@ -1,5 +1,7 @@
 {
 	"name": "yaml",
+	"displayName": "%displayName%",
+	"description": "%description%",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
@@ -23,7 +25,8 @@
 		"configurationDefaults": {
 			"[yaml]": {
 				"editor.insertSpaces": true,
-				"editor.tabSize": 2
+                "editor.tabSize": 2,
+                "editor.autoIndent": false
 			}
 		}
 	}
diff --git a/extensions/yaml/package.nls.json b/extensions/yaml/package.nls.json
new file mode 100644
index 00000000000..d0848c498c1
--- /dev/null
+++ b/extensions/yaml/package.nls.json
@@ -0,0 +1,4 @@
+{
+	"displayName": "YAML Language Features",
+	"description": "Provides Syntax highlighting, Bracket matching and other language features in YAML files"
+}
\ No newline at end of file
diff --git a/extensions/yaml/syntaxes/yaml.tmLanguage.json b/extensions/yaml/syntaxes/yaml.tmLanguage.json
index 9d755531ed0..6f08b6e72c9 100644
--- a/extensions/yaml/syntaxes/yaml.tmLanguage.json
+++ b/extensions/yaml/syntaxes/yaml.tmLanguage.json
@@ -5,19 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/textmate/yaml.tmbundle/commit/efc96efafe5e48480cf55a2ed124b388cbea4440",
-	"fileTypes": [
-		"yaml",
-		"yml",
-		"rviz",
-		"reek",
-		"clang-format",
-		"yaml-tmlanguage",
-		"syntax",
-		"sublime-syntax"
-	],
-	"firstLineMatch": "^%YAML( ?1.\\d+)?",
-	"keyEquivalent": "^~Y",
 	"name": "YAML",
+	"scopeName": "source.yaml",
 	"patterns": [
 		{
 			"include": "#comment"
@@ -628,7 +617,5 @@
 				}
 			]
 		}
-	},
-	"scopeName": "source.yaml",
-	"uuid": "686AD6AE-33F3-4493-9512-9E9FC1D5417F"
+	}
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index d5ecf0b52ef..6a49f962342 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.21.0",
-  "distro": "4957472198ae7ca4a3ed49fd40d6d082c0bc592b",
+  "distro": "552e2dc44bb6ea0898101c84f40e4e30efcd4846",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -44,9 +44,9 @@
     "v8-inspect-profiler": "^0.0.7",
     "vscode-chokidar": "1.6.2",
     "vscode-debugprotocol": "1.25.0",
-    "vscode-ripgrep": "0.7.1-patch.1.1",
+    "vscode-ripgrep": "^0.7.1-patch.1.5",
     "vscode-textmate": "^3.2.0",
-    "vscode-xterm": "3.2.0-beta1",
+    "vscode-xterm": "3.2.0-beta3",
     "yauzl": "2.8.0"
   },
   "devDependencies": {
diff --git a/resources/darwin/bin/code.sh b/resources/darwin/bin/code.sh
index 9dba3f8e378..42b8bc287c5 100755
--- a/resources/darwin/bin/code.sh
+++ b/resources/darwin/bin/code.sh
@@ -3,9 +3,9 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
 
-function realpath() { /usr/bin/python -c "import os,sys; print os.path.realpath(sys.argv[1])" "$0"; }
+function realpath() { /usr/bin/python -c "import os,sys; print(os.path.realpath(sys.argv[1]))" "$0"; }
 CONTENTS="$(dirname "$(dirname "$(dirname "$(dirname "$(realpath "$0")")")")")"
 ELECTRON="$CONTENTS/MacOS/Electron"
 CLI="$CONTENTS/Resources/app/out/cli.js"
 ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
-exit $?
\ No newline at end of file
+exit $?
diff --git a/src/buildfile.js b/src/buildfile.js
index 58a2532f458..bd05c387ae0 100644
--- a/src/buildfile.js
+++ b/src/buildfile.js
@@ -10,6 +10,7 @@ exports.base = [{
 	append: [ 'vs/base/worker/workerMain' ],
 	dest: 'vs/base/worker/workerMain.js'
 }];
+//@ts-ignore review
 exports.workbench = require('./vs/workbench/buildfile').collectModules(['vs/workbench/workbench.main']);
 exports.code = require('./vs/code/buildfile').collectModules();
 
diff --git a/src/main.js b/src/main.js
index d458afd8dad..162a949f7d5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -162,6 +162,21 @@ function touch(file) {
 	});
 }
 
+function resolveJSFlags() {
+	let jsFlags = [];
+	if (args['js-flags']) {
+		jsFlags.push(args['js-flags']);
+	}
+	if (args['max-memory'] && !/max_old_space_size=(\d+)/g.exec(args['js-flags'])) {
+		jsFlags.push(`--max_old_space_size=${args['max-memory']}`);
+	}
+	if (jsFlags.length > 0) {
+		return jsFlags.join(' ');
+	} else {
+		return null;
+	}
+}
+
 // Language tags are case insensitve however an amd loader is case sensitive
 // To make this work on case preserving & insensitive FS we do the following:
 // the language bundles have lower case language tags and we always lower case
@@ -441,7 +456,8 @@ let nodeCachedDataDir = getNodeCachedDataDir().then(function (value) {
 
 		// tell v8 to not be lazy when parsing JavaScript. Generally this makes startup slower
 		// but because we generate cached data it makes subsequent startups much faster
-		app.commandLine.appendSwitch('--js-flags', '--nolazy');
+		let existingJSFlags = resolveJSFlags();
+		app.commandLine.appendSwitch('--js-flags', existingJSFlags ? existingJSFlags + ' --nolazy' : '--nolazy');
 	}
 	return value;
 });
@@ -454,6 +470,11 @@ userDefinedLocale.then((locale) => {
 	}
 });
 
+let jsFlags = resolveJSFlags();
+if (jsFlags) {
+	app.commandLine.appendSwitch('--js-flags', jsFlags);
+}
+
 // Load our code once ready
 app.once('ready', function () {
 	perf.mark('main:appReady');
diff --git a/src/vs/base/browser/contextmenu.ts b/src/vs/base/browser/contextmenu.ts
new file mode 100644
index 00000000000..221334278e4
--- /dev/null
+++ b/src/vs/base/browser/contextmenu.ts
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { IAction, IActionRunner, Action } from 'vs/base/common/actions';
+import { IActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
+
+export interface IEvent {
+	shiftKey?: boolean;
+	ctrlKey?: boolean;
+	altKey?: boolean;
+	metaKey?: boolean;
+}
+
+export class ContextSubMenu extends Action {
+	constructor(label: string, public entries: (ContextSubMenu | IAction)[]) {
+		super('contextsubmenu', label, '', true);
+	}
+}
+
+export interface IContextMenuDelegate {
+	getAnchor(): HTMLElement | { x: number; y: number; };
+	getActions(): TPromise<(IAction | ContextSubMenu)[]>;
+	getActionItem?(action: IAction): IActionItem;
+	getActionsContext?(event?: IEvent): any;
+	getKeyBinding?(action: IAction): ResolvedKeybinding;
+	getMenuClassName?(): string;
+	onHide?(didCancel: boolean): void;
+	actionRunner?: IActionRunner;
+	autoSelectFirstItem?: boolean;
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
index 8bb4ed5e331..13951c0ec24 100644
--- a/src/vs/base/browser/dom.ts
+++ b/src/vs/base/browser/dom.ts
@@ -251,41 +251,26 @@ export function addDisposableNonBubblingMouseOutListener(node: Element, handler:
 	});
 }
 
-const _animationFrame = (function () {
-	let emulatedRequestAnimationFrame = (callback: (time: number) => void): number => {
-		return setTimeout(() => callback(new Date().getTime()), 0);
-	};
-	let nativeRequestAnimationFrame: (callback: (time: number) => void) => number =
-		self.requestAnimationFrame
-		|| (<any>self).msRequestAnimationFrame
-		|| (<any>self).webkitRequestAnimationFrame
-		|| (<any>self).mozRequestAnimationFrame
-		|| (<any>self).oRequestAnimationFrame;
-
-
-
-	let emulatedCancelAnimationFrame = (id: number) => { };
-	let nativeCancelAnimationFrame: (id: number) => void =
-		self.cancelAnimationFrame || (<any>self).cancelRequestAnimationFrame
-		|| (<any>self).msCancelAnimationFrame || (<any>self).msCancelRequestAnimationFrame
-		|| (<any>self).webkitCancelAnimationFrame || (<any>self).webkitCancelRequestAnimationFrame
-		|| (<any>self).mozCancelAnimationFrame || (<any>self).mozCancelRequestAnimationFrame
-		|| (<any>self).oCancelAnimationFrame || (<any>self).oCancelRequestAnimationFrame;
-
-	let isNative = !!nativeRequestAnimationFrame;
-	let request = nativeRequestAnimationFrame || emulatedRequestAnimationFrame;
-	let cancel = nativeCancelAnimationFrame || emulatedCancelAnimationFrame;
-
-	return {
-		isNative: isNative,
-		request: (callback: (time: number) => void): number => {
-			return request(callback);
-		},
-		cancel: (id: number) => {
-			return cancel(id);
-		}
-	};
-})();
+interface IRequestAnimationFrame {
+	(callback: (time: number) => void): number;
+}
+let _animationFrame: IRequestAnimationFrame = null;
+function doRequestAnimationFrame(callback: (time: number) => void): number {
+	if (!_animationFrame) {
+		const emulatedRequestAnimationFrame = (callback: (time: number) => void): number => {
+			return setTimeout(() => callback(new Date().getTime()), 0);
+		};
+		_animationFrame = (
+			self.requestAnimationFrame
+			|| (<any>self).msRequestAnimationFrame
+			|| (<any>self).webkitRequestAnimationFrame
+			|| (<any>self).mozRequestAnimationFrame
+			|| (<any>self).oRequestAnimationFrame
+			|| emulatedRequestAnimationFrame
+		);
+	}
+	return _animationFrame(callback);
+}
 
 /**
  * Schedule a callback to be run at the next animation frame.
@@ -375,7 +360,7 @@ class AnimationFrameQueueItem implements IDisposable {
 
 		if (!animFrameRequested) {
 			animFrameRequested = true;
-			_animationFrame.request(animationFrameRunner);
+			doRequestAnimationFrame(animationFrameRunner);
 		}
 
 		return item;
@@ -662,7 +647,13 @@ export function createStyleSheet(container: HTMLElement = document.getElementsBy
 	return style;
 }
 
-const sharedStyle = <any>createStyleSheet();
+let _sharedStyleSheet: HTMLStyleElement = null;
+function getSharedStyleSheet(): HTMLStyleElement {
+	if (!_sharedStyleSheet) {
+		_sharedStyleSheet = createStyleSheet();
+	}
+	return _sharedStyleSheet;
+}
 
 function getDynamicStyleSheetRules(style: any) {
 	if (style && style.sheet && style.sheet.rules) {
@@ -676,7 +667,7 @@ function getDynamicStyleSheetRules(style: any) {
 	return [];
 }
 
-export function createCSSRule(selector: string, cssText: string, style: HTMLStyleElement = sharedStyle): void {
+export function createCSSRule(selector: string, cssText: string, style: HTMLStyleElement = getSharedStyleSheet()): void {
 	if (!style || !cssText) {
 		return;
 	}
@@ -684,7 +675,7 @@ export function createCSSRule(selector: string, cssText: string, style: HTMLStyl
 	(<CSSStyleSheet>style.sheet).insertRule(selector + '{' + cssText + '}', 0);
 }
 
-export function removeCSSRulesContainingSelector(ruleName: string, style = sharedStyle): void {
+export function removeCSSRulesContainingSelector(ruleName: string, style: HTMLStyleElement = getSharedStyleSheet()): void {
 	if (!style) {
 		return;
 	}
@@ -699,7 +690,7 @@ export function removeCSSRulesContainingSelector(ruleName: string, style = share
 	}
 
 	for (let i = toDelete.length - 1; i >= 0; i--) {
-		style.sheet.deleteRule(toDelete[i]);
+		(<any>style.sheet).deleteRule(toDelete[i]);
 	}
 }
 
diff --git a/src/vs/base/browser/htmlContentRenderer.ts b/src/vs/base/browser/htmlContentRenderer.ts
index 49eb0112767..fb9f3c6cf1a 100644
--- a/src/vs/base/browser/htmlContentRenderer.ts
+++ b/src/vs/base/browser/htmlContentRenderer.ts
@@ -9,15 +9,23 @@ import * as DOM from 'vs/base/browser/dom';
 import { defaultGenerator } from 'vs/base/common/idGenerator';
 import { escape } from 'vs/base/common/strings';
 import { removeMarkdownEscapes, IMarkdownString } from 'vs/base/common/htmlContent';
-import { marked } from 'vs/base/common/marked/marked';
+import { marked, MarkedRenderer, MarkedOptions } from 'vs/base/common/marked/marked';
 import { IMouseEvent } from 'vs/base/browser/mouseEvent';
+import { assign } from 'vs/base/common/objects';
+import { IDisposable } from 'vs/base/common/lifecycle';
+
+export interface IContentActionHandler {
+	callback: (content: string, event?: IMouseEvent) => void;
+	disposeables: IDisposable[];
+}
 
 export interface RenderOptions {
 	className?: string;
 	inline?: boolean;
-	actionCallback?: (content: string, event?: IMouseEvent) => void;
+	actionHandler?: IContentActionHandler;
 	codeBlockRenderer?: (modeId: string, value: string) => Thenable<string>;
 	codeBlockRenderCallback?: () => void;
+	joinRendererConfiguration?: (renderer: MarkedRenderer) => MarkedOptions;
 }
 
 function createElement(options: RenderOptions): HTMLElement {
@@ -37,15 +45,12 @@ export function renderText(text: string, options: RenderOptions = {}): HTMLEleme
 
 export function renderFormattedText(formattedText: string, options: RenderOptions = {}): HTMLElement {
 	const element = createElement(options);
-	_renderFormattedText(element, parseFormattedText(formattedText), options.actionCallback);
+	_renderFormattedText(element, parseFormattedText(formattedText), options.actionHandler);
 	return element;
 }
 
 /**
  * Create html nodes for the given content element.
- *
- * @param content a html element description
- * @param actionCallback a callback function for any action links in the string. Argument is the zero-based index of the clicked action.
  */
 export function renderMarkdown(markdown: IMarkdownString, options: RenderOptions = {}): HTMLElement {
 	const element = createElement(options);
@@ -108,7 +113,7 @@ export function renderMarkdown(markdown: IMarkdownString, options: RenderOptions
 			return text;
 
 		} else {
-			return `<a href="#" data-href="${href}" title="${title || text}">${text}</a>`;
+			return `<a href="#" data-href="${href}" title="${title || href}">${text}</a>`;
 		}
 	};
 	renderer.paragraph = (text): string => {
@@ -139,8 +144,8 @@ export function renderMarkdown(markdown: IMarkdownString, options: RenderOptions
 		};
 	}
 
-	if (options.actionCallback) {
-		DOM.addStandardDisposableListener(element, 'click', event => {
+	if (options.actionHandler) {
+		options.actionHandler.disposeables.push(DOM.addStandardDisposableListener(element, 'click', event => {
 			let target = event.target;
 			if (target.tagName !== 'A') {
 				target = target.parentElement;
@@ -151,15 +156,24 @@ export function renderMarkdown(markdown: IMarkdownString, options: RenderOptions
 
 			const href = target.dataset['href'];
 			if (href) {
-				options.actionCallback(href, event);
+				options.actionHandler.callback(href, event);
 			}
-		});
+		}));
 	}
 
-	element.innerHTML = marked(markdown.value, {
+	const markedOptions: MarkedOptions = {
 		sanitize: true,
 		renderer
-	});
+	};
+
+	if (options.joinRendererConfiguration) {
+		const additionalMarkedOptions = options.joinRendererConfiguration(renderer);
+		if (additionalMarkedOptions) {
+			assign(markedOptions, additionalMarkedOptions);
+		}
+	}
+
+	element.innerHTML = marked(markdown.value, markedOptions);
 	signalInnerHTML();
 
 	return element;
@@ -213,7 +227,7 @@ interface IFormatParseTree {
 	children?: IFormatParseTree[];
 }
 
-function _renderFormattedText(element: Node, treeNode: IFormatParseTree, actionCallback?: (content: string, event?: IMouseEvent) => void) {
+function _renderFormattedText(element: Node, treeNode: IFormatParseTree, actionHandler?: IContentActionHandler) {
 	let child: Node;
 
 	if (treeNode.type === FormatType.Text) {
@@ -225,12 +239,12 @@ function _renderFormattedText(element: Node, treeNode: IFormatParseTree, actionC
 	else if (treeNode.type === FormatType.Italics) {
 		child = document.createElement('i');
 	}
-	else if (treeNode.type === FormatType.Action) {
+	else if (treeNode.type === FormatType.Action && actionHandler) {
 		const a = document.createElement('a');
 		a.href = '#';
-		DOM.addStandardDisposableListener(a, 'click', (event) => {
-			actionCallback(String(treeNode.index), event);
-		});
+		actionHandler.disposeables.push(DOM.addStandardDisposableListener(a, 'click', (event) => {
+			actionHandler.callback(String(treeNode.index), event);
+		}));
 
 		child = a;
 	}
@@ -247,7 +261,7 @@ function _renderFormattedText(element: Node, treeNode: IFormatParseTree, actionC
 
 	if (Array.isArray(treeNode.children)) {
 		treeNode.children.forEach((nodeChild) => {
-			_renderFormattedText(child, nodeChild, actionCallback);
+			_renderFormattedText(child, nodeChild, actionHandler);
 		});
 	}
 }
diff --git a/src/vs/base/browser/ui/button/button.css b/src/vs/base/browser/ui/button/button.css
index 44a56a4e88f..3936ed596c1 100644
--- a/src/vs/base/browser/ui/button/button.css
+++ b/src/vs/base/browser/ui/button/button.css
@@ -20,11 +20,4 @@
 .monaco-button.disabled {
 	opacity: 0.4;
 	cursor: default;
-}
-
-/* Theming support */
-
-.vs .monaco-text-button:focus,
-.vs-dark .monaco-text-button:focus {
-	outline-color: rgba(255, 255, 255, .5); /* buttons have a blue color, so focus indication needs to be different */
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/button/button.ts b/src/vs/base/browser/ui/button/button.ts
index afe338fd065..d8883864b4b 100644
--- a/src/vs/base/browser/ui/button/button.ts
+++ b/src/vs/base/browser/ui/button/button.ts
@@ -43,6 +43,8 @@ export class Button {
 	private _onDidClick = new Emitter<any>();
 	readonly onDidClick: Event<any> = this._onDidClick.event;
 
+	private focusTracker: DOM.IFocusTracker;
+
 	constructor(container: Builder, options?: IButtonOptions);
 	constructor(container: HTMLElement, options?: IButtonOptions);
 	constructor(container: any, options?: IButtonOptions) {
@@ -86,10 +88,7 @@ export class Button {
 
 		this.$el.on(DOM.EventType.MOUSE_OVER, (e) => {
 			if (!this.$el.hasClass('disabled')) {
-				const hoverBackground = this.buttonHoverBackground ? this.buttonHoverBackground.toString() : null;
-				if (hoverBackground) {
-					this.$el.style('background-color', hoverBackground);
-				}
+				this.setHoverBackground();
 			}
 		});
 
@@ -97,9 +96,21 @@ export class Button {
 			this.applyStyles(); // restore standard styles
 		});
 
+		// Also set hover background when button is focused for feedback
+		this.focusTracker = DOM.trackFocus(this.$el.getHTMLElement());
+		this.focusTracker.onDidFocus(() => this.setHoverBackground());
+		this.focusTracker.onDidBlur(() => this.applyStyles()); // restore standard styles
+
 		this.applyStyles();
 	}
 
+	private setHoverBackground(): void {
+		const hoverBackground = this.buttonHoverBackground ? this.buttonHoverBackground.toString() : null;
+		if (hoverBackground) {
+			this.$el.style('background-color', hoverBackground);
+		}
+	}
+
 	style(styles: IButtonStyles): void {
 		this.buttonForeground = styles.buttonForeground;
 		this.buttonBackground = styles.buttonBackground;
@@ -165,6 +176,9 @@ export class Button {
 		if (this.$el) {
 			this.$el.dispose();
 			this.$el = null;
+
+			this.focusTracker.dispose();
+			this.focusTracker = null;
 		}
 
 		this._onDidClick.dispose();
diff --git a/src/vs/base/browser/ui/dropdown/dropdown.css b/src/vs/base/browser/ui/dropdown/dropdown.css
index f48750fa83b..46ec5d50b97 100644
--- a/src/vs/base/browser/ui/dropdown/dropdown.css
+++ b/src/vs/base/browser/ui/dropdown/dropdown.css
@@ -29,8 +29,4 @@
 
 .dropdown > .dropdown-action, .dropdown > .dropdown-action > .action-label {
 	display: inline-block;
-}
-
-.dropdown > .dropdown-label:not(:empty) {
-	padding: 0 .5em;
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/dropdown/dropdown.ts b/src/vs/base/browser/ui/dropdown/dropdown.ts
index b484ad53139..2c34abfca84 100644
--- a/src/vs/base/browser/ui/dropdown/dropdown.ts
+++ b/src/vs/base/browser/ui/dropdown/dropdown.ts
@@ -9,13 +9,14 @@ import 'vs/css!./dropdown';
 import { Builder, $ } from 'vs/base/browser/builder';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Gesture, EventType as GestureEventType } from 'vs/base/browser/touch';
-import { ActionRunner, IAction } from 'vs/base/common/actions';
-import { IActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
+import { ActionRunner, IAction, IActionRunner } from 'vs/base/common/actions';
+import { BaseActionItem, IActionItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
 import { IMenuOptions } from 'vs/base/browser/ui/menu/menu';
 import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
 import { EventHelper, EventType } from 'vs/base/browser/dom';
+import { IContextMenuDelegate } from 'vs/base/browser/contextmenu';
 
 export interface ILabelRenderer {
 	(container: HTMLElement): IDisposable;
@@ -164,16 +165,6 @@ export class Dropdown extends BaseDropdown {
 	}
 }
 
-export interface IContextMenuDelegate {
-	getAnchor(): HTMLElement | { x: number; y: number; };
-	getActions(): TPromise<IAction[]>;
-	getActionItem?(action: IAction): IActionItem;
-	getActionsContext?(): any;
-	getKeyBinding?(action: IAction): ResolvedKeybinding;
-	getMenuClassName?(): string;
-	onHide?(didCancel: boolean): void;
-}
-
 export interface IContextMenuProvider {
 	showContextMenu(delegate: IContextMenuDelegate): void;
 }
@@ -235,11 +226,91 @@ export class DropdownMenu extends BaseDropdown {
 			getActionItem: (action) => this.menuOptions && this.menuOptions.actionItemProvider ? this.menuOptions.actionItemProvider(action) : null,
 			getKeyBinding: (action: IAction) => this.menuOptions && this.menuOptions.getKeyBinding ? this.menuOptions.getKeyBinding(action) : null,
 			getMenuClassName: () => this.menuClassName,
-			onHide: () => this.element.removeClass('active')
+			onHide: () => this.element.removeClass('active'),
+			actionRunner: this.menuOptions ? this.menuOptions.actionRunner : null
 		});
 	}
 
 	public hide(): void {
 		// noop
 	}
+}
+
+export class DropdownMenuActionItem extends BaseActionItem {
+	private menuActionsOrProvider: any;
+	private dropdownMenu: DropdownMenu;
+	private contextMenuProvider: IContextMenuProvider;
+	private actionItemProvider: IActionItemProvider;
+	private keybindings: (action: IAction) => ResolvedKeybinding;
+	private clazz: string;
+
+	constructor(action: IAction, menuActions: IAction[], contextMenuProvider: IContextMenuProvider, actionItemProvider: IActionItemProvider, actionRunner: IActionRunner, keybindings: (action: IAction) => ResolvedKeybinding, clazz: string);
+	constructor(action: IAction, actionProvider: IActionProvider, contextMenuProvider: IContextMenuProvider, actionItemProvider: IActionItemProvider, actionRunner: IActionRunner, keybindings: (action: IAction) => ResolvedKeybinding, clazz: string);
+	constructor(action: IAction, menuActionsOrProvider: any, contextMenuProvider: IContextMenuProvider, actionItemProvider: IActionItemProvider, actionRunner: IActionRunner, keybindings: (action: IAction) => ResolvedKeybinding, clazz: string) {
+		super(null, action);
+
+		this.menuActionsOrProvider = menuActionsOrProvider;
+		this.contextMenuProvider = contextMenuProvider;
+		this.actionItemProvider = actionItemProvider;
+		this.actionRunner = actionRunner;
+		this.keybindings = keybindings;
+		this.clazz = clazz;
+	}
+
+	public render(container: HTMLElement): void {
+		let labelRenderer: ILabelRenderer = (el: HTMLElement): IDisposable => {
+			this.builder = $('a.action-label').attr({
+				tabIndex: '0',
+				role: 'button',
+				'aria-haspopup': 'true',
+				title: this._action.label || '',
+				class: this.clazz
+			});
+
+			this.builder.appendTo(el);
+
+			return null;
+		};
+
+		let options: IDropdownMenuOptions = {
+			contextMenuProvider: this.contextMenuProvider,
+			labelRenderer: labelRenderer
+		};
+
+		// Render the DropdownMenu around a simple action to toggle it
+		if (Array.isArray(this.menuActionsOrProvider)) {
+			options.actions = this.menuActionsOrProvider;
+		} else {
+			options.actionProvider = this.menuActionsOrProvider;
+		}
+
+		this.dropdownMenu = new DropdownMenu(container, options);
+
+		this.dropdownMenu.menuOptions = {
+			actionItemProvider: this.actionItemProvider,
+			actionRunner: this.actionRunner,
+			getKeyBinding: this.keybindings,
+			context: this._context
+		};
+	}
+
+	public setActionContext(newContext: any): void {
+		super.setActionContext(newContext);
+
+		if (this.dropdownMenu) {
+			this.dropdownMenu.menuOptions.context = newContext;
+		}
+	}
+
+	public show(): void {
+		if (this.dropdownMenu) {
+			this.dropdownMenu.show();
+		}
+	}
+
+	public dispose(): void {
+		this.dropdownMenu.dispose();
+
+		super.dispose();
+	}
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/inputbox/inputBox.css b/src/vs/base/browser/ui/inputbox/inputBox.css
index 646ce808b44..df0073541df 100644
--- a/src/vs/base/browser/ui/inputbox/inputBox.css
+++ b/src/vs/base/browser/ui/inputbox/inputBox.css
@@ -99,6 +99,7 @@
 	line-height: 17px;
 	min-height: 34px;
 	margin-top: -1px;
+	word-wrap: break-word;
 }
 
 /* Action bar support */
diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
index ed5bf0ceba4..97e46087653 100644
--- a/src/vs/base/browser/ui/list/listWidget.ts
+++ b/src/vs/base/browser/ui/list/listWidget.ts
@@ -358,6 +358,10 @@ export function isSelectionRangeChangeEvent(event: IListMouseEvent<any> | IListT
 	return event.browserEvent.shiftKey;
 }
 
+function isMouseRightClick(event: UIEvent): boolean {
+	return event instanceof MouseEvent && event.button === 2;
+}
+
 const DefaultMultipleSelectionContoller = {
 	isSelectionSingleChangeEvent,
 	isSelectionRangeChangeEvent
@@ -366,7 +370,7 @@ const DefaultMultipleSelectionContoller = {
 const DefaultOpenController = {
 	shouldOpen: (event: UIEvent) => {
 		if (event instanceof MouseEvent) {
-			return event.button === 0 /* left mouse button */ || event.button === 1 /* middle mouse button */;
+			return !isMouseRightClick(event);
 		}
 
 		return true;
@@ -462,20 +466,23 @@ class MouseController<T> implements IDisposable {
 		}
 
 		let reference = this.list.getFocus()[0];
-		reference = reference === undefined ? this.list.getSelection()[0] : reference;
+		const selection = this.list.getSelection();
+		reference = reference === undefined ? selection[0] : reference;
+
+		const focus = e.index;
+		if (selection.every(s => s !== focus)) {
+			this.list.setFocus([focus]);
+		}
 
 		if (this.multipleSelectionSupport && this.isSelectionRangeChangeEvent(e)) {
 			return this.changeSelection(e, reference);
 		}
 
-		const focus = e.index;
-		this.list.setFocus([focus]);
-
 		if (this.multipleSelectionSupport && this.isSelectionChangeEvent(e)) {
 			return this.changeSelection(e, reference);
 		}
 
-		if (this.options.selectOnMouseDown) {
+		if (this.options.selectOnMouseDown && !isMouseRightClick(e.browserEvent)) {
 			this.list.setSelection([focus]);
 
 			if (this.openController.shouldOpen(e.browserEvent)) {
@@ -1016,6 +1023,7 @@ export class List<T> implements ISpliceable<T>, IDisposable {
 
 		if (styles.listFocusBackground) {
 			content.push(`.monaco-list.${this.idPrefix}:focus .monaco-list-row.focused { background-color: ${styles.listFocusBackground}; }`);
+			content.push(`.monaco-list.${this.idPrefix}:focus .monaco-list-row.focused:hover { background-color: ${styles.listFocusBackground}; }`); // overwrite :hover style in this case!
 		}
 
 		if (styles.listFocusForeground) {
diff --git a/src/vs/base/browser/ui/progressbar/progressbar.ts b/src/vs/base/browser/ui/progressbar/progressbar.ts
index 19e5657414c..f07bd617f7a 100644
--- a/src/vs/base/browser/ui/progressbar/progressbar.ts
+++ b/src/vs/base/browser/ui/progressbar/progressbar.ts
@@ -45,7 +45,9 @@ export class ProgressBar {
 	private animationStopToken: ValueCallback;
 	private progressBarBackground: Color;
 
-	constructor(builder: Builder, options?: IProgressBarOptions) {
+	constructor(container: Builder, options?: IProgressBarOptions);
+	constructor(container: HTMLElement, options?: IProgressBarOptions);
+	constructor(container: any, options?: IProgressBarOptions) {
 		this.options = options || Object.create(null);
 		mixin(this.options, defaultOpts, false);
 
@@ -54,11 +56,13 @@ export class ProgressBar {
 
 		this.progressBarBackground = this.options.progressBarBackground;
 
-		this.create(builder);
+		this.create(container);
 	}
 
-	private create(parent: Builder): void {
-		parent.div({ 'class': css_progress_container }, (builder) => {
+	private create(container: Builder): void;
+	private create(container: HTMLElement): void;
+	private create(container: any): void {
+		$(container).div({ 'class': css_progress_container }, (builder) => {
 			this.element = builder.clone();
 
 			builder.div({ 'class': css_progress_bit }).on([DOM.EventType.ANIMATION_START, DOM.EventType.ANIMATION_END, DOM.EventType.ANIMATION_ITERATION], (e: Event) => {
diff --git a/src/vs/base/browser/ui/sash/sash.ts b/src/vs/base/browser/ui/sash/sash.ts
index 98f01d9ed3c..4da1f7555ae 100644
--- a/src/vs/base/browser/ui/sash/sash.ts
+++ b/src/vs/base/browser/ui/sash/sash.ts
@@ -35,6 +35,7 @@ export interface ISashEvent {
 	currentX: number;
 	startY: number;
 	currentY: number;
+	altKey: boolean;
 }
 
 export interface ISashOptions {
@@ -140,12 +141,14 @@ export class Sash {
 		let mouseDownEvent = new StandardMouseEvent(e);
 		let startX = mouseDownEvent.posx;
 		let startY = mouseDownEvent.posy;
+		const altKey = mouseDownEvent.altKey;
 
 		let startEvent: ISashEvent = {
 			startX: startX,
 			currentX: startX,
 			startY: startY,
-			currentY: startY
+			currentY: startY,
+			altKey
 		};
 
 		this.$e.addClass('active');
@@ -162,7 +165,8 @@ export class Sash {
 				startX: startX,
 				currentX: mouseMoveEvent.posx,
 				startY: startY,
-				currentY: mouseMoveEvent.posy
+				currentY: mouseMoveEvent.posy,
+				altKey
 			};
 
 			this._onDidChange.fire(event);
@@ -190,12 +194,15 @@ export class Sash {
 
 		let startX = event.pageX;
 		let startY = event.pageY;
+		const altKey = event.altKey;
+
 
 		this._onDidStart.fire({
 			startX: startX,
 			currentX: startX,
 			startY: startY,
-			currentY: startY
+			currentY: startY,
+			altKey
 		});
 
 		listeners.push(DOM.addDisposableListener(this.$e.getHTMLElement(), EventType.Change, (event: GestureEvent) => {
@@ -204,7 +211,8 @@ export class Sash {
 					startX: startX,
 					currentX: event.pageX,
 					startY: startY,
-					currentY: event.pageY
+					currentY: event.pageY,
+					altKey
 				});
 			}
 		}));
@@ -368,4 +376,4 @@ export class VSash extends Disposable implements IVerticalSashLayoutProvider {
 			this.sash.layout();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/base/browser/ui/splitview/splitview.ts b/src/vs/base/browser/ui/splitview/splitview.ts
index 833a2180803..0f6501b4cc6 100644
--- a/src/vs/base/browser/ui/splitview/splitview.ts
+++ b/src/vs/base/browser/ui/splitview/splitview.ts
@@ -91,6 +91,8 @@ export class SplitView implements IDisposable {
 
 	private _onDidSashChange = new Emitter<void>();
 	readonly onDidSashChange = this._onDidSashChange.event;
+	private _onDidSashReset = new Emitter<void>();
+	readonly onDidSashReset = this._onDidSashReset.event;
 
 	get length(): number {
 		return this.viewItems.length;
@@ -153,8 +155,10 @@ export class SplitView implements IDisposable {
 			const onSashChangeDisposable = onChange(this.onSashChange, this);
 			const onEnd = mapEvent<void, void>(sash.onDidEnd, () => null);
 			const onEndDisposable = onEnd(() => this._onDidSashChange.fire());
+			const onDidReset = mapEvent<void, void>(sash.onDidReset, () => null);
+			const onDidResetDisposable = onDidReset(() => this._onDidSashReset.fire());
 
-			const disposable = combinedDisposable([onStartDisposable, onSashChangeDisposable, onEndDisposable, sash]);
+			const disposable = combinedDisposable([onStartDisposable, onSashChangeDisposable, onEndDisposable, onDidResetDisposable, sash]);
 			const sashItem: ISashItem = { sash, disposable };
 
 			this.sashItems.splice(index - 1, 0, sashItem);
diff --git a/src/vs/base/browser/ui/toolbar/toolbar.css b/src/vs/base/browser/ui/toolbar/toolbar.css
index 4d91d3f5c9e..6738aeb68fd 100644
--- a/src/vs/base/browser/ui/toolbar/toolbar.css
+++ b/src/vs/base/browser/ui/toolbar/toolbar.css
@@ -3,10 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-.monaco-toolbar .dropdown > .dropdown-label:not(:empty) {
-	padding: 0;
-}
-
 .monaco-toolbar .toolbar-toggle-more {
 	display: inline-block;
 	padding: 0;
diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts
index 7250a642c0d..b195b4d11f3 100644
--- a/src/vs/base/browser/ui/toolbar/toolbar.ts
+++ b/src/vs/base/browser/ui/toolbar/toolbar.ts
@@ -8,12 +8,10 @@
 import 'vs/css!./toolbar';
 import nls = require('vs/nls');
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IDisposable } from 'vs/base/common/lifecycle';
 import { Builder, $ } from 'vs/base/browser/builder';
-import types = require('vs/base/common/types');
 import { Action, IActionRunner, IAction } from 'vs/base/common/actions';
-import { ActionBar, ActionsOrientation, IActionItemProvider, BaseActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IContextMenuProvider, DropdownMenu, IActionProvider, ILabelRenderer, IDropdownMenuOptions } from 'vs/base/browser/ui/dropdown/dropdown';
+import { ActionBar, ActionsOrientation, IActionItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
+import { IContextMenuProvider, DropdownMenuActionItem } from 'vs/base/browser/ui/dropdown/dropdown';
 import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
 
 export const CONTEXT = 'context.toolbar';
@@ -181,83 +179,4 @@ class ToggleMenuAction extends Action {
 	public set menuActions(actions: IAction[]) {
 		this._menuActions = actions;
 	}
-}
-
-export class DropdownMenuActionItem extends BaseActionItem {
-	private menuActionsOrProvider: any;
-	private dropdownMenu: DropdownMenu;
-	private contextMenuProvider: IContextMenuProvider;
-	private actionItemProvider: IActionItemProvider;
-	private keybindings: (action: IAction) => ResolvedKeybinding;
-	private clazz: string;
-
-	constructor(action: IAction, menuActions: IAction[], contextMenuProvider: IContextMenuProvider, actionItemProvider: IActionItemProvider, actionRunner: IActionRunner, keybindings: (action: IAction) => ResolvedKeybinding, clazz: string);
-	constructor(action: IAction, actionProvider: IActionProvider, contextMenuProvider: IContextMenuProvider, actionItemProvider: IActionItemProvider, actionRunner: IActionRunner, keybindings: (action: IAction) => ResolvedKeybinding, clazz: string);
-	constructor(action: IAction, menuActionsOrProvider: any, contextMenuProvider: IContextMenuProvider, actionItemProvider: IActionItemProvider, actionRunner: IActionRunner, keybindings: (action: IAction) => ResolvedKeybinding, clazz: string) {
-		super(null, action);
-
-		this.menuActionsOrProvider = menuActionsOrProvider;
-		this.contextMenuProvider = contextMenuProvider;
-		this.actionItemProvider = actionItemProvider;
-		this.actionRunner = actionRunner;
-		this.keybindings = keybindings;
-		this.clazz = clazz;
-	}
-
-	public render(container: HTMLElement): void {
-		let labelRenderer: ILabelRenderer = (el: HTMLElement): IDisposable => {
-			this.builder = $('a.action-label').attr({
-				tabIndex: '0',
-				role: 'button',
-				'aria-haspopup': 'true',
-				title: this._action.label || '',
-				class: this.clazz
-			});
-
-			this.builder.appendTo(el);
-
-			return null;
-		};
-
-		let options: IDropdownMenuOptions = {
-			contextMenuProvider: this.contextMenuProvider,
-			labelRenderer: labelRenderer
-		};
-
-		// Render the DropdownMenu around a simple action to toggle it
-		if (types.isArray(this.menuActionsOrProvider)) {
-			options.actions = this.menuActionsOrProvider;
-		} else {
-			options.actionProvider = this.menuActionsOrProvider;
-		}
-
-		this.dropdownMenu = new DropdownMenu(container, options);
-
-		this.dropdownMenu.menuOptions = {
-			actionItemProvider: this.actionItemProvider,
-			actionRunner: this.actionRunner,
-			getKeyBinding: this.keybindings,
-			context: this._context
-		};
-	}
-
-	public setActionContext(newContext: any): void {
-		super.setActionContext(newContext);
-
-		if (this.dropdownMenu) {
-			this.dropdownMenu.menuOptions.context = newContext;
-		}
-	}
-
-	public show(): void {
-		if (this.dropdownMenu) {
-			this.dropdownMenu.show();
-		}
-	}
-
-	public dispose(): void {
-		this.dropdownMenu.dispose();
-
-		super.dispose();
-	}
 }
\ No newline at end of file
diff --git a/src/vs/base/common/actions.ts b/src/vs/base/common/actions.ts
index bf62845dc0d..691139b6c2f 100644
--- a/src/vs/base/common/actions.ts
+++ b/src/vs/base/common/actions.ts
@@ -233,6 +233,7 @@ export class ActionRunner implements IActionRunner {
 	}
 
 	public dispose(): void {
-		// noop
+		this._onDidBeforeRun.dispose();
+		this._onDidRun.dispose();
 	}
 }
diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts
index 93c6dda80c2..34247aa7796 100644
--- a/src/vs/base/common/async.ts
+++ b/src/vs/base/common/async.ts
@@ -6,7 +6,6 @@
 'use strict';
 
 import * as errors from 'vs/base/common/errors';
-import * as platform from 'vs/base/common/platform';
 import { Promise, TPromise, ValueCallback, ErrorCallback, ProgressCallback } from 'vs/base/common/winjs.base';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
@@ -525,7 +524,7 @@ export function setDisposableTimeout(handler: Function, timeout: number, ...args
 }
 
 export class TimeoutTimer extends Disposable {
-	private _token: platform.TimeoutToken;
+	private _token: number;
 
 	constructor() {
 		super();
@@ -539,14 +538,14 @@ export class TimeoutTimer extends Disposable {
 
 	cancel(): void {
 		if (this._token !== -1) {
-			platform.clearTimeout(this._token);
+			clearTimeout(this._token);
 			this._token = -1;
 		}
 	}
 
 	cancelAndSet(runner: () => void, timeout: number): void {
 		this.cancel();
-		this._token = platform.setTimeout(() => {
+		this._token = setTimeout(() => {
 			this._token = -1;
 			runner();
 		}, timeout);
@@ -557,7 +556,7 @@ export class TimeoutTimer extends Disposable {
 			// timer is already set
 			return;
 		}
-		this._token = platform.setTimeout(() => {
+		this._token = setTimeout(() => {
 			this._token = -1;
 			runner();
 		}, timeout);
@@ -566,7 +565,7 @@ export class TimeoutTimer extends Disposable {
 
 export class IntervalTimer extends Disposable {
 
-	private _token: platform.IntervalToken;
+	private _token: number;
 
 	constructor() {
 		super();
@@ -580,14 +579,14 @@ export class IntervalTimer extends Disposable {
 
 	cancel(): void {
 		if (this._token !== -1) {
-			platform.clearInterval(this._token);
+			clearInterval(this._token);
 			this._token = -1;
 		}
 	}
 
 	cancelAndSet(runner: () => void, interval: number): void {
 		this.cancel();
-		this._token = platform.setInterval(() => {
+		this._token = setInterval(() => {
 			runner();
 		}, interval);
 	}
@@ -595,7 +594,7 @@ export class IntervalTimer extends Disposable {
 
 export class RunOnceScheduler {
 
-	private timeoutToken: platform.TimeoutToken;
+	private timeoutToken: number;
 	private runner: () => void;
 	private timeout: number;
 	private timeoutHandler: () => void;
@@ -620,7 +619,7 @@ export class RunOnceScheduler {
 	 */
 	cancel(): void {
 		if (this.isScheduled()) {
-			platform.clearTimeout(this.timeoutToken);
+			clearTimeout(this.timeoutToken);
 			this.timeoutToken = -1;
 		}
 	}
@@ -630,7 +629,7 @@ export class RunOnceScheduler {
 	 */
 	schedule(delay = this.timeout): void {
 		this.cancel();
-		this.timeoutToken = platform.setTimeout(this.timeoutHandler, delay);
+		this.timeoutToken = setTimeout(this.timeoutHandler, delay);
 	}
 
 	/**
diff --git a/src/vs/base/common/diagnostics.ts b/src/vs/base/common/diagnostics.ts
index 66c522cb3a7..7ad7daa18d4 100644
--- a/src/vs/base/common/diagnostics.ts
+++ b/src/vs/base/common/diagnostics.ts
@@ -62,7 +62,7 @@ export function register(what: string, fn: Function): (...args: any[]) => void {
 				const thisArguments = allArgs.shift();
 				fn.apply(fn, thisArguments);
 				if (allArgs.length > 0) {
-					Platform.setTimeout(doIt, 500);
+					setTimeout(doIt, 500);
 				}
 			};
 			doIt();
diff --git a/src/vs/base/common/errors.ts b/src/vs/base/common/errors.ts
index 1d3502e4801..46b7f230ff8 100644
--- a/src/vs/base/common/errors.ts
+++ b/src/vs/base/common/errors.ts
@@ -4,10 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import platform = require('vs/base/common/platform');
-import types = require('vs/base/common/types');
 import { IAction } from 'vs/base/common/actions';
-import Severity from 'vs/base/common/severity';
 import { TPromise, IPromiseError, IPromiseErrorDetail } from 'vs/base/common/winjs.base';
 
 // ------ BEGIN Hook up error listeners to winjs promises
@@ -79,7 +76,7 @@ export class ErrorHandler {
 		this.listeners = [];
 
 		this.unexpectedErrorHandler = function (e: any) {
-			platform.setTimeout(() => {
+			setTimeout(() => {
 				if (e.stack) {
 					throw new Error(e.message + '\n\n' + e.stack);
 				}
@@ -238,19 +235,22 @@ export function disposed(what: string): Error {
 }
 
 export interface IErrorOptions {
-	severity?: Severity;
 	actions?: IAction[];
 }
 
-export function create(message: string, options: IErrorOptions = {}): Error {
-	let result = new Error(message);
+export interface IErrorWithActions {
+	actions?: IAction[];
+}
 
-	if (types.isNumber(options.severity)) {
-		(<any>result).severity = options.severity;
-	}
+export function isErrorWithActions(obj: any): obj is IErrorWithActions {
+	return obj instanceof Error && Array.isArray((obj as IErrorWithActions).actions);
+}
+
+export function create(message: string, options: IErrorOptions = Object.create(null)): Error & IErrorWithActions {
+	const result = new Error(message);
 
 	if (options.actions) {
-		(<any>result).actions = options.actions;
+		(<IErrorWithActions>result).actions = options.actions;
 	}
 
 	return result;
diff --git a/src/vs/base/common/marked/OSSREADME.json b/src/vs/base/common/marked/OSSREADME.json
index 5bfc34a583b..010e42bd7b8 100644
--- a/src/vs/base/common/marked/OSSREADME.json
+++ b/src/vs/base/common/marked/OSSREADME.json
@@ -3,6 +3,6 @@
 [{
 	"name": "chjj-marked",
 	"repositoryURL": "https://github.com/npmcomponent/chjj-marked",
-	"version": "0.3.6",
+	"version": "0.3.12",
 	"license": "MIT"
 }]
diff --git a/src/vs/base/common/marked/raw.marked.js b/src/vs/base/common/marked/raw.marked.js
index 0ee6a3b1e6a..d00c4e2bb55 100644
--- a/src/vs/base/common/marked/raw.marked.js
+++ b/src/vs/base/common/marked/raw.marked.js
@@ -16,19 +16,26 @@ var block = {
   newline: /^\n+/,
   code: /^( {4}[^\n]+\n*)+/,
   fences: noop,
-  hr: /^( *[-*_]){3,} *(?:\n+|$)/,
+  hr: /^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,
   heading: /^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,
   nptable: noop,
-  lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,
-  blockquote: /^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,
+  blockquote: /^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,
   list: /^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,
   html: /^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/,
-  def: /^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,
+  def: /^ {0,3}\[(label)\]: *\n? *<?([^\s>]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,
   table: noop,
-  paragraph: /^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,
+  lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,
+  paragraph: /^([^\n]+(?:\n?(?!hr|heading|lheading| {0,3}>|tag)[^\n]+)+)/,
   text: /^[^\n]+/
 };
 
+block._label = /(?:\\[\[\]]|[^\[\]])+/;
+block._title = /(?:"(?:\\"|[^"]|"[^"\n]*")*"|'\n?(?:[^'\n]+\n?)*'|\([^()]*\))/;
+block.def = replace(block.def)
+  ('label', block._label)
+  ('title', block._title)
+  ();
+
 block.bullet = /(?:[*+-]|\d+\.)/;
 block.item = /^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/;
 block.item = replace(block.item, 'gm')
@@ -37,23 +44,19 @@ block.item = replace(block.item, 'gm')
 
 block.list = replace(block.list)
   (/bull/g, block.bullet)
-  ('hr', '\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))')
+  ('hr', '\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))')
   ('def', '\\n+(?=' + block.def.source + ')')
   ();
 
-block.blockquote = replace(block.blockquote)
-  ('def', block.def)
-  ();
-
 block._tag = '(?!(?:'
   + 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code'
   + '|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo'
-  + '|span|br|wbr|ins|del|img)\\b)\\w+(?!:/|[^\\w\\s@]*@)\\b';
+  + '|span|br|wbr|ins|del|img)\\b)\\w+(?!:|[^\\w\\s@]*@)\\b';
 
 block.html = replace(block.html)
   ('comment', /<!--[\s\S]*?-->/)
   ('closed', /<(tag)[\s\S]+?<\/\1>/)
-  ('closing', /<tag(?:"[^"]*"|'[^']*'|[^'">])*?>/)
+  ('closing', /<tag(?:"[^"]*"|'[^']*'|\s[^'"\/>]*)*?\/?>/)
   (/tag/g, block._tag)
   ();
 
@@ -61,9 +64,11 @@ block.paragraph = replace(block.paragraph)
   ('hr', block.hr)
   ('heading', block.heading)
   ('lheading', block.lheading)
-  ('blockquote', block.blockquote)
   ('tag', '<' + block._tag)
-  ('def', block.def)
+  ();
+
+block.blockquote = replace(block.blockquote)
+  ('paragraph', block.paragraph)
   ();
 
 /**
@@ -77,15 +82,15 @@ block.normal = merge({}, block);
  */
 
 block.gfm = merge({}, block.normal, {
-  fences: /^ *(`{3,}|~{3,})[ \.]*(\S+)? *\n([\s\S]*?)\s*\1 *(?:\n+|$)/,
+  fences: /^ *(`{3,}|~{3,})[ \.]*(\S+)? *\n([\s\S]*?)\n? *\1 *(?:\n+|$)/,
   paragraph: /^/,
   heading: /^ *(#{1,6}) +([^\n]+?) *#* *(?:\n+|$)/
 });
 
 block.gfm.paragraph = replace(block.paragraph)
   ('(?!', '(?!'
-    + block.gfm.fences.source.replace('\\1', '\\2') + '|'
-    + block.list.source.replace('\\1', '\\3') + '|')
+  + block.gfm.fences.source.replace('\\1', '\\2') + '|'
+  + block.list.source.replace('\\1', '\\3') + '|')
   ();
 
 /**
@@ -126,7 +131,7 @@ Lexer.rules = block;
  * Static Lex Method
  */
 
-Lexer.lex = function(src, options) {
+Lexer.lex = function (src, options) {
   var lexer = new Lexer(options);
   return lexer.lex(src);
 };
@@ -135,7 +140,7 @@ Lexer.lex = function(src, options) {
  * Preprocessing
  */
 
-Lexer.prototype.lex = function(src) {
+Lexer.prototype.lex = function (src) {
   src = src
     .replace(/\r\n|\r/g, '\n')
     .replace(/\t/g, '    ')
@@ -149,7 +154,7 @@ Lexer.prototype.lex = function(src) {
  * Lexing
  */
 
-Lexer.prototype.token = function(src, top, bq) {
+Lexer.prototype.token = function (src, top) {
   var src = src.replace(/^ +$/gm, '')
     , next
     , loose
@@ -159,6 +164,7 @@ Lexer.prototype.token = function(src, top, bq) {
     , item
     , space
     , i
+    , tag
     , l;
 
   while (src) {
@@ -239,17 +245,6 @@ Lexer.prototype.token = function(src, top, bq) {
       continue;
     }
 
-    // lheading
-    if (cap = this.rules.lheading.exec(src)) {
-      src = src.substring(cap[0].length);
-      this.tokens.push({
-        type: 'heading',
-        depth: cap[2] === '=' ? 1 : 2,
-        text: cap[1]
-      });
-      continue;
-    }
-
     // hr
     if (cap = this.rules.hr.exec(src)) {
       src = src.substring(cap[0].length);
@@ -272,7 +267,7 @@ Lexer.prototype.token = function(src, top, bq) {
       // Pass `top` to keep the current
       // "toplevel" state. This is exactly
       // how markdown.pl works.
-      this.token(cap, top, true);
+      this.token(cap, top);
 
       this.tokens.push({
         type: 'blockquote_end'
@@ -341,7 +336,7 @@ Lexer.prototype.token = function(src, top, bq) {
         });
 
         // Recurse.
-        this.token(item, false, bq);
+        this.token(item, false);
 
         this.tokens.push({
           type: 'list_item_end'
@@ -370,12 +365,16 @@ Lexer.prototype.token = function(src, top, bq) {
     }
 
     // def
-    if ((!bq && top) && (cap = this.rules.def.exec(src))) {
+    if (top && (cap = this.rules.def.exec(src))) {
       src = src.substring(cap[0].length);
-      this.tokens.links[cap[1].toLowerCase()] = {
-        href: cap[2],
-        title: cap[3]
-      };
+      if (cap[3]) cap[3] = cap[3].substring(1, cap[3].length - 1);
+      tag = cap[1].toLowerCase();
+      if (!this.tokens.links[tag]) {
+        this.tokens.links[tag] = {
+          href: cap[2],
+          title: cap[3]
+        };
+      }
       continue;
     }
 
@@ -413,6 +412,17 @@ Lexer.prototype.token = function(src, top, bq) {
       continue;
     }
 
+    // lheading
+    if (cap = this.rules.lheading.exec(src)) {
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: 'heading',
+        depth: cap[2] === '=' ? 1 : 2,
+        text: cap[1]
+      });
+      continue;
+    }
+
     // top-level paragraph
     if (top && (cap = this.rules.paragraph.exec(src))) {
       src = src.substring(cap[0].length);
@@ -451,21 +461,29 @@ Lexer.prototype.token = function(src, top, bq) {
 
 var inline = {
   escape: /^\\([\\`*{}\[\]()#+\-.!_>])/,
-  autolink: /^<([^ >]+(@|:\/)[^ >]+)>/,
+  autolink: /^<(scheme:[^\s\x00-\x1f<>]*|email)>/,
   url: noop,
-  tag: /^<!--[\s\S]*?-->|^<\/?\w+(?:"[^"]*"|'[^']*'|[^'">])*?>/,
+  tag: /^<!--[\s\S]*?-->|^<\/?[a-zA-Z0-9\-]+(?:"[^"]*"|'[^']*'|\s[^<'">\/]*)*?\/?>/,
   link: /^!?\[(inside)\]\(href\)/,
   reflink: /^!?\[(inside)\]\s*\[([^\]]*)\]/,
-  nolink: /^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,
+  nolink: /^!?\[((?:\[[^\]]*\]|\\[\[\]]|[^\[\]])*)\]/,
   strong: /^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,
-  em: /^\b_((?:[^_]|__)+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,
-  code: /^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,
+  em: /^_([^\s_](?:[^_]|__)+?[^\s_])_\b|^\*((?:\*\*|[^*])+?)\*(?!\*)/,
+  code: /^(`+)(\s*)([\s\S]*?[^`]?)\2\1(?!`)/,
   br: /^ {2,}\n(?!\s*$)/,
   del: noop,
-  text: /^[\s\S]+?(?=[\\<!\[_*`]| {2,}\n|$)/
+  text: /^[\s\S]+?(?=[\\<!\[`*]|\b_| {2,}\n|$)/
 };
 
-inline._inside = /(?:\[[^\]]*\]|[^\[\]]|\](?=[^\[]*\]))*/;
+inline._scheme = /[a-zA-Z][a-zA-Z0-9+.-]{1,31}/;
+inline._email = /[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/;
+
+inline.autolink = replace(inline.autolink)
+  ('scheme', inline._scheme)
+  ('email', inline._email)
+  ()
+
+inline._inside = /(?:\[[^\]]*\]|\\[\[\]]|[^\[\]]|\](?=[^\[]*\]))*/;
 inline._href = /\s*<?([\s\S]*?)>?(?:\s+['"]([\s\S]*?)['"])?\s*/;
 
 inline.link = replace(inline.link)
@@ -498,11 +516,14 @@ inline.pedantic = merge({}, inline.normal, {
 
 inline.gfm = merge({}, inline.normal, {
   escape: replace(inline.escape)('])', '~|])')(),
-  url: /^(https?:\/\/[^\s<]+[^<.,:;"')\]\s])/,
+  url: replace(/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/)
+    ('email', inline._email)
+    (),
+  _backpedal: /(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,
   del: /^~~(?=\S)([\s\S]*?\S)~~/,
   text: replace(inline.text)
     (']|', '~]|')
-    ('|', '|https?://|')
+    ('|', '|https?://|ftp://|www\\.|[a-zA-Z0-9.!#$%&\'*+/=?^_`{\\|}~-]+@|')
     ()
 });
 
@@ -552,7 +573,7 @@ InlineLexer.rules = inline;
  * Static Lexing/Compiling Method
  */
 
-InlineLexer.output = function(src, links, options) {
+InlineLexer.output = function (src, links, options) {
   var inline = new InlineLexer(links, options);
   return inline.output(src);
 };
@@ -561,7 +582,7 @@ InlineLexer.output = function(src, links, options) {
  * Lexing/Compiling
  */
 
-InlineLexer.prototype.output = function(src) {
+InlineLexer.prototype.output = function (src) {
   var out = ''
     , link
     , text
@@ -580,10 +601,8 @@ InlineLexer.prototype.output = function(src) {
     if (cap = this.rules.autolink.exec(src)) {
       src = src.substring(cap[0].length);
       if (cap[2] === '@') {
-        text = cap[1].charAt(6) === ':'
-          ? this.mangle(cap[1].substring(7))
-          : this.mangle(cap[1]);
-        href = this.mangle('mailto:') + text;
+        text = escape(this.mangle(cap[1]));
+        href = 'mailto:' + text;
       } else {
         text = escape(cap[1]);
         href = text;
@@ -594,9 +613,19 @@ InlineLexer.prototype.output = function(src) {
 
     // url (gfm)
     if (!this.inLink && (cap = this.rules.url.exec(src))) {
+      cap[0] = this.rules._backpedal.exec(cap[0])[0];
       src = src.substring(cap[0].length);
-      text = escape(cap[1]);
-      href = text;
+      if (cap[2] === '@') {
+        text = escape(cap[0]);
+        href = 'mailto:' + text;
+      } else {
+        text = escape(cap[0]);
+        if (cap[1] === 'www.') {
+          href = 'http://' + text;
+        } else {
+          href = text;
+        }
+      }
       out += this.renderer.link(href, null, text);
       continue;
     }
@@ -631,7 +660,7 @@ InlineLexer.prototype.output = function(src) {
 
     // reflink, nolink
     if ((cap = this.rules.reflink.exec(src))
-        || (cap = this.rules.nolink.exec(src))) {
+      || (cap = this.rules.nolink.exec(src))) {
       src = src.substring(cap[0].length);
       link = (cap[2] || cap[1]).replace(/\s+/g, ' ');
       link = this.links[link.toLowerCase()];
@@ -663,7 +692,7 @@ InlineLexer.prototype.output = function(src) {
     // code
     if (cap = this.rules.code.exec(src)) {
       src = src.substring(cap[0].length);
-      out += this.renderer.codespan(escape(cap[2], true));
+      out += this.renderer.codespan(escape(cap[3].trim(), true));
       continue;
     }
 
@@ -701,7 +730,7 @@ InlineLexer.prototype.output = function(src) {
  * Compile Link
  */
 
-InlineLexer.prototype.outputLink = function(cap, link) {
+InlineLexer.prototype.outputLink = function (cap, link) {
   var href = escape(link.href)
     , title = link.title ? escape(link.title) : null;
 
@@ -714,7 +743,7 @@ InlineLexer.prototype.outputLink = function(cap, link) {
  * Smartypants Transformations
  */
 
-InlineLexer.prototype.smartypants = function(text) {
+InlineLexer.prototype.smartypants = function (text) {
   if (!this.options.smartypants) return text;
   return text
     // em-dashes
@@ -737,7 +766,7 @@ InlineLexer.prototype.smartypants = function(text) {
  * Mangle Links
  */
 
-InlineLexer.prototype.mangle = function(text) {
+InlineLexer.prototype.mangle = function (text) {
   if (!this.options.mangle) return text;
   var out = ''
     , l = text.length
@@ -763,7 +792,7 @@ function Renderer(options) {
   this.options = options || {};
 }
 
-Renderer.prototype.code = function(code, lang, escaped) {
+Renderer.prototype.code = function (code, lang, escaped) {
   if (this.options.highlight) {
     var out = this.options.highlight(code, lang);
     if (out != null && out !== code) {
@@ -786,15 +815,15 @@ Renderer.prototype.code = function(code, lang, escaped) {
     + '\n</code></pre>\n';
 };
 
-Renderer.prototype.blockquote = function(quote) {
+Renderer.prototype.blockquote = function (quote) {
   return '<blockquote>\n' + quote + '</blockquote>\n';
 };
 
-Renderer.prototype.html = function(html) {
+Renderer.prototype.html = function (html) {
   return html;
 };
 
-Renderer.prototype.heading = function(text, level, raw) {
+Renderer.prototype.heading = function (text, level, raw) {
   return '<h'
     + level
     + ' id="'
@@ -807,24 +836,24 @@ Renderer.prototype.heading = function(text, level, raw) {
     + '>\n';
 };
 
-Renderer.prototype.hr = function() {
+Renderer.prototype.hr = function () {
   return this.options.xhtml ? '<hr/>\n' : '<hr>\n';
 };
 
-Renderer.prototype.list = function(body, ordered) {
+Renderer.prototype.list = function (body, ordered) {
   var type = ordered ? 'ol' : 'ul';
   return '<' + type + '>\n' + body + '</' + type + '>\n';
 };
 
-Renderer.prototype.listitem = function(text) {
+Renderer.prototype.listitem = function (text) {
   return '<li>' + text + '</li>\n';
 };
 
-Renderer.prototype.paragraph = function(text) {
+Renderer.prototype.paragraph = function (text) {
   return '<p>' + text + '</p>\n';
 };
 
-Renderer.prototype.table = function(header, body) {
+Renderer.prototype.table = function (header, body) {
   return '<table>\n'
     + '<thead>\n'
     + header
@@ -835,11 +864,11 @@ Renderer.prototype.table = function(header, body) {
     + '</table>\n';
 };
 
-Renderer.prototype.tablerow = function(content) {
+Renderer.prototype.tablerow = function (content) {
   return '<tr>\n' + content + '</tr>\n';
 };
 
-Renderer.prototype.tablecell = function(content, flags) {
+Renderer.prototype.tablecell = function (content, flags) {
   var type = flags.header ? 'th' : 'td';
   var tag = flags.align
     ? '<' + type + ' style="text-align:' + flags.align + '">'
@@ -848,39 +877,42 @@ Renderer.prototype.tablecell = function(content, flags) {
 };
 
 // span level renderer
-Renderer.prototype.strong = function(text) {
+Renderer.prototype.strong = function (text) {
   return '<strong>' + text + '</strong>';
 };
 
-Renderer.prototype.em = function(text) {
+Renderer.prototype.em = function (text) {
   return '<em>' + text + '</em>';
 };
 
-Renderer.prototype.codespan = function(text) {
+Renderer.prototype.codespan = function (text) {
   return '<code>' + text + '</code>';
 };
 
-Renderer.prototype.br = function() {
+Renderer.prototype.br = function () {
   return this.options.xhtml ? '<br/>' : '<br>';
 };
 
-Renderer.prototype.del = function(text) {
+Renderer.prototype.del = function (text) {
   return '<del>' + text + '</del>';
 };
 
-Renderer.prototype.link = function(href, title, text) {
+Renderer.prototype.link = function (href, title, text) {
   if (this.options.sanitize) {
     try {
       var prot = decodeURIComponent(unescape(href))
         .replace(/[^\w:]/g, '')
         .toLowerCase();
     } catch (e) {
-      return '';
+      return text;
     }
     if (prot.indexOf('javascript:') === 0 || prot.indexOf('vbscript:') === 0 || prot.indexOf('data:') === 0) {
-      return '';
+      return text;
     }
   }
+  if (this.options.baseUrl && !originIndependentUrl.test(href)) {
+    href = resolveUrl(this.options.baseUrl, href);
+  }
   var out = '<a href="' + href + '"';
   if (title) {
     out += ' title="' + title + '"';
@@ -889,7 +921,10 @@ Renderer.prototype.link = function(href, title, text) {
   return out;
 };
 
-Renderer.prototype.image = function(href, title, text) {
+Renderer.prototype.image = function (href, title, text) {
+  if (this.options.baseUrl && !originIndependentUrl.test(href)) {
+    href = resolveUrl(this.options.baseUrl, href);
+  }
   var out = '<img src="' + href + '" alt="' + text + '"';
   if (title) {
     out += ' title="' + title + '"';
@@ -898,10 +933,36 @@ Renderer.prototype.image = function(href, title, text) {
   return out;
 };
 
-Renderer.prototype.text = function(text) {
+Renderer.prototype.text = function (text) {
   return text;
 };
 
+/**
+ * TextRenderer
+ * returns only the textual part of the token
+ */
+
+function TextRenderer() { }
+
+// no need for block level renderers
+
+TextRenderer.prototype.strong =
+  TextRenderer.prototype.em =
+  TextRenderer.prototype.codespan =
+  TextRenderer.prototype.del =
+  TextRenderer.prototype.text = function (text) {
+    return text;
+  }
+
+TextRenderer.prototype.link =
+  TextRenderer.prototype.image = function (href, title, text) {
+    return '' + text;
+  }
+
+TextRenderer.prototype.br = function () {
+  return '';
+}
+
 /**
  * Parsing & Compiling
  */
@@ -919,8 +980,8 @@ function Parser(options) {
  * Static Parse Method
  */
 
-Parser.parse = function(src, options, renderer) {
-  var parser = new Parser(options, renderer);
+Parser.parse = function (src, options) {
+  var parser = new Parser(options);
   return parser.parse(src);
 };
 
@@ -928,8 +989,10 @@ Parser.parse = function(src, options, renderer) {
  * Parse Loop
  */
 
-Parser.prototype.parse = function(src) {
-  this.inline = new InlineLexer(src.links, this.options, this.renderer);
+Parser.prototype.parse = function (src) {
+  this.inline = new InlineLexer(src.links, this.options);
+  // use an InlineLexer with a TextRenderer to extract pure text
+  this.inlineText = new InlineLexer(src.links, merge({}, this.options, { renderer: new TextRenderer }));
   this.tokens = src.reverse();
 
   var out = '';
@@ -944,7 +1007,7 @@ Parser.prototype.parse = function(src) {
  * Next Token
  */
 
-Parser.prototype.next = function() {
+Parser.prototype.next = function () {
   return this.token = this.tokens.pop();
 };
 
@@ -952,7 +1015,7 @@ Parser.prototype.next = function() {
  * Preview Next Token
  */
 
-Parser.prototype.peek = function() {
+Parser.prototype.peek = function () {
   return this.tokens[this.tokens.length - 1] || 0;
 };
 
@@ -960,7 +1023,7 @@ Parser.prototype.peek = function() {
  * Parse Text Tokens
  */
 
-Parser.prototype.parseText = function() {
+Parser.prototype.parseText = function () {
   var body = this.token.text;
 
   while (this.peek().type === 'text') {
@@ -974,7 +1037,7 @@ Parser.prototype.parseText = function() {
  * Parse Current Token
  */
 
-Parser.prototype.tok = function() {
+Parser.prototype.tok = function () {
   switch (this.token.type) {
     case 'space': {
       return '';
@@ -986,7 +1049,7 @@ Parser.prototype.tok = function() {
       return this.renderer.heading(
         this.inline.output(this.token.text),
         this.token.depth,
-        this.token.text);
+        unescape(this.inlineText.output(this.token.text)));
     }
     case 'code': {
       return this.renderer.code(this.token.text,
@@ -999,13 +1062,11 @@ Parser.prototype.tok = function() {
         , i
         , row
         , cell
-        , flags
         , j;
 
       // header
       cell = '';
       for (i = 0; i < this.token.header.length; i++) {
-        flags = { header: true, align: this.token.align[i] };
         cell += this.renderer.tablecell(
           this.inline.output(this.token.header[i]),
           { header: true, align: this.token.align[i] }
@@ -1096,8 +1157,8 @@ function escape(html, encode) {
 }
 
 function unescape(html) {
-	// explicitly match decimal, hex, and named HTML entities
-  return html.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/g, function(_, n) {
+  // explicitly match decimal, hex, and named HTML entities
+  return html.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/ig, function (_, n) {
     n = n.toLowerCase();
     if (n === 'colon') return ':';
     if (n.charAt(0) === '#') {
@@ -1121,7 +1182,31 @@ function replace(regex, opt) {
   };
 }
 
-function noop() {}
+function resolveUrl(base, href) {
+  if (!baseUrls[' ' + base]) {
+    // we can ignore everything in base after the last slash of its path component,
+    // but we might need to add _that_
+    // https://tools.ietf.org/html/rfc3986#section-3
+    if (/^[^:]+:\/*[^/]*$/.test(base)) {
+      baseUrls[' ' + base] = base + '/';
+    } else {
+      baseUrls[' ' + base] = base.replace(/[^/]*$/, '');
+    }
+  }
+  base = baseUrls[' ' + base];
+
+  if (href.slice(0, 2) === '//') {
+    return base.replace(/:[\s\S]*/, ':') + href;
+  } else if (href.charAt(0) === '/') {
+    return base.replace(/(:\/*[^/]*)[\s\S]*/, '$1') + href;
+  } else {
+    return base + href;
+  }
+}
+var baseUrls = {};
+var originIndependentUrl = /^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;
+
+function noop() { }
 noop.exec = noop;
 
 function merge(obj) {
@@ -1147,6 +1232,14 @@ function merge(obj) {
  */
 
 function marked(src, opt, callback) {
+  // throw error in case of non string input
+  if (typeof src == 'undefined' || src === null)
+    throw new Error('marked(): input parameter is undefined or null');
+  if (typeof src != 'string')
+    throw new Error('marked(): input parameter is of type ' +
+      Object.prototype.toString.call(src) + ', string expected');
+
+
   if (callback || typeof opt === 'function') {
     if (!callback) {
       callback = opt;
@@ -1168,7 +1261,7 @@ function marked(src, opt, callback) {
 
     pending = tokens.length;
 
-    var done = function(err) {
+    var done = function (err) {
       if (err) {
         opt.highlight = highlight;
         return callback(err);
@@ -1198,11 +1291,11 @@ function marked(src, opt, callback) {
     if (!pending) return done();
 
     for (; i < tokens.length; i++) {
-      (function(token) {
+      (function (token) {
         if (token.type !== 'code') {
           return --pending || done();
         }
-        return highlight(token.text, token.lang, function(err, code) {
+        return highlight(token.text, token.lang, function (err, code) {
           if (err) return done(err);
           if (code == null || code === token.text) {
             return --pending || done();
@@ -1235,10 +1328,10 @@ function marked(src, opt, callback) {
  */
 
 marked.options =
-marked.setOptions = function(opt) {
-  merge(marked.defaults, opt);
-  return marked;
-};
+  marked.setOptions = function (opt) {
+    merge(marked.defaults, opt);
+    return marked;
+  };
 
 marked.defaults = {
   gfm: true,
@@ -1255,7 +1348,8 @@ marked.defaults = {
   smartypants: false,
   headerPrefix: '',
   renderer: new Renderer,
-  xhtml: false
+  xhtml: false,
+  baseUrl: null
 };
 
 /**
@@ -1266,6 +1360,7 @@ marked.Parser = Parser;
 marked.parser = Parser.parse;
 
 marked.Renderer = Renderer;
+marked.TextRenderer = TextRenderer;
 
 marked.Lexer = Lexer;
 marked.lexer = Lexer.lex;
diff --git a/src/vs/base/common/performance.js b/src/vs/base/common/performance.js
index a7ebc4c627c..a2646638ed0 100644
--- a/src/vs/base/common/performance.js
+++ b/src/vs/base/common/performance.js
@@ -11,7 +11,6 @@
 // Because we want both instances to use the same perf-data
 // we store them globally
 // stores data as 'type','name','startTime','duration'
-global._performanceEntries = global._performanceEntries || [];
 
 if (typeof define !== "function" && typeof module === "object" && typeof module.exports === "object") {
 	// this is commonjs, fake amd
@@ -23,6 +22,12 @@ if (typeof define !== "function" && typeof module === "object" && typeof module.
 
 define([], function () {
 
+	var _global = this;
+	if (typeof global !== 'undefined') {
+		_global = global;
+	}
+	_global._performanceEntries = _global._performanceEntries || [];
+
 	// const _now = global.performance && performance.now ? performance.now : Date.now
 	const _now = Date.now;
 
diff --git a/src/vs/base/common/platform.ts b/src/vs/base/common/platform.ts
index 0306de78a92..5bee1d98f35 100644
--- a/src/vs/base/common/platform.ts
+++ b/src/vs/base/common/platform.ts
@@ -4,12 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-// --- THIS FILE IS TEMPORARY UNTIL ENV.TS IS CLEANED UP. IT CAN SAFELY BE USED IN ALL TARGET EXECUTION ENVIRONMENTS (node & dom) ---
-
 let _isWindows = false;
 let _isMacintosh = false;
 let _isLinux = false;
-let _isRootUser = false;
 let _isNative = false;
 let _isWeb = false;
 let _locale: string = undefined;
@@ -48,12 +45,11 @@ if (typeof process === 'object') {
 	_isWindows = (process.platform === 'win32');
 	_isMacintosh = (process.platform === 'darwin');
 	_isLinux = (process.platform === 'linux');
-	_isRootUser = !_isWindows && (process.getuid() === 0);
-	let rawNlsConfig = process.env['VSCODE_NLS_CONFIG'];
+	const rawNlsConfig = process.env['VSCODE_NLS_CONFIG'];
 	if (rawNlsConfig) {
 		try {
-			let nlsConfig: NLSConfig = JSON.parse(rawNlsConfig);
-			let resolved = nlsConfig.availableLanguages['*'];
+			const nlsConfig: NLSConfig = JSON.parse(rawNlsConfig);
+			const resolved = nlsConfig.availableLanguages['*'];
 			_locale = nlsConfig.locale;
 			// VSCode's default language is 'en'
 			_language = resolved ? resolved : LANGUAGE_DEFAULT;
@@ -63,7 +59,7 @@ if (typeof process === 'object') {
 	}
 	_isNative = true;
 } else if (typeof navigator === 'object') {
-	let userAgent = navigator.userAgent;
+	const userAgent = navigator.userAgent;
 	_isWindows = userAgent.indexOf('Windows') >= 0;
 	_isMacintosh = userAgent.indexOf('Macintosh') >= 0;
 	_isLinux = userAgent.indexOf('Linux') >= 0;
@@ -93,11 +89,14 @@ if (_isNative) {
 export const isWindows = _isWindows;
 export const isMacintosh = _isMacintosh;
 export const isLinux = _isLinux;
-export const isRootUser = _isRootUser;
 export const isNative = _isNative;
 export const isWeb = _isWeb;
 export const platform = _platform;
 
+export function isRootUser(): boolean {
+	return _isNative && !_isWindows && (process.getuid() === 0);
+}
+
 /**
  * The language used for the user interface. The format of
  * the string is all lower case (e.g. zh-tw for Traditional
@@ -117,30 +116,9 @@ export const locale = _locale;
  */
 export const translationsConfigFile = _translationsConfigFile;
 
-export interface TimeoutToken {
-}
-
-export interface IntervalToken {
-}
-
-interface IGlobals {
-	Worker?: any;
-	setTimeout(callback: (...args: any[]) => void, delay: number, ...args: any[]): TimeoutToken;
-	clearTimeout(token: TimeoutToken): void;
-
-	setInterval(callback: (...args: any[]) => void, delay: number, ...args: any[]): IntervalToken;
-	clearInterval(token: IntervalToken): void;
-}
-
-const _globals = <IGlobals>(typeof self === 'object' ? self : global);
+const _globals = (typeof self === 'object' ? self : typeof global === 'object' ? global : {} as any);
 export const globals: any = _globals;
 
-export const setTimeout = _globals.setTimeout.bind(_globals);
-export const clearTimeout = _globals.clearTimeout.bind(_globals);
-
-export const setInterval = _globals.setInterval.bind(_globals);
-export const clearInterval = _globals.clearInterval.bind(_globals);
-
 export const enum OperatingSystem {
 	Windows = 1,
 	Macintosh = 2,
diff --git a/src/vs/base/common/winjs.base.raw.js b/src/vs/base/common/winjs.base.raw.js
index 0ffe0bc96cc..d827548303e 100644
--- a/src/vs/base/common/winjs.base.raw.js
+++ b/src/vs/base/common/winjs.base.raw.js
@@ -7,7 +7,7 @@
  */
 (function() {
 
-var _modules = {};
+var _modules = Object.create(null);//{};
 _modules["WinJS/Core/_WinJS"] = {};
 
 var _winjs = function(moduleId, deps, factory) {
@@ -64,11 +64,24 @@ _winjs("WinJS/Core/_BaseCoreUtils", ["WinJS/Core/_Global"], function baseCoreUti
         return func;
     }
 
+    var actualSetImmediate = null;
+
     return {
         hasWinRT: hasWinRT,
         markSupportedForProcessing: markSupportedForProcessing,
-        _setImmediate: _Global.setImmediate ? _Global.setImmediate.bind(_Global) : function (handler) {
-            _Global.setTimeout(handler, 0);
+        _setImmediate: function (callback) {
+            // BEGIN monaco change
+            if (actualSetImmediate === null) {
+                if (_Global.setImmediate) {
+                    actualSetImmediate = _Global.setImmediate.bind(_Global);
+                } else if (typeof process !== 'undefined' && typeof process.nextTick === 'function') {
+                    actualSetImmediate = process.nextTick.bind(process);
+                } else {
+                    actualSetImmediate = _Global.setTimeout.bind(_Global);
+                }
+            }
+            actualSetImmediate(callback);
+            // END monaco change
         }
     };
 });
@@ -2057,15 +2070,9 @@ _winjs("WinJS/Promise", ["WinJS/Core/_Base","WinJS/Promise/_StateMachine"], func
 var exported = _modules["WinJS/Core/_WinJS"];
 
 if (typeof exports === 'undefined' && typeof define === 'function' && define.amd) {
-    define(exported);
+    define([], exported);
 } else {
     module.exports = exported;
 }
 
-if (typeof process !== 'undefined' && typeof process.nextTick === 'function') {
-    _modules["WinJS/Core/_BaseCoreUtils"]._setImmediate = function(handler) {
-        return process.nextTick(handler);
-    };
-}
-
-})();
\ No newline at end of file
+})();
diff --git a/src/vs/base/common/worker/simpleWorker.ts b/src/vs/base/common/worker/simpleWorker.ts
index 415660a12fe..ed06f5e3d63 100644
--- a/src/vs/base/common/worker/simpleWorker.ts
+++ b/src/vs/base/common/worker/simpleWorker.ts
@@ -339,13 +339,6 @@ export class SimpleWorkerServer {
 					delete loaderConfig.paths['vs'];
 				}
 			}
-			let nlsConfig = loaderConfig['vs/nls'];
-			// We need to have pseudo translation
-			if (nlsConfig && nlsConfig.pseudo) {
-				require(['vs/nls'], function (nlsPlugin) {
-					nlsPlugin.setPseudoTranslation(nlsConfig.pseudo);
-				});
-			}
 
 			// Since this is in a web worker, enable catching errors
 			loaderConfig.catchError = true;
diff --git a/src/vs/base/node/extfs.ts b/src/vs/base/node/extfs.ts
index d3e56f8555b..d12eb3922a9 100644
--- a/src/vs/base/node/extfs.ts
+++ b/src/vs/base/node/extfs.ts
@@ -43,6 +43,26 @@ export function readdir(path: string, callback: (error: Error, files: string[])
 	return fs.readdir(path, callback);
 }
 
+export function statLink(path: string, callback: (error: Error, statAndIsLink: { stat: fs.Stats, isSymbolicLink: boolean }) => void): void {
+	fs.lstat(path, (error, stat) => {
+		if (error) {
+			return callback(error, null);
+		}
+
+		if (stat.isSymbolicLink()) {
+			fs.stat(path, (error, stat) => {
+				if (error) {
+					return callback(error, null);
+				}
+
+				callback(null, { stat, isSymbolicLink: true });
+			});
+		} else {
+			callback(null, { stat, isSymbolicLink: false });
+		}
+	});
+}
+
 export function copy(source: string, target: string, callback: (error: Error) => void, copiedSources?: { [path: string]: boolean }): void {
 	if (!copiedSources) {
 		copiedSources = Object.create(null);
@@ -628,4 +648,4 @@ export function watch(path: string, onChange: (type: string, path: string) => vo
 	}
 
 	return void 0;
-}
\ No newline at end of file
+}
diff --git a/src/vs/base/node/pfs.ts b/src/vs/base/node/pfs.ts
index 5fdb5cb0264..b96c1b07466 100644
--- a/src/vs/base/node/pfs.ts
+++ b/src/vs/base/node/pfs.ts
@@ -54,6 +54,10 @@ export function stat(path: string): TPromise<fs.Stats> {
 	return nfcall(fs.stat, path);
 }
 
+export function statLink(path: string): TPromise<{ stat: fs.Stats, isSymbolicLink: boolean }> {
+	return nfcall(extfs.statLink, path);
+}
+
 export function lstat(path: string): TPromise<fs.Stats> {
 	return nfcall(fs.lstat, path);
 }
@@ -161,8 +165,14 @@ export function fileExists(path: string): TPromise<boolean> {
 /**
  * Deletes a path from disk.
  */
-const tmpDir = os.tmpdir();
-export function del(path: string, tmp = tmpDir): TPromise<void> {
+let _tmpDir: string = null;
+function getTmpDir(): string {
+	if (!_tmpDir) {
+		_tmpDir = os.tmpdir();
+	}
+	return _tmpDir;
+}
+export function del(path: string, tmp = getTmpDir()): TPromise<void> {
 	return nfcall(extfs.del, path, tmp);
 }
 
@@ -185,4 +195,4 @@ export function whenDeleted(path: string): TPromise<void> {
 			}
 		}, 1000);
 	});
-}
\ No newline at end of file
+}
diff --git a/src/vs/base/node/processes.ts b/src/vs/base/node/processes.ts
index 7aa6034bba6..32ee843b5ae 100644
--- a/src/vs/base/node/processes.ts
+++ b/src/vs/base/node/processes.ts
@@ -6,9 +6,6 @@
 
 import path = require('path');
 import * as cp from 'child_process';
-import ChildProcess = cp.ChildProcess;
-import exec = cp.exec;
-import spawn = cp.spawn;
 import { fork } from 'vs/base/node/stdFork';
 import nls = require('vs/nls');
 import { PPromise, TPromise, TValueCallback, TProgressCallback, ErrorCallback } from 'vs/base/common/winjs.base';
@@ -40,7 +37,7 @@ function getWindowsCode(status: number): TerminateResponseCode {
 	}
 }
 
-export function terminateProcess(process: ChildProcess, cwd?: string): TerminateResponse {
+export function terminateProcess(process: cp.ChildProcess, cwd?: string): TerminateResponse {
 	if (Platform.isWindows) {
 		try {
 			let options: any = {
@@ -80,8 +77,8 @@ export abstract class AbstractProcess<TProgressData> {
 	private options: CommandOptions | ForkOptions;
 	protected shell: boolean;
 
-	private childProcess: ChildProcess;
-	protected childProcessPromise: TPromise<ChildProcess>;
+	private childProcess: cp.ChildProcess;
+	protected childProcessPromise: TPromise<cp.ChildProcess>;
 	protected terminateRequested: boolean;
 
 	private static WellKnowCommands: IStringDictionary<boolean> = {
@@ -173,7 +170,7 @@ export abstract class AbstractProcess<TProgressData> {
 				if (this.args) {
 					cmd = cmd + ' ' + this.args.join(' ');
 				}
-				this.childProcess = exec(cmd, this.options, (error, stdout, stderr) => {
+				this.childProcess = cp.exec(cmd, this.options, (error, stdout, stderr) => {
 					this.childProcess = null;
 					let err: any = error;
 					// This is tricky since executing a command shell reports error back in case the executed command return an
@@ -186,7 +183,7 @@ export abstract class AbstractProcess<TProgressData> {
 					}
 				});
 			} else {
-				let childProcess: ChildProcess = null;
+				let childProcess: cp.ChildProcess = null;
 				let closeHandler = (data: any) => {
 					this.childProcess = null;
 					this.childProcessPromise = null;
@@ -231,13 +228,13 @@ export abstract class AbstractProcess<TProgressData> {
 					} else {
 						args.push(commandLine.join(' '));
 					}
-					childProcess = spawn(getWindowsShell(), args, options);
+					childProcess = cp.spawn(getWindowsShell(), args, options);
 				} else {
 					if (this.cmd) {
-						childProcess = spawn(this.cmd, this.args, this.options);
+						childProcess = cp.spawn(this.cmd, this.args, this.options);
 					} else if (this.module) {
-						this.childProcessPromise = new TPromise<ChildProcess>((c, e, p) => {
-							fork(this.module, this.args, <ForkOptions>this.options, (error: any, childProcess: ChildProcess) => {
+						this.childProcessPromise = new TPromise<cp.ChildProcess>((c, e, p) => {
+							fork(this.module, this.args, <ForkOptions>this.options, (error: any, childProcess: cp.ChildProcess) => {
 								if (error) {
 									e(error);
 									ee({ terminated: this.terminateRequested, error: error });
@@ -269,7 +266,7 @@ export abstract class AbstractProcess<TProgressData> {
 	}
 
 	protected abstract handleExec(cc: TValueCallback<SuccessData>, pp: TProgressCallback<TProgressData>, error: Error, stdout: Buffer, stderr: Buffer): void;
-	protected abstract handleSpawn(childProcess: ChildProcess, cc: TValueCallback<SuccessData>, pp: TProgressCallback<TProgressData>, ee: ErrorCallback, sync: boolean): void;
+	protected abstract handleSpawn(childProcess: cp.ChildProcess, cc: TValueCallback<SuccessData>, pp: TProgressCallback<TProgressData>, ee: ErrorCallback, sync: boolean): void;
 
 	protected handleClose(data: any, cc: TValueCallback<SuccessData>, pp: TProgressCallback<TProgressData>, ee: ErrorCallback): void {
 		// Default is to do nothing.
@@ -315,7 +312,7 @@ export abstract class AbstractProcess<TProgressData> {
 			if (!this.shell || !Platform.isWindows) {
 				c(false);
 			}
-			let cmdShell = spawn(getWindowsShell(), ['/s', '/c']);
+			let cmdShell = cp.spawn(getWindowsShell(), ['/s', '/c']);
 			cmdShell.on('error', (error: Error) => {
 				c(true);
 			});
@@ -353,7 +350,7 @@ export class LineProcess extends AbstractProcess<LineData> {
 		cc({ terminated: this.terminateRequested, error: error });
 	}
 
-	protected handleSpawn(childProcess: ChildProcess, cc: TValueCallback<SuccessData>, pp: TProgressCallback<LineData>, ee: ErrorCallback, sync: boolean): void {
+	protected handleSpawn(childProcess: cp.ChildProcess, cc: TValueCallback<SuccessData>, pp: TProgressCallback<LineData>, ee: ErrorCallback, sync: boolean): void {
 		this.stdoutLineDecoder = new LineDecoder();
 		this.stderrLineDecoder = new LineDecoder();
 		childProcess.stdout.on('data', (data: Buffer) => {
@@ -384,7 +381,7 @@ export interface IQueuedSender {
 // queue is free again to consume messages.
 // On Windows we always wait for the send() method to return before sending the next message
 // to workaround https://github.com/nodejs/node/issues/7657 (IPC can freeze process)
-export function createQueuedSender(childProcess: ChildProcess | NodeJS.Process): IQueuedSender {
+export function createQueuedSender(childProcess: cp.ChildProcess | NodeJS.Process): IQueuedSender {
 	let msgQueue: string[] = [];
 	let useQueue = false;
 
diff --git a/src/vs/base/parts/quickopen/common/quickOpenScorer.ts b/src/vs/base/parts/quickopen/common/quickOpenScorer.ts
index 50c3cfa8050..115b6dddb29 100644
--- a/src/vs/base/parts/quickopen/common/quickOpenScorer.ts
+++ b/src/vs/base/parts/quickopen/common/quickOpenScorer.ts
@@ -296,6 +296,7 @@ const LABEL_CAMELCASE_SCORE = 1 << 16;
 const LABEL_SCORE_THRESHOLD = 1 << 15;
 
 export interface IPreparedQuery {
+	original: string;
 	value: string;
 	lowercase: string;
 	containsPathSeparator: boolean;
@@ -304,12 +305,13 @@ export interface IPreparedQuery {
 /**
  * Helper function to prepare a search value for scoring in quick open by removing unwanted characters.
  */
-export function prepareQuery(value: string): IPreparedQuery {
+export function prepareQuery(original: string): IPreparedQuery {
 	let lowercase: string;
 	let containsPathSeparator: boolean;
+	let value: string;
 
-	if (value) {
-		value = stripWildcards(value).replace(/\s/g, ''); // get rid of all wildcards and whitespace
+	if (original) {
+		value = stripWildcards(original).replace(/\s/g, ''); // get rid of all wildcards and whitespace
 		if (isWindows) {
 			value = value.replace(/\//g, '\\'); // Help Windows users to search for paths when using slash
 		}
@@ -318,7 +320,7 @@ export function prepareQuery(value: string): IPreparedQuery {
 		containsPathSeparator = value.indexOf(nativeSep) >= 0;
 	}
 
-	return { value, lowercase, containsPathSeparator };
+	return { original, value, lowercase, containsPathSeparator };
 }
 
 export function scoreItem<T>(item: T, query: IPreparedQuery, fuzzy: boolean, accessor: IItemAccessor<T>, cache: ScorerCache): IItemScore {
@@ -354,7 +356,7 @@ export function scoreItem<T>(item: T, query: IPreparedQuery, fuzzy: boolean, acc
 function doScoreItem(label: string, description: string, path: string, query: IPreparedQuery, fuzzy: boolean): IItemScore {
 
 	// 1.) treat identity matches on full path highest
-	if (path && isEqual(query.value, path, true)) {
+	if (path && isEqual(query.original, path, true)) {
 		return { score: PATH_IDENTITY_SCORE, labelMatch: [{ start: 0, end: label.length }], descriptionMatch: description ? [{ start: 0, end: description.length }] : void 0 };
 	}
 
diff --git a/src/vs/base/test/browser/htmlContent.test.ts b/src/vs/base/test/browser/htmlContent.test.ts
index b91068ae15e..8d091414f99 100644
--- a/src/vs/base/test/browser/htmlContent.test.ts
+++ b/src/vs/base/test/browser/htmlContent.test.ts
@@ -52,9 +52,12 @@ suite('HtmlContent', () => {
 	test('action', () => {
 		var callbackCalled = false;
 		var result: HTMLElement = renderFormattedText('[[action]]', {
-			actionCallback(content) {
-				assert.strictEqual(content, '0');
-				callbackCalled = true;
+			actionHandler: {
+				callback(content) {
+					assert.strictEqual(content, '0');
+					callbackCalled = true;
+				},
+				disposeables: []
 			}
 		});
 		assert.strictEqual(result.innerHTML, '<a href="#">action</a>');
@@ -68,9 +71,12 @@ suite('HtmlContent', () => {
 	test('fancy action', () => {
 		var callbackCalled = false;
 		var result: HTMLElement = renderFormattedText('__**[[action]]**__', {
-			actionCallback(content) {
-				assert.strictEqual(content, '0');
-				callbackCalled = true;
+			actionHandler: {
+				callback(content) {
+					assert.strictEqual(content, '0');
+					callbackCalled = true;
+				},
+				disposeables: []
 			}
 		});
 		assert.strictEqual(result.innerHTML, '<i><b><a href="#">action</a></b></i>');
diff --git a/src/vs/base/test/node/extfs/extfs.test.ts b/src/vs/base/test/node/extfs/extfs.test.ts
index d56c1bdff9d..17d020743e5 100644
--- a/src/vs/base/test/node/extfs/extfs.test.ts
+++ b/src/vs/base/test/node/extfs/extfs.test.ts
@@ -74,6 +74,41 @@ suite('Extfs', () => {
 		}); // 493 = 0755
 	});
 
+	test('stat link', function (done: () => void) {
+		const id1 = uuid.generateUuid();
+		const parentDir = path.join(os.tmpdir(), 'vsctests', id1);
+		const directory = path.join(parentDir, 'extfs', id1);
+
+		const id2 = uuid.generateUuid();
+		const symbolicLink = path.join(parentDir, 'extfs', id2);
+
+		mkdirp(directory, 493, error => {
+			if (error) {
+				return onError(error, done);
+			}
+
+			fs.symlinkSync(directory, symbolicLink);
+
+			extfs.statLink(directory, (error, statAndIsLink) => {
+				if (error) {
+					return onError(error, done);
+				}
+
+				assert.ok(!statAndIsLink.isSymbolicLink);
+
+				extfs.statLink(symbolicLink, (error, statAndIsLink) => {
+					if (error) {
+						return onError(error, done);
+					}
+
+					assert.ok(statAndIsLink.isSymbolicLink);
+					extfs.delSync(directory);
+					done();
+				});
+			});
+		});
+	});
+
 	test('delSync - swallows file not found error', function () {
 		const id = uuid.generateUuid();
 		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
@@ -524,4 +559,4 @@ suite('Extfs', () => {
 			extfs.del(parentDir, os.tmpdir(), done, ignore);
 		});
 	});
-});
\ No newline at end of file
+});
diff --git a/src/vs/code/electron-browser/issue/issueReporter.js b/src/vs/code/electron-browser/issue/issueReporter.js
index 07e8b8663d7..01d097357b0 100644
--- a/src/vs/code/electron-browser/issue/issueReporter.js
+++ b/src/vs/code/electron-browser/issue/issueReporter.js
@@ -146,6 +146,8 @@ function main() {
 	// In the bundled version the nls plugin is packaged with the loader so the NLS Plugins
 	// loads as soon as the loader loads. To be able to have pseudo translation
 	createScript(rootUrl + '/vs/loader.js', function () {
+		var define = global.define;
+		global.define = undefined;
 		define('fs', ['original-fs'], function (originalFS) { return originalFS; }); // replace the patched electron fs with the original node fs for all AMD code
 
 		window.MonacoEnvironment = {};
diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index 8c6a04f03a5..2f35e2b14a2 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -15,6 +15,8 @@ import { escape } from 'vs/base/common/strings';
 import product from 'vs/platform/node/product';
 import pkg from 'vs/platform/node/package';
 import * as os from 'os';
+import { debounce } from 'vs/base/common/decorators';
+import * as platform from 'vs/base/common/platform';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { Client as ElectronIPCClient } from 'vs/base/parts/ipc/electron-browser/ipc.electron-browser';
 import { getDelayedChannel } from 'vs/base/parts/ipc/common/ipc';
@@ -31,16 +33,25 @@ import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProper
 import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc';
 import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
 import { IssueReporterModel } from 'vs/code/electron-browser/issue/issueReporterModel';
-import { IssueReporterData, IssueReporterStyles, IssueType, ISettingsSearchIssueReporterData } from 'vs/platform/issue/common/issue';
+import { IssueReporterData, IssueReporterStyles, IssueType, ISettingsSearchIssueReporterData, IssueReporterFeatures } from 'vs/platform/issue/common/issue';
 import BaseHtml from 'vs/code/electron-browser/issue/issueReporterPage';
 import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { debounce } from 'vs/base/common/decorators';
-import * as platform from 'vs/base/common/platform';
+import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
+import { LogLevelSetterChannelClient, FollowerLogService } from 'vs/platform/log/common/logIpc';
+import { ILogService, getLogLevel } from 'vs/platform/log/common/log';
+import { OcticonLabel } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
 
 const MAX_URL_LENGTH = 5400;
 
+interface SearchResult {
+	html_url: string;
+	title: string;
+	state?: string;
+}
+
 export interface IssueReporterConfiguration extends IWindowConfiguration {
 	data: IssueReporterData;
+	features: IssueReporterFeatures;
 }
 
 export function startup(configuration: IssueReporterConfiguration) {
@@ -53,8 +64,9 @@ export function startup(configuration: IssueReporterConfiguration) {
 export class IssueReporter extends Disposable {
 	private environmentService: IEnvironmentService;
 	private telemetryService: ITelemetryService;
+	private logService: ILogService;
 	private issueReporterModel: IssueReporterModel;
-	private shouldQueueSearch = true;
+	private numberOfSearchResultsDisplayed = 0;
 	private receivedSystemInfo = false;
 	private receivedPerformanceInfo = false;
 
@@ -65,20 +77,15 @@ export class IssueReporter extends Disposable {
 
 		this.issueReporterModel = new IssueReporterModel({
 			issueType: configuration.data.issueType || IssueType.Bug,
-			includeSystemInfo: true,
-			includeWorkspaceInfo: true,
-			includeProcessInfo: true,
-			includeSearchedExtensions: true,
-			includeSettingsSearchDetails: true,
 			versionInfo: {
 				vscodeVersion: `${pkg.name} ${pkg.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`,
 				os: `${os.type()} ${os.arch()} ${os.release()}`
 			},
 			extensionsDisabled: this.environmentService.disableExtensions,
-			reprosWithoutExtensions: false
 		});
 
 		ipcRenderer.on('issuePerformanceInfoResponse', (event, info) => {
+			this.logService.trace('issueReporter: Received performance data');
 			this.issueReporterModel.update(info);
 			this.receivedPerformanceInfo = true;
 
@@ -89,6 +96,7 @@ export class IssueReporter extends Disposable {
 		});
 
 		ipcRenderer.on('issueSystemInfoResponse', (event, info) => {
+			this.logService.trace('issueReporter: Received system data');
 			this.issueReporterModel.update({ systemInfo: info });
 			this.receivedSystemInfo = true;
 
@@ -98,6 +106,7 @@ export class IssueReporter extends Disposable {
 
 		ipcRenderer.send('issueSystemInfoRequest');
 		ipcRenderer.send('issuePerformanceInfoRequest');
+		this.logService.trace('issueReporter: Sent data requests');
 
 		if (window.document.documentElement.lang !== 'en') {
 			show(document.getElementById('english'));
@@ -132,7 +141,7 @@ export class IssueReporter extends Disposable {
 		const content: string[] = [];
 
 		if (styles.inputBackground) {
-			content.push(`input[type="text"], textarea, select { background-color: ${styles.inputBackground}; }`);
+			content.push(`input[type="text"], textarea, select, .issues-container > .issue > .issue-state { background-color: ${styles.inputBackground}; }`);
 		}
 
 		if (styles.inputBorder) {
@@ -142,7 +151,7 @@ export class IssueReporter extends Disposable {
 		}
 
 		if (styles.inputForeground) {
-			content.push(`input[type="text"], textarea, select { color: ${styles.inputForeground}; }`);
+			content.push(`input[type="text"], textarea, select, .issues-container > .issue > .issue-state { color: ${styles.inputForeground}; }`);
 		}
 
 		if (styles.inputErrorBorder) {
@@ -175,15 +184,15 @@ export class IssueReporter extends Disposable {
 		}
 
 		if (styles.sliderBackgroundColor) {
-			content.push(`body::-webkit-scrollbar-thumb { background-color: ${styles.sliderBackgroundColor}; }`);
+			content.push(`::-webkit-scrollbar-thumb { background-color: ${styles.sliderBackgroundColor}; }`);
 		}
 
 		if (styles.sliderActiveColor) {
-			content.push(`body::-webkit-scrollbar-thumb:active { background-color: ${styles.sliderActiveColor}; }`);
+			content.push(`::-webkit-scrollbar-thumb:active { background-color: ${styles.sliderActiveColor}; }`);
 		}
 
 		if (styles.sliderHoverColor) {
-			content.push(`body::-webkit-scrollbar-thumb:hover { background-color: ${styles.sliderHoverColor}; }`);
+			content.push(`::--webkit-scrollbar-thumb:hover { background-color: ${styles.sliderHoverColor}; }`);
 		}
 
 		styleTag.innerHTML = content.join('\n');
@@ -257,6 +266,10 @@ export class IssueReporter extends Disposable {
 		serviceCollection.set(IWindowsService, new WindowsChannelClient(windowsChannel));
 		this.environmentService = new EnvironmentService(configuration, configuration.execPath);
 
+		const logService = createSpdLogService(`issuereporter${configuration.windowId}`, getLogLevel(this.environmentService), this.environmentService.logsPath);
+		const logLevelClient = new LogLevelSetterChannelClient(mainProcessClient.getChannel('loglevel'));
+		this.logService = new FollowerLogService(logLevelClient, logService);
+
 		const sharedProcess = (<IWindowsService>serviceCollection.get(IWindowsService)).whenSharedProcessReady()
 			.then(() => connectNet(this.environmentService.sharedIPCHandle, `window:${configuration.windowId}`));
 
@@ -318,10 +331,26 @@ export class IssueReporter extends Disposable {
 		});
 
 		document.getElementById('description').addEventListener('input', (event: Event) => {
-			this.issueReporterModel.update({ issueDescription: (<HTMLInputElement>event.target).value });
+			const issueDescription = (<HTMLInputElement>event.target).value;
+			this.issueReporterModel.update({ issueDescription });
+
+			const title = (<HTMLInputElement>document.getElementById('issue-title')).value;
+			if (title || issueDescription) {
+				this.searchDuplicates(title, issueDescription);
+			} else {
+				this.clearSearchResults();
+			}
 		});
 
-		document.getElementById('issue-title').addEventListener('input', (e) => { this.searchGitHub(e); });
+		document.getElementById('issue-title').addEventListener('input', (e) => {
+			const description = this.issueReporterModel.getData().issueDescription;
+			const title = (<HTMLInputElement>event.target).value;
+			if (title || description) {
+				this.searchDuplicates(title, description);
+			} else {
+				this.clearSearchResults();
+			}
+		});
 
 		document.getElementById('github-submit-btn').addEventListener('click', () => this.createIssue());
 
@@ -404,72 +433,93 @@ export class IssueReporter extends Disposable {
 		return false;
 	}
 
-	@debounce(300)
-	private searchGitHub(event: Event): void {
-		const title = (<HTMLInputElement>event.target).value;
+	private clearSearchResults(): void {
 		const similarIssues = document.getElementById('similar-issues');
-		if (title) {
-			const query = `is:issue+repo:microsoft/vscode+${title}`;
-			window.fetch(`https://api.github.com/search/issues?q=${query}`).then((response) => {
-				response.json().then(result => {
-					similarIssues.innerHTML = '';
-					if (result && result.items && result.items.length) {
-						const issues = $('ul');
-						const issuesText = $('div.list-title');
-						issuesText.textContent = localize('similarIssues', "Similar issues");
+		similarIssues.innerHTML = '';
+		this.numberOfSearchResultsDisplayed = 0;
+	}
 
-						const { items } = result;
-						const numResultsToDisplay = items.length < 5 ? items.length : 5;
-						for (let i = 0; i < numResultsToDisplay; i++) {
-							const link = $('a', { href: items[i].html_url });
-							link.textContent = items[i].title;
-							link.addEventListener('click', openLink);
-							link.addEventListener('auxclick', openLink);
+	@debounce(300)
+	private searchDuplicates(title: string, body: string): void {
+		const url = 'https://vscode-probot.westus.cloudapp.azure.com:7890/duplicate_candidates';
+		const init = {
+			method: 'POST',
+			body: JSON.stringify({
+				title,
+				body
+			}),
+			headers: new Headers({
+				'Content-Type': 'application/json'
+			})
+		};
 
-							const item = $('li', {}, link);
-							issues.appendChild(item);
-						}
+		window.fetch(url, init).then((response) => {
+			response.json().then(result => {
+				this.clearSearchResults();
 
-						similarIssues.appendChild(issuesText);
-						similarIssues.appendChild(issues);
-					} else if (result && result.items) {
-						const message = $('div.list-title');
-						message.textContent = localize('noResults', "No results found");
-						similarIssues.appendChild(message);
-					} else {
-						const message = $('div.list-title');
-						message.textContent = localize('rateLimited', "GitHub query limit exceeded. Please wait.");
-						similarIssues.appendChild(message);
-
-						const resetTime = response.headers.get('X-RateLimit-Reset');
-						const timeToWait = parseInt(resetTime) - Math.floor(Date.now() / 1000);
-						if (this.shouldQueueSearch) {
-							this.shouldQueueSearch = false;
-							setTimeout(() => {
-								this.searchGitHub(event);
-								this.shouldQueueSearch = true;
-							}, timeToWait * 1000);
-						}
-
-						throw new Error(result.message);
-					}
-				}).catch((error) => {
-					this.logSearchError(error);
-				});
+				if (result && result.candidates) {
+					this.displaySearchResults(result.candidates);
+				} else {
+					throw new Error('Unexpected response, no candidates property');
+				}
 			}).catch((error) => {
 				this.logSearchError(error);
 			});
+		}).catch((error) => {
+			this.logSearchError(error);
+		});
+	}
+
+	private displaySearchResults(results: SearchResult[]) {
+		const similarIssues = document.getElementById('similar-issues');
+		if (results.length) {
+			const issues = $('div.issues-container');
+			const issuesText = $('div.list-title');
+			issuesText.textContent = localize('similarIssues', "Similar issues");
+
+			this.numberOfSearchResultsDisplayed = results.length < 5 ? results.length : 5;
+			for (let i = 0; i < this.numberOfSearchResultsDisplayed; i++) {
+				const issue = results[i];
+				const link = $('a.issue-link', { href: issue.html_url });
+				link.textContent = issue.title;
+				link.title = issue.title;
+				link.addEventListener('click', (e) => this.openLink(e));
+				link.addEventListener('auxclick', (e) => this.openLink(<MouseEvent>e));
+
+				let issueState: HTMLElement;
+				if (issue.state) {
+					issueState = $('span.issue-state');
+
+					const issueIcon = $('span.issue-icon');
+					const octicon = new OcticonLabel(issueIcon);
+					octicon.text = issue.state === 'open' ? '$(issue-opened)' : '$(issue-closed)';
+
+					const issueStateLabel = $('span.issue-state.label');
+					issueStateLabel.textContent = issue.state === 'open' ? localize('open', "Open") : localize('closed', "Closed");
+
+					issueState.title = issue.state === 'open' ? localize('open', "Open") : localize('closed', "Closed");
+					issueState.appendChild(issueIcon);
+					issueState.appendChild(issueStateLabel);
+				}
+
+				const item = $('div.issue', {}, issueState, link);
+				issues.appendChild(item);
+			}
+
+			similarIssues.appendChild(issuesText);
+			similarIssues.appendChild(issues);
 		} else {
-			similarIssues.innerHTML = '';
+			const message = $('div.list-title');
+			message.textContent = localize('noResults', "No results found");
+			similarIssues.appendChild(message);
 		}
 	}
 
 	private logSearchError(error: Error) {
-		// TODO: Use LogService here.
-		console.log(error);
+		this.logService.warn('issueReporter#search ', error.message);
 		/* __GDPR__
 		"issueReporterSearchError" : {
-				"message" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+				"message" : { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" }
 			}
 		*/
 		this.telemetryService.publicLog('issueReporterSearchError', { message: error.message });
@@ -583,14 +633,13 @@ export class IssueReporter extends Disposable {
 			return false;
 		}
 
-		if (this.telemetryService) {
-			/* __GDPR__
-				"issueReporterSubmit" : {
-					"issueType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-				}
-			*/
-			this.telemetryService.publicLog('issueReporterSubmit', { issueType: this.issueReporterModel.getData().issueType });
-		}
+		/* __GDPR__
+			"issueReporterSubmit" : {
+				"issueType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"numSimilarIssuesDisplayed" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
+		this.telemetryService.publicLog('issueReporterSubmit', { issueType: this.issueReporterModel.getData().issueType, numSimilarIssuesDisplayed: this.numberOfSearchResultsDisplayed });
 
 		const issueTitle = encodeURIComponent((<HTMLInputElement>document.getElementById('issue-title')).value);
 		const queryStringPrefix = product.reportIssueUrl.indexOf('?') === -1 ? '?' : '&';
@@ -703,6 +752,20 @@ export class IssueReporter extends Disposable {
 
 		return table;
 	}
+
+	private openLink(event: MouseEvent): void {
+		event.preventDefault();
+		event.stopPropagation();
+		// Exclude right click
+		if (event.which < 3) {
+			shell.openExternal((<HTMLAnchorElement>event.target).href);
+
+			/* __GDPR__
+				"issueReporterViewSimilarIssue" : { }
+			*/
+			this.telemetryService.publicLog('issueReporterViewSimilarIssue');
+		}
+	}
 }
 
 // helper functions
@@ -713,12 +776,3 @@ function hide(el) {
 function show(el) {
 	el.classList.remove('hidden');
 }
-
-function openLink(event: MouseEvent) {
-	event.preventDefault();
-	event.stopPropagation();
-	// Exclude right click
-	if (event.which < 3) {
-		shell.openExternal((<HTMLAnchorElement>event.target).href);
-	}
-}
diff --git a/src/vs/code/electron-browser/issue/issueReporterModel.ts b/src/vs/code/electron-browser/issue/issueReporterModel.ts
index 4ae150e9651..c8806a760ee 100644
--- a/src/vs/code/electron-browser/issue/issueReporterModel.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterModel.ts
@@ -38,7 +38,17 @@ export class IssueReporterModel {
 	private _data: IssueReporterData;
 
 	constructor(initialData?: IssueReporterData) {
-		this._data = initialData || {};
+		const defaultData = {
+			includeSystemInfo: true,
+			includeWorkspaceInfo: true,
+			includeProcessInfo: true,
+			includeExtensions: true,
+			includeSearchedExtensions: true,
+			includeSettingsSearchDetails: true,
+			reprosWithoutExtensions: false
+		};
+
+		this._data = initialData ? assign(defaultData, initialData) : defaultData;
 	}
 
 	getData(): IssueReporterData {
@@ -51,19 +61,15 @@ export class IssueReporterModel {
 
 	serialize(): string {
 		return `
-### Issue Type
-${this.getIssueTypeTitle()}
-
-### Description
+Issue Type: ${this.getIssueTypeTitle()}
 
 ${this._data.issueDescription}
 
-### VS Code Info
-
 VS Code version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
 OS version: ${this._data.versionInfo && this._data.versionInfo.os}
 
-${this.getInfos()}`;
+${this.getInfos()}
+<!-- generated by issue reporter -->`;
 	}
 
 	private getIssueTypeTitle(): string {
@@ -71,6 +77,8 @@ ${this.getInfos()}`;
 			return 'Bug';
 		} else if (this._data.issueType === IssueType.PerformanceIssue) {
 			return 'Performance Issue';
+		} else if (this._data.issueType === IssueType.SettingsSearchIssue) {
+			return 'Settings Search Issue';
 		} else {
 			return 'Feature Request';
 		}
diff --git a/src/vs/code/electron-browser/issue/media/issueReporter.css b/src/vs/code/electron-browser/issue/media/issueReporter.css
index 74c25832695..04187fc4c2d 100644
--- a/src/vs/code/electron-browser/issue/media/issueReporter.css
+++ b/src/vs/code/electron-browser/issue/media/issueReporter.css
@@ -116,6 +116,7 @@ html {
 
 body {
 	margin: 0;
+	overflow: scroll;
 }
 
 .hidden {
@@ -223,16 +224,11 @@ summary {
 
 .include-data {
 	display: inline-block;
-	position: relative;
 }
 
 .include-data > .caption {
 	display: inline-block;
 	font-size: 12px;
-	position: absolute;
-	width: 80px;
-	top: 2px;
-	left: 30px;
 	cursor: pointer;
 }
 
@@ -263,9 +259,12 @@ input:disabled {
 	margin-top: .5em;
 }
 
+.workbenchCommand {
+	cursor: pointer;
+}
 .workbenchCommand:disabled {
 	color: #868e96;
-	cursor: pointer;
+	cursor: default
 }
 
 .block-extensions .block-info {
@@ -281,6 +280,7 @@ input, select, textarea {
 
 a {
 	color: #CCCCCC;
+	text-decoration: none;
 }
 
 .invalid-input {
@@ -302,6 +302,7 @@ button {
 
 #issue-type {
 	width: calc(100% - 100px);
+	cursor: pointer;
 }
 
 #issue-title-label {
@@ -347,10 +348,50 @@ button {
 	}
 }
 
-body::-webkit-scrollbar {
+::-webkit-scrollbar {
 	width: 14px;
 }
 
-body::-webkit-scrollbar-thumb {
+::-webkit-scrollbar-thumb {
 	min-height: 20px;
 }
+
+::-webkit-scrollbar-corner {
+	display: none;
+}
+
+.issues-container {
+	margin-left: 1.5em;
+	margin-top: .5em;
+	height: 108px;
+	overflow-y: auto;
+}
+
+.issues-container > .issue {
+	padding: 4px 0;
+}
+
+.issues-container > .issue > .issue-link {
+	display: inline-block;
+	width: calc(100% - 82px);
+	height: 22px;
+	line-height: 22px;
+	overflow: hidden;
+}
+
+.issues-container > .issue > .issue-state {
+	width: 77px;
+	height: 22px;
+	padding: 3px 6px;
+	margin-right: 5px;
+	color: #CCCCCC;
+	background-color: #3c3c3c;
+	text-align: center;
+	border-radius: .25rem;
+	display: inline-block;
+	vertical-align: top;
+}
+
+.issues-container > .issue > .issue-state .octicon {
+	padding-right: 5px;
+}
diff --git a/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
index 2b7caaf6254..8dc222e68a7 100644
--- a/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
+++ b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
@@ -10,22 +10,31 @@ import { IssueReporterModel } from 'vs/code/electron-browser/issue/issueReporter
 
 suite('IssueReporter', () => {
 
-	test('serializes model', () => {
+	test('sets defaults to include all data', () => {
+		const issueReporterModel = new IssueReporterModel();
+		assert.deepEqual(issueReporterModel.getData(), {
+			includeSystemInfo: true,
+			includeWorkspaceInfo: true,
+			includeProcessInfo: true,
+			includeExtensions: true,
+			includeSearchedExtensions: true,
+			includeSettingsSearchDetails: true,
+			reprosWithoutExtensions: false
+		});
+	});
+
+	test('serializes model skeleton when no data is provided', () => {
 		const issueReporterModel = new IssueReporterModel();
 		assert.equal(issueReporterModel.serialize(),
 			`
-### Issue Type
-Feature Request
-
-### Description
+Issue Type: Feature Request
 
 undefined
 
-### VS Code Info
-
 VS Code version: undefined
 OS version: undefined
 
-`);
+
+<!-- generated by issue reporter -->`);
 	});
 });
diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcess.js b/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
index b4e968d7990..ffc640718d0 100644
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
@@ -131,6 +131,8 @@ function main() {
 	// In the bundled version the nls plugin is packaged with the loader so the NLS Plugins
 	// loads as soon as the loader loads. To be able to have pseudo translation
 	createScript(rootUrl + '/vs/loader.js', function () {
+		var define = global.define;
+		global.define = undefined;
 		define('fs', ['original-fs'], function (originalFS) { return originalFS; }); // replace the patched electron fs with the original node fs for all AMD code
 
 		window.MonacoEnvironment = {};
diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
index baf9a0bbe85..91e4a7b0ea5 100644
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
@@ -30,8 +30,6 @@ import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProper
 import { TelemetryAppenderChannel } from 'vs/platform/telemetry/common/telemetryIpc';
 import { TelemetryService, ITelemetryServiceConfig } from 'vs/platform/telemetry/common/telemetryService';
 import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
-import { IChoiceService } from 'vs/platform/message/common/message';
-import { ChoiceChannelClient } from 'vs/platform/message/common/messageIpc';
 import { IWindowsService } from 'vs/platform/windows/common/windows';
 import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc';
 import { ipcRenderer } from 'electron';
@@ -43,6 +41,8 @@ import { LogLevelSetterChannelClient, FollowerLogService } from 'vs/platform/log
 import { LocalizationsService } from 'vs/platform/localizations/node/localizations';
 import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
 import { LocalizationsChannel } from 'vs/platform/localizations/common/localizationsIpc';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
+import { ChoiceChannelClient } from 'vs/platform/dialogs/common/choiceIpc';
 
 export interface ISharedProcessConfiguration {
 	readonly machineId: string;
diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
index 05b622cab01..3ea85cd48ee 100644
--- a/src/vs/code/electron-main/main.ts
+++ b/src/vs/code/electron-main/main.ts
@@ -47,9 +47,9 @@ import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
 import { printDiagnostics } from 'vs/code/electron-main/diagnostics';
 import { BufferLogService } from 'vs/platform/log/common/bufferLog';
 import { uploadLogs } from 'vs/code/electron-main/logUploader';
-import { IChoiceService } from 'vs/platform/message/common/message';
-import { ChoiceCliService } from 'vs/platform/message/node/messageCli';
 import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
+import { ChoiceCliService } from 'vs/platform/dialogs/node/choiceCli';
 
 function createServices(args: ParsedArgs, bufferLogService: BufferLogService): IInstantiationService {
 	const services = new ServiceCollection();
diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts
index 6636672f4a2..8d21c881d58 100644
--- a/src/vs/code/electron-main/menus.ts
+++ b/src/vs/code/electron-main/menus.ts
@@ -688,6 +688,7 @@ export class CodeMenu {
 
 		const fullscreen = new MenuItem(this.withKeybinding('workbench.action.toggleFullScreen', { label: this.mnemonicLabel(nls.localize({ key: 'miToggleFullScreen', comment: ['&& denotes a mnemonic'] }, "Toggle &&Full Screen")), click: () => this.windowsMainService.getLastActiveWindow().toggleFullScreen(), enabled: this.windowsMainService.getWindowCount() > 0 }));
 		const toggleZenMode = this.createMenuItem(nls.localize('miToggleZenMode', "Toggle Zen Mode"), 'workbench.action.toggleZenMode');
+		const toggleCenteredLayout = this.createMenuItem(nls.localize('miToggleCenteredLayout', "Toggle Centered Layout"), 'workbench.action.toggleCenteredLayout');
 		const toggleMenuBar = this.createMenuItem(nls.localize({ key: 'miToggleMenuBar', comment: ['&& denotes a mnemonic'] }, "Toggle Menu &&Bar"), 'workbench.action.toggleMenuBar');
 		const splitEditor = this.createMenuItem(nls.localize({ key: 'miSplitEditor', comment: ['&& denotes a mnemonic'] }, "Split &&Editor"), 'workbench.action.splitEditor');
 		const toggleEditorLayout = this.createMenuItem(nls.localize({ key: 'miToggleEditorLayout', comment: ['&& denotes a mnemonic'] }, "Toggle Editor Group &&Layout"), 'workbench.action.toggleEditorGroupLayout');
@@ -747,6 +748,7 @@ export class CodeMenu {
 			__separator__(),
 			fullscreen,
 			toggleZenMode,
+			toggleCenteredLayout,
 			isWindows || isLinux ? toggleMenuBar : void 0,
 			__separator__(),
 			splitEditor,
diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
index dbe69eb291e..24b15696e0d 100644
--- a/src/vs/code/electron-main/window.ts
+++ b/src/vs/code/electron-main/window.ts
@@ -578,7 +578,11 @@ export class CodeWindow implements ICodeWindow {
 		windowConfiguration.fullscreen = this._win.isFullScreen();
 
 		// Set Accessibility Config
-		windowConfiguration.highContrast = isWindows && systemPreferences.isInvertedColorScheme() && (!windowConfig || windowConfig.autoDetectHighContrast);
+		let autoDetectHighContrast = true;
+		if (windowConfig && windowConfig.autoDetectHighContrast === false) {
+			autoDetectHighContrast = false;
+		}
+		windowConfiguration.highContrast = isWindows && autoDetectHighContrast && systemPreferences.isInvertedColorScheme();
 		windowConfiguration.accessibilitySupport = app.isAccessibilitySupportEnabled();
 
 		// Theme
@@ -837,7 +841,7 @@ export class CodeWindow implements ICodeWindow {
 				this._win.setAutoHideMenuBar(true);
 
 				if (notify) {
-					this.send('vscode:showInfoMessage', nls.localize('hiddenMenuBar', "You can still access the menu bar by pressing the **Alt** key."));
+					this.send('vscode:showInfoMessage', nls.localize('hiddenMenuBar', "You can still access the menu bar by pressing the Alt-key."));
 				}
 				break;
 
diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts
index 61bb55cf91e..0c5a6074797 100644
--- a/src/vs/code/node/cli.ts
+++ b/src/vs/code/node/cli.ts
@@ -306,6 +306,13 @@ export async function main(argv: string[]): TPromise<any> {
 			});
 		}
 
+		if (args['js-flags']) {
+			const match = /max_old_space_size=(\d+)/g.exec(args['js-flags']);
+			if (match && !args['max-memory']) {
+				argv.push(`--max-memory=${match[1]}`);
+			}
+		}
+
 		const options = {
 			detached: true,
 			env
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index a01bebe6cf7..6fd9ddcafd9 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -30,14 +30,14 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { ConfigurationService } from 'vs/platform/configuration/node/configurationService';
 import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
 import { mkdirp, writeFile } from 'vs/base/node/pfs';
-import { IChoiceService } from 'vs/platform/message/common/message';
-import { ChoiceCliService } from 'vs/platform/message/node/messageCli';
 import { getBaseLabel } from 'vs/base/common/labels';
 import { IStateService } from 'vs/platform/state/common/state';
 import { StateService } from 'vs/platform/state/node/stateService';
 import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
 import { ILogService, getLogLevel } from 'vs/platform/log/common/log';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
+import { ChoiceCliService } from 'vs/platform/dialogs/node/choiceCli';
 
 const notFound = (id: string) => localize('notFound', "Extension '{0}' not found.", id);
 const notInstalled = (id: string) => localize('notInstalled', "Extension '{0}' is not installed.", id);
diff --git a/src/vs/css.js b/src/vs/css.js
index ae281dacb7b..4a2d5a4d299 100644
--- a/src/vs/css.js
+++ b/src/vs/css.js
@@ -20,7 +20,7 @@ var CSSLoaderPlugin;
      * Known issue:
      * - In IE there is no way to know if the CSS file loaded successfully or not.
      */
-    var BrowserCSSLoader = (function () {
+    var BrowserCSSLoader = /** @class */ (function () {
         function BrowserCSSLoader() {
             this._pendingLoads = 0;
         }
@@ -93,7 +93,7 @@ var CSSLoaderPlugin;
         return BrowserCSSLoader;
     }());
     // ------------------------------ Finally, the plugin
-    var CSSPlugin = (function () {
+    var CSSPlugin = /** @class */ (function () {
         function CSSPlugin() {
             this._cssLoader = new BrowserCSSLoader();
         }
@@ -110,12 +110,5 @@ var CSSLoaderPlugin;
         return CSSPlugin;
     }());
     CSSLoaderPlugin.CSSPlugin = CSSPlugin;
-    function init() {
-        define('vs/css', new CSSPlugin());
-    }
-    CSSLoaderPlugin.init = init;
-    ;
-    if (typeof doNotInitLoader === 'undefined') {
-        init();
-    }
+    define('vs/css', new CSSPlugin());
 })(CSSLoaderPlugin || (CSSLoaderPlugin = {}));
diff --git a/src/vs/editor/browser/services/bulkEdit.ts b/src/vs/editor/browser/services/bulkEdit.ts
index cded7ca6be5..6753f7bb6e1 100644
--- a/src/vs/editor/browser/services/bulkEdit.ts
+++ b/src/vs/editor/browser/services/bulkEdit.ts
@@ -271,7 +271,7 @@ export class BulkEdit {
 	constructor(
 		editor: ICodeEditor,
 		progress: IProgressRunner,
-		@ITextModelService private _textModelService: ITextModelService,
+		@ITextModelService private readonly _textModelService: ITextModelService,
 		@optional(IFileService) private _fileService: IFileService
 	) {
 		this._editor = editor;
diff --git a/src/vs/editor/browser/view/viewLayer.ts b/src/vs/editor/browser/view/viewLayer.ts
index d895de58a98..fa793842cf6 100644
--- a/src/vs/editor/browser/view/viewLayer.ts
+++ b/src/vs/editor/browser/view/viewLayer.ts
@@ -80,7 +80,7 @@ export class RenderedLinesCollection<T extends ILine> {
 	public getLine(lineNumber: number): T {
 		let lineIndex = lineNumber - this._rendLineNumberStart;
 		if (lineIndex < 0 || lineIndex >= this._lines.length) {
-			throw new Error('Illegal value for lineNumber: ' + lineNumber);
+			throw new Error('Illegal value for lineNumber');
 		}
 		return this._lines[lineIndex];
 	}
diff --git a/src/vs/editor/browser/viewParts/decorations/decorations.ts b/src/vs/editor/browser/viewParts/decorations/decorations.ts
index dc63ec06edc..da0359739fe 100644
--- a/src/vs/editor/browser/viewParts/decorations/decorations.ts
+++ b/src/vs/editor/browser/viewParts/decorations/decorations.ts
@@ -202,7 +202,7 @@ export class DecorationsOverlay extends DynamicViewOverlay {
 		}
 		let lineIndex = lineNumber - startLineNumber;
 		if (lineIndex < 0 || lineIndex >= this._renderResult.length) {
-			throw new Error('Unexpected render request');
+			return '';
 		}
 		return this._renderResult[lineIndex];
 	}
diff --git a/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts b/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
index 757305ebc08..75757265ee1 100644
--- a/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
+++ b/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
@@ -193,8 +193,8 @@ export class GlyphMarginOverlay extends DedupOverlay {
 		}
 		let lineIndex = lineNumber - startLineNumber;
 		if (lineIndex < 0 || lineIndex >= this._renderResult.length) {
-			throw new Error('Unexpected render request');
+			return '';
 		}
 		return this._renderResult[lineIndex];
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts b/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
index 43fe27b0d1c..8e97e032f30 100644
--- a/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
+++ b/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
@@ -122,7 +122,7 @@ export class IndentGuidesOverlay extends DynamicViewOverlay {
 		}
 		let lineIndex = lineNumber - startLineNumber;
 		if (lineIndex < 0 || lineIndex >= this._renderResult.length) {
-			throw new Error('Unexpected render request');
+			return '';
 		}
 		return this._renderResult[lineIndex];
 	}
diff --git a/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts b/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts
index be1f4d60636..0c82560a087 100644
--- a/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts
+++ b/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts
@@ -162,7 +162,7 @@ export class LineNumbersOverlay extends DynamicViewOverlay {
 		}
 		let lineIndex = lineNumber - startLineNumber;
 		if (lineIndex < 0 || lineIndex >= this._renderResult.length) {
-			throw new Error('Unexpected render request');
+			return '';
 		}
 		return this._renderResult[lineIndex];
 	}
diff --git a/src/vs/editor/browser/viewParts/selections/selections.ts b/src/vs/editor/browser/viewParts/selections/selections.ts
index 13fe621bd2b..c844dfc3516 100644
--- a/src/vs/editor/browser/viewParts/selections/selections.ts
+++ b/src/vs/editor/browser/viewParts/selections/selections.ts
@@ -387,7 +387,7 @@ export class SelectionsOverlay extends DynamicViewOverlay {
 		}
 		let lineIndex = lineNumber - startLineNumber;
 		if (lineIndex < 0 || lineIndex >= this._renderResult.length) {
-			throw new Error('Unexpected render request');
+			return '';
 		}
 		return this._renderResult[lineIndex];
 	}
diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts
index ec5c18bc447..97a88a711a1 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget.ts
@@ -11,7 +11,6 @@ import { RunOnceScheduler } from 'vs/base/common/async';
 import { Disposable } from 'vs/base/common/lifecycle';
 import * as objects from 'vs/base/common/objects';
 import * as dom from 'vs/base/browser/dom';
-import Severity from 'vs/base/common/severity';
 import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
 import { ISashEvent, IVerticalSashLayoutProvider, Sash } from 'vs/base/browser/ui/sash/sash';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -41,9 +40,9 @@ import { IEditorWhitespace } from 'vs/editor/common/viewLayout/whitespaceCompute
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { DiffReview } from 'vs/editor/browser/widget/diffReview';
 import URI from 'vs/base/common/uri';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { IStringBuilder, createStringBuilder } from 'vs/editor/common/core/stringBuilder';
 import { IModelDeltaDecoration, IModelDecorationsChangeAccessor, ITextModel } from 'vs/editor/common/model';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 interface IEditorDiffDecorations {
 	decorations: IModelDeltaDecoration[];
@@ -192,7 +191,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 	protected _contextKeyService: IContextKeyService;
 	private _codeEditorService: ICodeEditorService;
 	private _themeService: IThemeService;
-	private readonly _messageService: IMessageService;
+	private _notificationService: INotificationService;
 
 	private _reviewPane: DiffReview;
 
@@ -204,7 +203,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ICodeEditorService codeEditorService: ICodeEditorService,
 		@IThemeService themeService: IThemeService,
-		@IMessageService messageService: IMessageService
+		@INotificationService notificationService: INotificationService
 	) {
 		super();
 
@@ -213,7 +212,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 		this._contextKeyService = contextKeyService.createScoped(domElement);
 		this._contextKeyService.createKey('isInDiffEditor', true);
 		this._themeService = themeService;
-		this._messageService = messageService;
+		this._notificationService = notificationService;
 
 		this.id = (++DIFF_EDITOR_ID);
 
@@ -853,7 +852,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 			) {
 				this._lastOriginalWarning = currentOriginalModel.uri;
 				this._lastModifiedWarning = currentModifiedModel.uri;
-				this._messageService.show(Severity.Warning, nls.localize("diff.tooLarge", "Cannot compare files because one file is too large."));
+				this._notificationService.warn(nls.localize("diff.tooLarge", "Cannot compare files because one file is too large."));
 			}
 			return;
 		}
diff --git a/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts b/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts
index e1761f3b3e6..68a61cec024 100644
--- a/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts
+++ b/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts
@@ -15,7 +15,7 @@ import { IConfigurationChangedEvent, IEditorOptions, IDiffEditorOptions } from '
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditorWidget';
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService';
-import { IMessageService } from 'vs/platform/message/common/message';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class EmbeddedCodeEditorWidget extends CodeEditor {
 
@@ -72,9 +72,9 @@ export class EmbeddedDiffEditorWidget extends DiffEditorWidget {
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ICodeEditorService codeEditorService: ICodeEditorService,
 		@IThemeService themeService: IThemeService,
-		@IMessageService messageService: IMessageService
+		@INotificationService notificationService: INotificationService
 	) {
-		super(domElement, parentEditor.getRawConfiguration(), editorWorkerService, contextKeyService, instantiationService, codeEditorService, themeService, messageService);
+		super(domElement, parentEditor.getRawConfiguration(), editorWorkerService, contextKeyService, instantiationService, codeEditorService, themeService, notificationService);
 
 		this._parentEditor = parentEditor;
 		this._overwriteOptions = options;
diff --git a/src/vs/editor/common/core/stringBuilder.ts b/src/vs/editor/common/core/stringBuilder.ts
index ff9ec2bedfc..e49d40e4d63 100644
--- a/src/vs/editor/common/core/stringBuilder.ts
+++ b/src/vs/editor/common/core/stringBuilder.ts
@@ -21,7 +21,7 @@ export interface IStringBuilder {
 
 export let createStringBuilder: (capacity: number) => IStringBuilder;
 
-if ((<any>self).TextDecoder) {
+if (typeof TextDecoder !== 'undefined') {
 	createStringBuilder = (capacity) => new StringBuilder(capacity);
 } else {
 	createStringBuilder = (capacity) => new CompatStringBuilder();
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index e5d8c8523ca..d2c05a8ddc5 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -773,7 +773,7 @@ export class TextModel extends Disposable implements model.ITextModel {
 	public getLineContent(lineNumber: number): string {
 		this._assertNotDisposed();
 		if (lineNumber < 1 || lineNumber > this.getLineCount()) {
-			throw new Error('Illegal value ' + lineNumber + ' for `lineNumber`');
+			throw new Error('Illegal value for lineNumber');
 		}
 
 		return this._buffer.getLineContent(lineNumber);
@@ -797,7 +797,7 @@ export class TextModel extends Disposable implements model.ITextModel {
 	public getLineMaxColumn(lineNumber: number): number {
 		this._assertNotDisposed();
 		if (lineNumber < 1 || lineNumber > this.getLineCount()) {
-			throw new Error('Illegal value ' + lineNumber + ' for `lineNumber`');
+			throw new Error('Illegal value for lineNumber');
 		}
 		return this._buffer.getLineLength(lineNumber) + 1;
 	}
@@ -805,7 +805,7 @@ export class TextModel extends Disposable implements model.ITextModel {
 	public getLineFirstNonWhitespaceColumn(lineNumber: number): number {
 		this._assertNotDisposed();
 		if (lineNumber < 1 || lineNumber > this.getLineCount()) {
-			throw new Error('Illegal value ' + lineNumber + ' for `lineNumber`');
+			throw new Error('Illegal value for lineNumber');
 		}
 		return this._buffer.getLineFirstNonWhitespaceColumn(lineNumber);
 	}
@@ -813,7 +813,7 @@ export class TextModel extends Disposable implements model.ITextModel {
 	public getLineLastNonWhitespaceColumn(lineNumber: number): number {
 		this._assertNotDisposed();
 		if (lineNumber < 1 || lineNumber > this.getLineCount()) {
-			throw new Error('Illegal value ' + lineNumber + ' for `lineNumber`');
+			throw new Error('Illegal value for lineNumber');
 		}
 		return this._buffer.getLineLastNonWhitespaceColumn(lineNumber);
 	}
@@ -1586,7 +1586,7 @@ export class TextModel extends Disposable implements model.ITextModel {
 
 	public forceTokenization(lineNumber: number): void {
 		if (lineNumber < 1 || lineNumber > this.getLineCount()) {
-			throw new Error('Illegal value ' + lineNumber + ' for `lineNumber`');
+			throw new Error('Illegal value for lineNumber');
 		}
 
 		const eventBuilder = new ModelTokensChangedEventBuilder();
@@ -1611,7 +1611,7 @@ export class TextModel extends Disposable implements model.ITextModel {
 
 	public getLineTokens(lineNumber: number): LineTokens {
 		if (lineNumber < 1 || lineNumber > this.getLineCount()) {
-			throw new Error('Illegal value ' + lineNumber + ' for `lineNumber`');
+			throw new Error('Illegal value for lineNumber');
 		}
 
 		return this._getLineTokens(lineNumber);
@@ -2163,10 +2163,10 @@ export class TextModel extends Disposable implements model.ITextModel {
 		const lineCount = this.getLineCount();
 
 		if (startLineNumber < 1 || startLineNumber > lineCount) {
-			throw new Error('Illegal value ' + startLineNumber + ' for `startLineNumber`');
+			throw new Error('Illegal value for startLineNumber');
 		}
 		if (endLineNumber < 1 || endLineNumber > lineCount) {
-			throw new Error('Illegal value ' + endLineNumber + ' for `endLineNumber`');
+			throw new Error('Illegal value for endLineNumber');
 		}
 
 		const foldingRules = LanguageConfigurationRegistry.getFoldingRules(this._languageIdentifier.id);
diff --git a/src/vs/editor/common/services/editorSimpleWorker.ts b/src/vs/editor/common/services/editorSimpleWorker.ts
index 39a9e6a9280..cd669a4a94b 100644
--- a/src/vs/editor/common/services/editorSimpleWorker.ts
+++ b/src/vs/editor/common/services/editorSimpleWorker.ts
@@ -21,6 +21,7 @@ import { BasicInplaceReplace } from 'vs/editor/common/modes/supports/inplaceRepl
 import { getWordAtText, ensureValidWordDefinition } from 'vs/editor/common/model/wordHelper';
 import { createMonacoBaseAPI } from 'vs/editor/common/standalone/standaloneBase';
 import { IWordAtPosition, EndOfLineSequence } from 'vs/editor/common/model';
+import { globals } from 'vs/base/common/platform';
 
 export interface IMirrorModel {
 	readonly uri: URI;
@@ -567,8 +568,7 @@ export function create(): IRequestHandler {
 	return new EditorSimpleWorkerImpl();
 }
 
-var global: any = self;
-let isWebWorker = (typeof global.importScripts === 'function');
-if (isWebWorker) {
-	global.monaco = createMonacoBaseAPI();
+if (typeof importScripts === 'function') {
+	// Running in a web worker
+	globals.monaco = createMonacoBaseAPI();
 }
diff --git a/src/vs/editor/common/view/editorColorRegistry.ts b/src/vs/editor/common/view/editorColorRegistry.ts
index 4960109a2ea..bec51990776 100644
--- a/src/vs/editor/common/view/editorColorRegistry.ts
+++ b/src/vs/editor/common/view/editorColorRegistry.ts
@@ -14,6 +14,8 @@ import { Color, RGBA } from 'vs/base/common/color';
 export const editorLineHighlight = registerColor('editor.lineHighlightBackground', { dark: null, light: null, hc: null }, nls.localize('lineHighlight', 'Background color for the highlight of line at the cursor position.'));
 export const editorLineHighlightBorder = registerColor('editor.lineHighlightBorder', { dark: '#282828', light: '#eeeeee', hc: '#f38518' }, nls.localize('lineHighlightBorderBox', 'Background color for the border around the line at the cursor position.'));
 export const editorRangeHighlight = registerColor('editor.rangeHighlightBackground', { dark: '#ffffff0b', light: '#fdff0033', hc: null }, nls.localize('rangeHighlight', 'Background color of highlighted ranges, like by quick open and find features. The color must not be opaque to not hide underlying decorations.'), true);
+export const editorRangeHighlightBorder = registerColor('editor.rangeHighlightBorder', { dark: null, light: null, hc: activeContrastBorder }, nls.localize('rangeHighlightBorder', 'Background color of the border around highlighted ranges.'), true);
+
 export const editorCursorForeground = registerColor('editorCursor.foreground', { dark: '#AEAFAD', light: Color.black, hc: Color.white }, nls.localize('caret', 'Color of the editor cursor.'));
 export const editorCursorBackground = registerColor('editorCursor.background', null, nls.localize('editorCursorBackground', 'The background color of the editor cursor. Allows customizing the color of a character overlapped by a block cursor.'));
 export const editorWhitespaces = registerColor('editorWhitespace.foreground', { dark: '#e3e4e229', light: '#33333333', hc: '#e3e4e229' }, nls.localize('editorWhitespaces', 'Color of whitespace characters in the editor.'));
@@ -45,7 +47,6 @@ export const overviewRulerError = registerColor('editorOverviewRuler.errorForegr
 export const overviewRulerWarning = registerColor('editorOverviewRuler.warningForeground', { dark: new Color(new RGBA(18, 136, 18, 0.7)), light: new Color(new RGBA(18, 136, 18, 0.7)), hc: new Color(new RGBA(50, 255, 50, 1)) }, nls.localize('overviewRuleWarning', 'Overview ruler marker color for warnings.'));
 export const overviewRulerInfo = registerColor('editorOverviewRuler.infoForeground', { dark: new Color(new RGBA(18, 18, 136, 0.7)), light: new Color(new RGBA(18, 18, 136, 0.7)), hc: new Color(new RGBA(50, 50, 255, 1)) }, nls.localize('overviewRuleInfo', 'Overview ruler marker color for infos.'));
 
-
 // contains all color rules that used to defined in editor/browser/widget/editor.css
 registerThemingParticipant((theme, collector) => {
 	let background = theme.getColor(editorBackground);
@@ -56,21 +57,18 @@ registerThemingParticipant((theme, collector) => {
 	if (foreground) {
 		collector.addRule(`.monaco-editor, .monaco-editor .inputarea.ime-input { color: ${foreground}; }`);
 	}
-
 	let gutter = theme.getColor(editorGutter);
 	if (gutter) {
 		collector.addRule(`.monaco-editor .margin { background-color: ${gutter}; }`);
 	}
-
 	let rangeHighlight = theme.getColor(editorRangeHighlight);
 	if (rangeHighlight) {
 		collector.addRule(`.monaco-editor .rangeHighlight { background-color: ${rangeHighlight}; }`);
 	}
-	let outline = theme.getColor(activeContrastBorder);
-	if (outline) {
-		collector.addRule(`.monaco-editor .rangeHighlight { border: 1px dotted ${outline}; }`);
+	let rangeHighlightBorder = theme.getColor(editorRangeHighlightBorder);
+	if (rangeHighlightBorder) {
+		collector.addRule(`.monaco-editor .rangeHighlight { border: 1px dotted ${rangeHighlightBorder}; }`);
 	}
-
 	let invisibles = theme.getColor(editorWhitespaces);
 	if (invisibles) {
 		collector.addRule(`.vs-whitespace { color: ${invisibles} !important; }`);
diff --git a/src/vs/editor/contrib/codelens/codelensController.ts b/src/vs/editor/contrib/codelens/codelensController.ts
index 1b23413d4d7..f3e26373bc6 100644
--- a/src/vs/editor/contrib/codelens/codelensController.ts
+++ b/src/vs/editor/contrib/codelens/codelensController.ts
@@ -10,7 +10,6 @@ import { onUnexpectedError } from 'vs/base/common/errors';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IMessageService } from 'vs/platform/message/common/message';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { CodeLensProviderRegistry, ICodeLensSymbol } from 'vs/editor/common/modes';
 import * as editorBrowser from 'vs/editor/browser/editorBrowser';
@@ -19,10 +18,11 @@ import { ICodeLensData, getCodeLensData } from './codelens';
 import { IConfigurationChangedEvent } from 'vs/editor/common/config/editorOptions';
 import { CodeLens, CodeLensHelper } from 'vs/editor/contrib/codelens/codelensWidget';
 import { IModelDecorationsChangeAccessor } from 'vs/editor/common/model';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class CodeLensContribution implements editorCommon.IEditorContribution {
 
-	private static ID: string = 'css.editor.codeLens';
+	private static readonly ID: string = 'css.editor.codeLens';
 
 	private _isEnabled: boolean;
 
@@ -36,8 +36,8 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 
 	constructor(
 		private _editor: editorBrowser.ICodeEditor,
-		@ICommandService private _commandService: ICommandService,
-		@IMessageService private _messageService: IMessageService
+		@ICommandService private readonly _commandService: ICommandService,
+		@INotificationService private readonly _notificationService: INotificationService
 	) {
 		this._isEnabled = this._editor.getConfiguration().contribInfo.codeLens;
 
@@ -238,7 +238,7 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 						groupsIndex++;
 						codeLensIndex++;
 					} else {
-						this._lenses.splice(codeLensIndex, 0, new CodeLens(groups[groupsIndex], this._editor, helper, accessor, this._commandService, this._messageService, () => this._detectVisibleLenses.schedule()));
+						this._lenses.splice(codeLensIndex, 0, new CodeLens(groups[groupsIndex], this._editor, helper, accessor, this._commandService, this._notificationService, () => this._detectVisibleLenses.schedule()));
 						codeLensIndex++;
 						groupsIndex++;
 					}
@@ -252,7 +252,7 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 
 				// Create extra symbols
 				while (groupsIndex < groups.length) {
-					this._lenses.push(new CodeLens(groups[groupsIndex], this._editor, helper, accessor, this._commandService, this._messageService, () => this._detectVisibleLenses.schedule()));
+					this._lenses.push(new CodeLens(groups[groupsIndex], this._editor, helper, accessor, this._commandService, this._notificationService, () => this._detectVisibleLenses.schedule()));
 					groupsIndex++;
 				}
 
diff --git a/src/vs/editor/contrib/codelens/codelensWidget.ts b/src/vs/editor/contrib/codelens/codelensWidget.ts
index 9954a454096..2bd92ebaa68 100644
--- a/src/vs/editor/contrib/codelens/codelensWidget.ts
+++ b/src/vs/editor/contrib/codelens/codelensWidget.ts
@@ -7,11 +7,9 @@
 
 import 'vs/css!./codelensWidget';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import Severity from 'vs/base/common/severity';
 import { format, escape } from 'vs/base/common/strings';
 import * as dom from 'vs/base/browser/dom';
 import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { Range } from 'vs/editor/common/core/range';
 import { ICodeLensSymbol, Command } from 'vs/editor/common/modes';
 import * as editorBrowser from 'vs/editor/browser/editorBrowser';
@@ -21,6 +19,7 @@ import { editorCodeLensForeground } from 'vs/editor/common/view/editorColorRegis
 import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { editorActiveLinkForeground } from 'vs/platform/theme/common/colorRegistry';
 import { IModelDeltaDecoration, IModelDecorationsChangeAccessor, ITextModel } from 'vs/editor/common/model';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 class CodeLensViewZone implements editorBrowser.IViewZone {
 
@@ -72,7 +71,7 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
 		editor: editorBrowser.ICodeEditor,
 		symbolRange: Range,
 		commandService: ICommandService,
-		messageService: IMessageService
+		notificationService: INotificationService
 	) {
 
 		this._id = 'codeLensWidget' + (++CodeLensContentWidget._idPool);
@@ -95,7 +94,7 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
 				if (command) {
 					editor.focus();
 					commandService.executeCommand(command.id, ...command.arguments).done(undefined, err => {
-						messageService.show(Severity.Error, err);
+						notificationService.error(err);
 					});
 				}
 			}
@@ -221,7 +220,7 @@ export class CodeLens {
 		editor: editorBrowser.ICodeEditor,
 		helper: CodeLensHelper,
 		viewZoneChangeAccessor: editorBrowser.IViewZoneChangeAccessor,
-		commandService: ICommandService, messageService: IMessageService,
+		commandService: ICommandService, notificationService: INotificationService,
 		updateCallabck: Function
 	) {
 		this._editor = editor;
@@ -244,7 +243,7 @@ export class CodeLens {
 			}
 		});
 
-		this._contentWidget = new CodeLensContentWidget(editor, range, commandService, messageService);
+		this._contentWidget = new CodeLensContentWidget(editor, range, commandService, notificationService);
 		this._viewZone = new CodeLensViewZone(range.startLineNumber - 1, updateCallabck);
 
 		this._viewZoneId = viewZoneChangeAccessor.addZone(this._viewZone);
diff --git a/src/vs/editor/contrib/colorPicker/colorDetector.ts b/src/vs/editor/contrib/colorPicker/colorDetector.ts
index a1a967f0427..b839e90d207 100644
--- a/src/vs/editor/contrib/colorPicker/colorDetector.ts
+++ b/src/vs/editor/contrib/colorPicker/colorDetector.ts
@@ -21,7 +21,7 @@ const MAX_DECORATORS = 500;
 
 export class ColorDetector implements IEditorContribution {
 
-	private static ID: string = 'editor.contrib.colorDetector';
+	private static readonly ID: string = 'editor.contrib.colorDetector';
 
 	static RECOMPUTE_TIME = 1000; // ms
 
@@ -39,8 +39,8 @@ export class ColorDetector implements IEditorContribution {
 	private _isEnabled: boolean;
 
 	constructor(private _editor: ICodeEditor,
-		@ICodeEditorService private _codeEditorService: ICodeEditorService,
-		@IConfigurationService private _configurationService: IConfigurationService
+		@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService
 	) {
 		this._globalToDispose.push(_editor.onDidChangeModel((e) => {
 			this._isEnabled = this.isEnabled();
diff --git a/src/vs/editor/contrib/contextmenu/contextmenu.ts b/src/vs/editor/contrib/contextmenu/contextmenu.ts
index c3028475d32..f3c1ab86c25 100644
--- a/src/vs/editor/contrib/contextmenu/contextmenu.ts
+++ b/src/vs/editor/contrib/contextmenu/contextmenu.ts
@@ -40,11 +40,11 @@ export class ContextMenuController implements IEditorContribution {
 
 	constructor(
 		editor: ICodeEditor,
-		@IContextMenuService private _contextMenuService: IContextMenuService,
-		@IContextViewService private _contextViewService: IContextViewService,
-		@IContextKeyService private _contextKeyService: IContextKeyService,
-		@IKeybindingService private _keybindingService: IKeybindingService,
-		@IMenuService private _menuService: IMenuService
+		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
+		@IContextViewService private readonly _contextViewService: IContextViewService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@IMenuService private readonly _menuService: IMenuService
 	) {
 		this._editor = editor;
 
diff --git a/src/vs/editor/contrib/find/findController.ts b/src/vs/editor/contrib/find/findController.ts
index aea6fb8abbc..334de9e40e2 100644
--- a/src/vs/editor/contrib/find/findController.ts
+++ b/src/vs/editor/contrib/find/findController.ts
@@ -362,10 +362,10 @@ export class FindController extends CommonFindController implements IFindControl
 
 	constructor(
 		editor: ICodeEditor,
-		@IContextViewService private _contextViewService: IContextViewService,
-		@IContextKeyService private _contextKeyService: IContextKeyService,
-		@IKeybindingService private _keybindingService: IKeybindingService,
-		@IThemeService private _themeService: IThemeService,
+		@IContextViewService private readonly _contextViewService: IContextViewService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@IThemeService private readonly _themeService: IThemeService,
 		@IStorageService storageService: IStorageService,
 		@optional(IClipboardService) clipboardService: IClipboardService
 	) {
diff --git a/src/vs/editor/contrib/find/findDecorations.ts b/src/vs/editor/contrib/find/findDecorations.ts
index 1a81d8c7e66..b5b5287decb 100644
--- a/src/vs/editor/contrib/find/findDecorations.ts
+++ b/src/vs/editor/contrib/find/findDecorations.ts
@@ -8,7 +8,7 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { editorFindMatchHighlight, editorFindMatch } from 'vs/platform/theme/common/colorRegistry';
+import { overviewRulerFindMatchForeground } from 'vs/platform/theme/common/colorRegistry';
 import { themeColorFromId } from 'vs/platform/theme/common/themeService';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IModelDecorationsChangeAccessor, FindMatch, IModelDeltaDecoration, TrackedRangeStickiness, OverviewRulerLane } from 'vs/editor/common/model';
@@ -226,8 +226,8 @@ export class FindDecorations implements IDisposable {
 		className: 'currentFindMatch',
 		showIfCollapsed: true,
 		overviewRuler: {
-			color: themeColorFromId(editorFindMatch),
-			darkColor: themeColorFromId(editorFindMatch),
+			color: themeColorFromId(overviewRulerFindMatchForeground),
+			darkColor: themeColorFromId(overviewRulerFindMatchForeground),
 			position: OverviewRulerLane.Center
 		}
 	});
@@ -237,8 +237,8 @@ export class FindDecorations implements IDisposable {
 		className: 'findMatch',
 		showIfCollapsed: true,
 		overviewRuler: {
-			color: themeColorFromId(editorFindMatchHighlight),
-			darkColor: themeColorFromId(editorFindMatchHighlight),
+			color: themeColorFromId(overviewRulerFindMatchForeground),
+			darkColor: themeColorFromId(overviewRulerFindMatchForeground),
 			position: OverviewRulerLane.Center
 		}
 	});
@@ -252,8 +252,8 @@ export class FindDecorations implements IDisposable {
 	private static readonly _FIND_MATCH_ONLY_OVERVIEW_DECORATION = ModelDecorationOptions.register({
 		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
 		overviewRuler: {
-			color: themeColorFromId(editorFindMatchHighlight),
-			darkColor: themeColorFromId(editorFindMatchHighlight),
+			color: themeColorFromId(overviewRulerFindMatchForeground),
+			darkColor: themeColorFromId(overviewRulerFindMatchForeground),
 			position: OverviewRulerLane.Center
 		}
 	});
diff --git a/src/vs/editor/contrib/find/findWidget.ts b/src/vs/editor/contrib/find/findWidget.ts
index 19faa63f3b0..d5c25699fbc 100644
--- a/src/vs/editor/contrib/find/findWidget.ts
+++ b/src/vs/editor/contrib/find/findWidget.ts
@@ -28,7 +28,7 @@ import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/c
 import { ITheme, registerThemingParticipant, IThemeService } from 'vs/platform/theme/common/themeService';
 import { Color } from 'vs/base/common/color';
 import { IConfigurationChangedEvent } from 'vs/editor/common/config/editorOptions';
-import { editorFindRangeHighlight, editorFindMatch, editorFindMatchHighlight, activeContrastBorder, contrastBorder, inputBackground, editorWidgetBackground, inputActiveOptionBorder, widgetShadow, inputForeground, inputBorder, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationErrorBackground, inputValidationErrorBorder, errorForeground, editorWidgetBorder } from 'vs/platform/theme/common/colorRegistry';
+import { editorFindRangeHighlight, editorFindMatch, editorFindMatchHighlight, contrastBorder, inputBackground, editorWidgetBackground, inputActiveOptionBorder, widgetShadow, inputForeground, inputBorder, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationErrorBackground, inputValidationErrorBorder, errorForeground, editorWidgetBorder, editorFindMatchBorder, editorFindMatchHighlightBorder, editorFindRangeHighlightBorder } from 'vs/platform/theme/common/colorRegistry';
 
 
 export interface IFindController {
@@ -1076,12 +1076,19 @@ registerThemingParticipant((theme, collector) => {
 		collector.addRule(`.monaco-editor .find-widget { box-shadow: 0 2px 8px ${widgetShadowColor}; }`);
 	}
 
-	let hcOutline = theme.getColor(activeContrastBorder);
-	if (hcOutline) {
-		collector.addRule(`.monaco-editor .findScope { border: 1px dashed ${hcOutline.transparent(0.4)}; }`);
-		collector.addRule(`.monaco-editor .currentFindMatch { border: 2px solid ${hcOutline}; padding: 1px; -moz-box-sizing: border-box; box-sizing: border-box; }`);
-		collector.addRule(`.monaco-editor .findMatch { border: 1px dotted ${hcOutline}; -moz-box-sizing: border-box; box-sizing: border-box; }`);
+	let findMatchHighlightBorder = theme.getColor(editorFindMatchHighlightBorder);
+	if (findMatchHighlightBorder) {
+		collector.addRule(`.monaco-editor .findMatch { border: 1px dotted ${findMatchHighlightBorder}; -moz-box-sizing: border-box; box-sizing: border-box; }`);
 	}
+	let findMatchBorder = theme.getColor(editorFindMatchBorder);
+	if (findMatchBorder) {
+		collector.addRule(`.monaco-editor .currentFindMatch { border: 2px solid ${findMatchBorder}; padding: 1px; -moz-box-sizing: border-box; box-sizing: border-box; }`);
+	}
+	let findRangeHighlightBorder = theme.getColor(editorFindRangeHighlightBorder);
+	if (findRangeHighlightBorder) {
+		collector.addRule(`.monaco-editor .findScope { border: 1px dashed ${findRangeHighlightBorder}; }`);
+	}
+
 	let hcBorder = theme.getColor(contrastBorder);
 	if (hcBorder) {
 		collector.addRule(`.monaco-editor .find-widget { border: 2px solid ${hcBorder}; }`);
diff --git a/src/vs/editor/contrib/find/simpleFindWidget.ts b/src/vs/editor/contrib/find/simpleFindWidget.ts
index a4216e51f39..b4c396e4e40 100644
--- a/src/vs/editor/contrib/find/simpleFindWidget.ts
+++ b/src/vs/editor/contrib/find/simpleFindWidget.ts
@@ -33,7 +33,7 @@ export abstract class SimpleFindWidget extends Widget {
 	protected _updateHistoryDelayer: Delayer<void>;
 
 	constructor(
-		@IContextViewService private _contextViewService: IContextViewService,
+		@IContextViewService private readonly _contextViewService: IContextViewService,
 		private animate: boolean = true
 	) {
 		super();
diff --git a/src/vs/editor/contrib/folding/folding.ts b/src/vs/editor/contrib/folding/folding.ts
index d898a618ca4..9fd6f41c706 100644
--- a/src/vs/editor/contrib/folding/folding.ts
+++ b/src/vs/editor/contrib/folding/folding.ts
@@ -26,6 +26,7 @@ import { HiddenRangeModel } from 'vs/editor/contrib/folding/hiddenRangeModel';
 import { IRange } from 'vs/editor/common/core/range';
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
 import { computeRanges as computeIndentRanges } from 'vs/editor/contrib/folding/indentRangeProvider';
+import { IPosition } from 'vs/editor/common/core/position';
 
 export const ID = 'editor.contrib.folding';
 
@@ -104,7 +105,11 @@ export class FoldingController implements IEditorContribution {
 		if (!model || !this._isEnabled || model.isTooLargeForTokenization()) {
 			return {};
 		}
-		return { collapsedRegions: this.foldingModel.getMemento(), lineCount: model.getLineCount() };
+		if (this.foldingModel) { // disposed ?
+			let collapsedRegions = this.foldingModel.isInitialized ? this.foldingModel.getMemento() : this.hiddenRangeModel.getMemento();
+			return { collapsedRegions, lineCount: model.getLineCount() };
+		}
+		return void 0;
 	}
 
 	/**
@@ -313,15 +318,15 @@ export class FoldingController implements IEditorContribution {
 							toToggle.push(...foldingModel.getRegionsInside(region, r => r.isCollapsed === isCollapsed));
 						}
 						foldingModel.toggleCollapseState(toToggle);
-						this.reveal(lineNumber);
+						this.reveal({ lineNumber, column: 1 });
 					}
 				}
 			}
 		});
 	}
 
-	public reveal(focusLine: number): void {
-		this.editor.revealPositionInCenterIfOutsideViewport({ lineNumber: focusLine, column: 1 }, ScrollType.Smooth);
+	public reveal(position: IPosition): void {
+		this.editor.revealPositionInCenterIfOutsideViewport(position, ScrollType.Smooth);
 	}
 }
 
@@ -340,6 +345,7 @@ abstract class FoldingAction<T> extends EditorAction {
 			return foldingModelPromise.then(foldingModel => {
 				if (foldingModel) {
 					this.invoke(foldingController, foldingModel, editor, args);
+					foldingController.reveal(editor.getSelection().getStartPosition());
 				}
 			});
 		}
@@ -510,10 +516,6 @@ class FoldRecursivelyAction extends FoldingAction<void> {
 	invoke(foldingController: FoldingController, foldingModel: FoldingModel, editor: ICodeEditor): void {
 		let selectedLines = this.getSelectedLines(editor);
 		setCollapseStateLevelsDown(foldingModel, true, Number.MAX_VALUE, selectedLines);
-		if (selectedLines.length > 0) {
-			foldingController.reveal(selectedLines[0]);
-		}
-
 	}
 }
 
diff --git a/src/vs/editor/contrib/folding/foldingModel.ts b/src/vs/editor/contrib/folding/foldingModel.ts
index eb230e2d66e..33e1826061c 100644
--- a/src/vs/editor/contrib/folding/foldingModel.ts
+++ b/src/vs/editor/contrib/folding/foldingModel.ts
@@ -26,18 +26,21 @@ export class FoldingModel {
 
 	private _ranges: FoldingRanges;
 	private _editorDecorationIds: string[];
+	private _isInitialized: boolean;
 
 	private _updateEventEmitter = new Emitter<FoldingModelChangeEvent>();
 
 	public get ranges(): FoldingRanges { return this._ranges; }
 	public get onDidChange(): Event<FoldingModelChangeEvent> { return this._updateEventEmitter.event; }
 	public get textModel() { return this._textModel; }
+	public get isInitialized() { return this._isInitialized; }
 
 	constructor(textModel: ITextModel, decorationProvider: IDecorationProvider) {
 		this._textModel = textModel;
 		this._decorationProvider = decorationProvider;
 		this._ranges = new FoldingRanges(new Uint32Array(0), new Uint32Array(0));
 		this._editorDecorationIds = [];
+		this._isInitialized = false;
 	}
 
 	public toggleCollapseState(regions: FoldingRegion[]) {
@@ -128,6 +131,7 @@ export class FoldingModel {
 
 		this._editorDecorationIds = this._decorationProvider.deltaDecorations(this._editorDecorationIds, newEditorDecorations);
 		this._ranges = newRanges;
+		this._isInitialized = true;
 		this._updateEventEmitter.fire({ model: this });
 	}
 
diff --git a/src/vs/editor/contrib/folding/hiddenRangeModel.ts b/src/vs/editor/contrib/folding/hiddenRangeModel.ts
index a684890bb84..fee0f5108c2 100644
--- a/src/vs/editor/contrib/folding/hiddenRangeModel.ts
+++ b/src/vs/editor/contrib/folding/hiddenRangeModel.ts
@@ -12,7 +12,7 @@ import { findFirst } from 'vs/base/common/arrays';
 
 export class HiddenRangeModel {
 	private _foldingModel: FoldingModel;
-	private _hiddenRanges: IRange[] = [];
+	private _hiddenRanges: IRange[];
 	private _foldingModelListener: IDisposable;
 	private _updateEventEmitter = new Emitter<IRange[]>();
 
@@ -22,6 +22,7 @@ export class HiddenRangeModel {
 	public constructor(model: FoldingModel) {
 		this._foldingModel = model;
 		this._foldingModelListener = model.onDidChange(_ => this.updateHiddenRanges());
+		this._hiddenRanges = [];
 		if (model.ranges.length) {
 			this.updateHiddenRanges();
 		}
@@ -80,6 +81,13 @@ export class HiddenRangeModel {
 		return true;
 	}
 
+	/**
+	 * Collapse state memento, for persistence only, only used if folding model is not yet initialized
+	 */
+	public getMemento(): CollapseMemento {
+		return this._hiddenRanges.map(r => ({ startLineNumber: r.startLineNumber - 1, endLineNumber: r.endLineNumber }));
+	}
+
 	private applyHiddenRanges(newHiddenAreas: IRange[]) {
 		this._hiddenRanges = newHiddenAreas;
 		this._updateEventEmitter.fire(newHiddenAreas);
diff --git a/src/vs/editor/contrib/format/formatActions.ts b/src/vs/editor/contrib/format/formatActions.ts
index ee843f0e1d3..0249c04d93e 100644
--- a/src/vs/editor/contrib/format/formatActions.ts
+++ b/src/vs/editor/contrib/format/formatActions.ts
@@ -23,9 +23,9 @@ import { Range } from 'vs/editor/common/core/range';
 import { alert } from 'vs/base/browser/ui/aria/aria';
 import { EditorState, CodeEditorStateFlag } from 'vs/editor/browser/core/editorState';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ISingleEditOperation } from 'vs/editor/common/model';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 
 function alertFormattingEdits(edits: ISingleEditOperation[]): void {
@@ -264,7 +264,7 @@ export abstract class AbstractFormatAction extends EditorAction {
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): TPromise<void> {
 
 		const workerService = accessor.get(IEditorWorkerService);
-		const messageService = accessor.get(IMessageService);
+		const notificationService = accessor.get(INotificationService);
 
 		const formattingPromise = this._getFormattingEdits(editor);
 		if (!formattingPromise) {
@@ -285,10 +285,7 @@ export abstract class AbstractFormatAction extends EditorAction {
 			editor.focus();
 		}, err => {
 			if (err instanceof Error && err.name === NoProviderError.Name) {
-				messageService.show(
-					Severity.Info,
-					nls.localize('no.provider', "Sorry, but there is no formatter for '{0}'-files installed.", editor.getModel().getLanguageIdentifier().language),
-				);
+				notificationService.info(nls.localize('no.provider', "There is no formatter for '{0}'-files installed.", editor.getModel().getLanguageIdentifier().language));
 			} else {
 				throw err;
 			}
diff --git a/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.ts b/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.ts
index d27eebcc428..5be9a6d7e49 100644
--- a/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.ts
+++ b/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.ts
@@ -9,10 +9,8 @@ import * as nls from 'vs/nls';
 import { alert } from 'vs/base/browser/ui/aria/aria';
 import { KeyCode, KeyMod, KeyChord } from 'vs/base/common/keyCodes';
 import * as platform from 'vs/base/common/platform';
-import Severity from 'vs/base/common/severity';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IEditorService } from 'vs/platform/editor/common/editor';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { Range } from 'vs/editor/common/core/range';
 import { registerEditorAction, IActionOptions, ServicesAccessor, EditorAction } from 'vs/editor/browser/editorExtensions';
 import { Location } from 'vs/editor/common/modes';
@@ -27,6 +25,7 @@ import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ITextModel, IWordAtPosition } from 'vs/editor/common/model';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class DefinitionActionConfig {
 
@@ -50,7 +49,7 @@ export class DefinitionAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): TPromise<void> {
-		const messageService = accessor.get(IMessageService);
+		const notificationService = accessor.get(INotificationService);
 		const editorService = accessor.get(IEditorService);
 		const progressService = accessor.get(IProgressService);
 
@@ -105,7 +104,7 @@ export class DefinitionAction extends EditorAction {
 
 		}, (err) => {
 			// report an error
-			messageService.show(Severity.Error, err);
+			notificationService.error(err);
 		});
 
 		progressService.showWhile(definitionPromise, 250);
diff --git a/src/vs/editor/contrib/gotoError/gotoError.ts b/src/vs/editor/contrib/gotoError/gotoError.ts
index 9efd2151ada..626e4c802e8 100644
--- a/src/vs/editor/contrib/gotoError/gotoError.ts
+++ b/src/vs/editor/contrib/gotoError/gotoError.ts
@@ -430,9 +430,9 @@ class MarkerController implements editorCommon.IEditorContribution {
 
 	constructor(
 		editor: ICodeEditor,
-		@IMarkerService private _markerService: IMarkerService,
-		@IContextKeyService private _contextKeyService: IContextKeyService,
-		@IThemeService private _themeService: IThemeService
+		@IMarkerService private readonly _markerService: IMarkerService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IThemeService private readonly _themeService: IThemeService
 	) {
 		this._editor = editor;
 		this._markersNavigationVisible = CONTEXT_MARKERS_NAVIGATION_VISIBLE.bindTo(this._contextKeyService);
diff --git a/src/vs/editor/contrib/hover/hover.ts b/src/vs/editor/contrib/hover/hover.ts
index 047e21db91b..af7f1a66d41 100644
--- a/src/vs/editor/contrib/hover/hover.ts
+++ b/src/vs/editor/contrib/hover/hover.ts
@@ -56,8 +56,8 @@ export class ModesHoverController implements editorCommon.IEditorContribution {
 	}
 
 	constructor(editor: ICodeEditor,
-		@IOpenerService private _openerService: IOpenerService,
-		@IModeService private _modeService: IModeService
+		@IOpenerService private readonly _openerService: IOpenerService,
+		@IModeService private readonly _modeService: IModeService
 	) {
 		this._editor = editor;
 
diff --git a/src/vs/editor/contrib/links/links.ts b/src/vs/editor/contrib/links/links.ts
index 87a1c0365ab..61e679cb177 100644
--- a/src/vs/editor/contrib/links/links.ts
+++ b/src/vs/editor/contrib/links/links.ts
@@ -9,9 +9,7 @@ import 'vs/css!./links';
 import * as nls from 'vs/nls';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import * as platform from 'vs/base/common/platform';
-import Severity from 'vs/base/common/severity';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction } from 'vs/editor/browser/editorExtensions';
@@ -26,6 +24,7 @@ import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { ClickLinkGesture, ClickLinkMouseEvent, ClickLinkKeyboardEvent } from 'vs/editor/contrib/goToDeclaration/clickLinkGesture';
 import { MarkdownString } from 'vs/base/common/htmlContent';
 import { TrackedRangeStickiness, IModelDeltaDecoration, IModelDecorationsChangeAccessor } from 'vs/editor/common/model';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 const HOVER_MESSAGE_GENERAL_META = new MarkdownString().appendText(
 	platform.isMacintosh
@@ -130,7 +129,7 @@ class LinkOccurrence {
 
 class LinkDetector implements editorCommon.IEditorContribution {
 
-	private static ID: string = 'editor.linkDetector';
+	private static readonly ID: string = 'editor.linkDetector';
 
 	public static get(editor: ICodeEditor): LinkDetector {
 		return editor.getContribution<LinkDetector>(LinkDetector.ID);
@@ -145,17 +144,17 @@ class LinkDetector implements editorCommon.IEditorContribution {
 	private computePromise: TPromise<void>;
 	private activeLinkDecorationId: string;
 	private openerService: IOpenerService;
-	private messageService: IMessageService;
+	private notificationService: INotificationService;
 	private currentOccurrences: { [decorationId: string]: LinkOccurrence; };
 
 	constructor(
 		editor: ICodeEditor,
 		@IOpenerService openerService: IOpenerService,
-		@IMessageService messageService: IMessageService
+		@INotificationService notificationService: INotificationService
 	) {
 		this.editor = editor;
 		this.openerService = openerService;
-		this.messageService = messageService;
+		this.notificationService = notificationService;
 		this.listenersToRemove = [];
 
 		let clickLinkGesture = new ClickLinkGesture(editor);
@@ -327,9 +326,9 @@ class LinkDetector implements editorCommon.IEditorContribution {
 		}, err => {
 			// different error cases
 			if (err === 'invalid') {
-				this.messageService.show(Severity.Warning, nls.localize('invalid.url', 'Sorry, failed to open this link because it is not well-formed: {0}', link.url));
+				this.notificationService.warn(nls.localize('invalid.url', 'Failed to open this link because it is not well-formed: {0}', link.url));
 			} else if (err === 'missing') {
-				this.messageService.show(Severity.Warning, nls.localize('missing.url', 'Sorry, failed to open this link because its target is missing.'));
+				this.notificationService.warn(nls.localize('missing.url', 'Failed to open this link because its target is missing.'));
 			} else {
 				onUnexpectedError(err);
 			}
diff --git a/src/vs/editor/contrib/markdown/markdownRenderer.ts b/src/vs/editor/contrib/markdown/markdownRenderer.ts
index 462a3917918..ff454399f4f 100644
--- a/src/vs/editor/contrib/markdown/markdownRenderer.ts
+++ b/src/vs/editor/contrib/markdown/markdownRenderer.ts
@@ -30,9 +30,6 @@ export class MarkdownRenderer {
 		@optional(IOpenerService) private readonly _openerService: IOpenerService = NullOpenerService,
 	) {
 		this._options = {
-			actionCallback: (content) => {
-				this._openerService.open(URI.parse(content)).then(void 0, onUnexpectedError);
-			},
 			codeBlockRenderer: (languageAlias, value): TPromise<string> => {
 				// In markdown,
 				// it is possible that we stumble upon language aliases (e.g.js instead of javascript)
@@ -47,18 +44,21 @@ export class MarkdownRenderer {
 					return `<span style="font-family: ${editor.getConfiguration().fontInfo.fontFamily}">${code}</span>`;
 				});
 			},
-			codeBlockRenderCallback: () => this._onDidRenderCodeBlock.fire()
+			codeBlockRenderCallback: () => this._onDidRenderCodeBlock.fire(),
+			actionHandler: {
+				callback: (content) => {
+					this._openerService.open(URI.parse(content)).then(void 0, onUnexpectedError);
+				},
+				disposeables: [] // TODO
+			}
 		};
 	}
 
-	render(markdown: IMarkdownString, options?: RenderOptions): HTMLElement {
+	render(markdown: IMarkdownString): HTMLElement {
 		if (!markdown) {
 			return document.createElement('span');
 		}
-		if (options) {
-			return renderMarkdown(markdown, { ...options, ...this._options });
-		} else {
-			return renderMarkdown(markdown, this._options);
-		}
+
+		return renderMarkdown(markdown, this._options);
 	}
 }
diff --git a/src/vs/editor/contrib/quickFix/quickFix.ts b/src/vs/editor/contrib/quickFix/quickFix.ts
index 10bbbe4d5e8..8e273057dc1 100644
--- a/src/vs/editor/contrib/quickFix/quickFix.ts
+++ b/src/vs/editor/contrib/quickFix/quickFix.ts
@@ -13,7 +13,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { onUnexpectedExternalError, illegalArgument } from 'vs/base/common/errors';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { isFalsyOrEmpty, mergeSort } from 'vs/base/common/arrays';
 import { CodeActionKind } from './codeActionTrigger';
 
 export function getCodeActions(model: ITextModel, range: Range, scope?: CodeActionKind): TPromise<CodeAction[]> {
@@ -36,7 +36,7 @@ export function getCodeActions(model: ITextModel, range: Range, scope?: CodeActi
 	});
 
 	return TPromise.join(promises).then(
-		() => allResults.sort(codeActionsComparator)
+		() => mergeSort(allResults, codeActionsComparator)
 	);
 }
 
diff --git a/src/vs/editor/contrib/referenceSearch/referencesController.ts b/src/vs/editor/contrib/referenceSearch/referencesController.ts
index d82c3378137..fd463cf2a95 100644
--- a/src/vs/editor/contrib/referenceSearch/referencesController.ts
+++ b/src/vs/editor/contrib/referenceSearch/referencesController.ts
@@ -7,12 +7,10 @@
 import * as nls from 'vs/nls';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import Severity from 'vs/base/common/severity';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IEditorService } from 'vs/platform/editor/common/editor';
 import { IInstantiationService, optional } from 'vs/platform/instantiation/common/instantiation';
 import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IStorageService } from 'vs/platform/storage/common/storage';
@@ -27,6 +25,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { Position } from 'vs/editor/common/core/position';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { Location } from 'vs/editor/common/modes';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export const ctxReferenceSearchVisible = new RawContextKey<boolean>('referenceSearchVisible', false);
 
@@ -55,14 +54,14 @@ export class ReferencesController implements editorCommon.IEditorContribution {
 	public constructor(
 		editor: ICodeEditor,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IEditorService private _editorService: IEditorService,
-		@ITextModelService private _textModelResolverService: ITextModelService,
-		@IMessageService private _messageService: IMessageService,
-		@IInstantiationService private _instantiationService: IInstantiationService,
-		@IWorkspaceContextService private _contextService: IWorkspaceContextService,
-		@IStorageService private _storageService: IStorageService,
-		@IThemeService private _themeService: IThemeService,
-		@IConfigurationService private _configurationService: IConfigurationService,
+		@IEditorService private readonly _editorService: IEditorService,
+		@ITextModelService private readonly _textModelResolverService: ITextModelService,
+		@INotificationService private readonly _notificationService: INotificationService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
+		@IStorageService private readonly _storageService: IStorageService,
+		@IThemeService private readonly _themeService: IThemeService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@optional(IEnvironmentService) private _environmentService: IEnvironmentService
 	) {
 		this._editor = editor;
@@ -171,7 +170,7 @@ export class ReferencesController implements editorCommon.IEditorContribution {
 			});
 
 		}, error => {
-			this._messageService.show(Severity.Error, error);
+			this._notificationService.error(error);
 		});
 	}
 
diff --git a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
index 7b0e5ee38ed..ee73377d033 100644
--- a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
+++ b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
@@ -164,7 +164,7 @@ class DecorationsManager implements IDisposable {
 class DataSource implements tree.IDataSource {
 
 	constructor(
-		@ITextModelService private _textModelResolverService: ITextModelService
+		@ITextModelService private readonly _textModelResolverService: ITextModelService
 	) {
 		//
 	}
@@ -305,7 +305,7 @@ class FileReferencesTemplate {
 
 	constructor(
 		container: HTMLElement,
-		@IWorkspaceContextService private _contextService: IWorkspaceContextService,
+		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
 		@optional(IEnvironmentService) private _environmentService: IEnvironmentService,
 		@IThemeService themeService: IThemeService,
 	) {
@@ -372,8 +372,8 @@ class Renderer implements tree.IRenderer {
 	};
 
 	constructor(
-		@IWorkspaceContextService private _contextService: IWorkspaceContextService,
-		@IThemeService private _themeService: IThemeService,
+		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
+		@IThemeService private readonly _themeService: IThemeService,
 		@optional(IEnvironmentService) private _environmentService: IEnvironmentService,
 	) {
 		//
diff --git a/src/vs/editor/contrib/rename/rename.ts b/src/vs/editor/contrib/rename/rename.ts
index f6cbd734f42..0f301a6d09f 100644
--- a/src/vs/editor/contrib/rename/rename.ts
+++ b/src/vs/editor/contrib/rename/rename.ts
@@ -8,11 +8,9 @@
 import * as nls from 'vs/nls';
 import { isPromiseCanceledError, illegalArgument, onUnexpectedExternalError } from 'vs/base/common/errors';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import Severity from 'vs/base/common/severity';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IFileService } from 'vs/platform/files/common/files';
 import { RawContextKey, IContextKey, IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction, EditorCommand, registerEditorCommand, registerDefaultLanguageCommand } from 'vs/editor/browser/editorExtensions';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
@@ -32,6 +30,7 @@ import { Range } from 'vs/editor/common/core/range';
 import { MessageController } from 'vs/editor/contrib/message/messageController';
 import { EditorState, CodeEditorStateFlag } from 'vs/editor/browser/core/editorState';
 import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 
 export function rename(model: ITextModel, position: Position, newName: string): TPromise<WorkspaceEdit> {
@@ -113,9 +112,9 @@ class RenameController implements IEditorContribution {
 
 	constructor(
 		private editor: ICodeEditor,
-		@IMessageService private _messageService: IMessageService,
-		@ITextModelService private _textModelResolverService: ITextModelService,
-		@IProgressService private _progressService: IProgressService,
+		@INotificationService private readonly _notificationService: INotificationService,
+		@ITextModelService private readonly _textModelResolverService: ITextModelService,
+		@IProgressService private readonly _progressService: IProgressService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IThemeService themeService: IThemeService,
 		@optional(IFileService) private _fileService: IFileService
@@ -201,7 +200,7 @@ class RenameController implements IEditorContribution {
 					if (state.validate(this.editor)) {
 						MessageController.get(this.editor).showMessage(result.rejectReason, this.editor.getPosition());
 					} else {
-						this._messageService.show(Severity.Info, result.rejectReason);
+						this._notificationService.info(result.rejectReason);
 					}
 					return undefined;
 				}
@@ -216,7 +215,7 @@ class RenameController implements IEditorContribution {
 				});
 
 			}, err => {
-				this._messageService.show(Severity.Error, nls.localize('rename.failed', "Sorry, rename failed to execute."));
+				this._notificationService.error(nls.localize('rename.failed', "Rename failed to execute."));
 				return TPromise.wrapError(err);
 			});
 
diff --git a/src/vs/editor/contrib/snippet/snippetController2.ts b/src/vs/editor/contrib/snippet/snippetController2.ts
index eda1c4e1509..f929ab3239f 100644
--- a/src/vs/editor/contrib/snippet/snippetController2.ts
+++ b/src/vs/editor/contrib/snippet/snippetController2.ts
@@ -42,7 +42,7 @@ export class SnippetController2 implements IEditorContribution {
 
 	constructor(
 		private readonly _editor: ICodeEditor,
-		@ILogService private _logService: ILogService,
+		@ILogService private readonly _logService: ILogService,
 		@IContextKeyService contextKeyService: IContextKeyService
 	) {
 		this._inSnippet = SnippetController2.InSnippetMode.bindTo(contextKeyService);
diff --git a/src/vs/editor/contrib/snippet/test/snippetController2.old.test.ts b/src/vs/editor/contrib/snippet/test/snippetController2.old.test.ts
index 6979ff09551..a7e46d98f0d 100644
--- a/src/vs/editor/contrib/snippet/test/snippetController2.old.test.ts
+++ b/src/vs/editor/contrib/snippet/test/snippetController2.old.test.ts
@@ -18,7 +18,7 @@ class TestSnippetController extends SnippetController2 {
 
 	constructor(
 		editor: ICodeEditor,
-		@IContextKeyService private _contextKeyService: IContextKeyService
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService
 	) {
 		super(editor, new NullLogService(), _contextKeyService);
 	}
diff --git a/src/vs/editor/contrib/suggest/suggestController.ts b/src/vs/editor/contrib/suggest/suggestController.ts
index b800056c46c..d5b911c551c 100644
--- a/src/vs/editor/contrib/suggest/suggestController.ts
+++ b/src/vs/editor/contrib/suggest/suggestController.ts
@@ -77,7 +77,7 @@ class AcceptOnCharacterOracle {
 
 export class SuggestController implements IEditorContribution {
 
-	private static ID: string = 'editor.contrib.suggestController';
+	private static readonly ID: string = 'editor.contrib.suggestController';
 
 	public static get(editor: ICodeEditor): SuggestController {
 		return editor.getContribution<SuggestController>(SuggestController.ID);
@@ -90,9 +90,9 @@ export class SuggestController implements IEditorContribution {
 
 	constructor(
 		private _editor: ICodeEditor,
-		@ICommandService private _commandService: ICommandService,
-		@IContextKeyService private _contextKeyService: IContextKeyService,
-		@IInstantiationService private _instantiationService: IInstantiationService,
+		@ICommandService private readonly _commandService: ICommandService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) {
 		this._model = new SuggestModel(this._editor);
 		this._memory = _instantiationService.createInstance(SuggestMemories, this._editor.getConfiguration().contribInfo.suggestSelection);
diff --git a/src/vs/editor/contrib/suggest/suggestMemory.ts b/src/vs/editor/contrib/suggest/suggestMemory.ts
index 58df1fd7179..7ead0af993a 100644
--- a/src/vs/editor/contrib/suggest/suggestMemory.ts
+++ b/src/vs/editor/contrib/suggest/suggestMemory.ts
@@ -177,7 +177,7 @@ export class SuggestMemories {
 
 	constructor(
 		mode: MemMode,
-		@IStorageService private _storageService: IStorageService
+		@IStorageService private readonly _storageService: IStorageService
 	) {
 		this._persistSoon = new RunOnceScheduler(() => this._flush(), 3000);
 		this.setMode(mode);
diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts
index fd0c0a21f47..180d53dc16a 100644
--- a/src/vs/editor/contrib/suggest/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/suggestWidget.ts
@@ -343,7 +343,7 @@ export interface ISelectedSuggestion {
 
 export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>, IDisposable {
 
-	private static ID: string = 'editor.widget.suggestWidget';
+	private static readonly ID: string = 'editor.widget.suggestWidget';
 
 	static LOADING_MESSAGE: string = nls.localize('suggestWidget.loading', "Loading...");
 	static NO_SUGGESTIONS_MESSAGE: string = nls.localize('suggestWidget.noSuggestions', "No suggestions.");
@@ -596,7 +596,6 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 			this.ignoreFocusEvents = false;
 		}
 
-		this.updateListHeight();
 		this.list.reveal(index);
 
 		this.currentSuggestionDetails = item.resolve()
@@ -654,15 +653,8 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 				this.show();
 				break;
 			case State.Open:
-				hide(this.messageElement);
+				hide(this.messageElement, this.details.element);
 				show(this.listElement);
-				if (this.expandDocsSettingFromStorage()
-					&& canExpandCompletionItem(this.list.getFocusedElements()[0])) {
-					show(this.details.element);
-					this.expandSideOrBelow();
-				} else {
-					hide(this.details.element);
-				}
 				this.show();
 				break;
 			case State.Frozen:
@@ -742,7 +734,6 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 			this.focusedItem = null;
 			this.focusedItemIndex = null;
 			this.list.splice(0, this.list.length, this.completionModel.items);
-			this.list.setFocus([selectionIndex]);
 			this.list.reveal(selectionIndex, selectionIndex);
 
 			if (isFrozen) {
@@ -751,6 +742,8 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 				this.setState(State.Open);
 			}
 
+			this.list.setFocus([selectionIndex]);
+
 			// Reset focus border
 			if (this.detailsBorderColor) {
 				this.details.element.style.borderColor = this.detailsBorderColor;
@@ -977,7 +970,7 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 		return SuggestWidget.ID;
 	}
 
-	private updateListHeight(): number {
+	private updateListHeight(): void {
 		let height = 0;
 
 		if (this.state === State.Empty || this.state === State.Loading) {
@@ -990,10 +983,6 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 		this.element.style.lineHeight = `${this.unfocusedHeight}px`;
 		this.listElement.style.height = `${height}px`;
 		this.list.layout(height);
-
-		this.editor.layoutContentWidget(this);
-
-		return height;
 	}
 
 	private adjustDocsPosition() {
diff --git a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
index 02875a72eab..3918a0f64db 100644
--- a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
+++ b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
@@ -15,7 +15,7 @@ import { registerEditorContribution, EditorAction, IActionOptions, registerEdito
 import { DocumentHighlight, DocumentHighlightKind, DocumentHighlightProviderRegistry } from 'vs/editor/common/modes';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Position } from 'vs/editor/common/core/position';
-import { registerColor, editorSelectionHighlight, activeContrastBorder, overviewRulerSelectionHighlightForeground } from 'vs/platform/theme/common/colorRegistry';
+import { registerColor, editorSelectionHighlight, overviewRulerSelectionHighlightForeground, activeContrastBorder, editorSelectionHighlightBorder } from 'vs/platform/theme/common/colorRegistry';
 import { registerThemingParticipant, themeColorFromId } from 'vs/platform/theme/common/themeService';
 import { CursorChangeReason, ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
@@ -29,6 +29,8 @@ import { ITextModel, TrackedRangeStickiness, OverviewRulerLane, IModelDeltaDecor
 
 export const editorWordHighlight = registerColor('editor.wordHighlightBackground', { dark: '#575757B8', light: '#57575740', hc: null }, nls.localize('wordHighlight', 'Background color of a symbol during read-access, like reading a variable. The color must not be opaque to not hide underlying decorations.'), true);
 export const editorWordHighlightStrong = registerColor('editor.wordHighlightStrongBackground', { dark: '#004972B8', light: '#0e639c40', hc: null }, nls.localize('wordHighlightStrong', 'Background color of a symbol during write-access, like writing to a variable. The color must not be opaque to not hide underlying decorations.'), true);
+export const editorWordHighlightBorder = registerColor('editor.wordHighlightBorder', { light: null, dark: null, hc: activeContrastBorder }, nls.localize('wordHighlightBorder', 'Border color of a symbol during read-access, like reading a variable.'));
+export const editorWordHighlightStrongBorder = registerColor('editor.wordHighlightStrongBorder', { light: null, dark: null, hc: activeContrastBorder }, nls.localize('wordHighlightStrongBorder', 'Border color of a symbol during write-access, like writing to a variable.'));
 
 export const overviewRulerWordHighlightForeground = registerColor('editorOverviewRuler.wordHighlightForeground', { dark: '#A0A0A0', light: '#A0A0A0', hc: '#A0A0A0' }, nls.localize('overviewRulerWordHighlightForeground', 'Overview ruler marker color for symbol highlights.'));
 export const overviewRulerWordHighlightStrongForeground = registerColor('editorOverviewRuler.wordHighlightStrongForeground', { dark: '#C0A0C0', light: '#C0A0C0', hc: '#C0A0C0' }, nls.localize('overviewRulerWordHighlightStrongForeground', 'Overview ruler marker color for write-access symbol highlights.'));
@@ -515,11 +517,17 @@ registerThemingParticipant((theme, collector) => {
 	if (wordHighlightStrong) {
 		collector.addRule(`.monaco-editor .wordHighlightStrong { background-color: ${wordHighlightStrong}; }`);
 	}
-	let hcOutline = theme.getColor(activeContrastBorder);
-	if (hcOutline) {
-		collector.addRule(`.monaco-editor .selectionHighlight { border: 1px dotted ${hcOutline}; box-sizing: border-box; }`);
-		collector.addRule(`.monaco-editor .wordHighlight { border: 1px dashed ${hcOutline}; box-sizing: border-box; }`);
-		collector.addRule(`.monaco-editor .wordHighlightStrong { border: 1px dashed ${hcOutline}; box-sizing: border-box; }`);
+	let selectionHighlightBorder = theme.getColor(editorSelectionHighlightBorder);
+	if (selectionHighlightBorder) {
+		collector.addRule(`.monaco-editor .selectionHighlight { border: 1px dotted ${selectionHighlightBorder}; box-sizing: border-box; }`);
+	}
+	let wordHighlightBorder = theme.getColor(editorWordHighlightBorder);
+	if (wordHighlightBorder) {
+		collector.addRule(`.monaco-editor .wordHighlight { border: 1px dashed ${wordHighlightBorder}; box-sizing: border-box; }`);
+	}
+	let wordHighlightStrongBorder = theme.getColor(editorWordHighlightStrongBorder);
+	if (wordHighlightStrongBorder) {
+		collector.addRule(`.monaco-editor .wordHighlightStrong { border: 1px dashed ${wordHighlightStrongBorder}; box-sizing: border-box; }`);
 	}
 
 });
diff --git a/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts b/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts
index 44f2fca8421..7f6504e4607 100644
--- a/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts
+++ b/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts
@@ -115,9 +115,9 @@ class AccessibilityHelpWidget extends Widget implements IOverlayWidget {
 
 	constructor(
 		editor: ICodeEditor,
-		@IContextKeyService private _contextKeyService: IContextKeyService,
-		@IKeybindingService private _keybindingService: IKeybindingService,
-		@IOpenerService private _openerService: IOpenerService
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@IOpenerService private readonly _openerService: IOpenerService
 	) {
 		super();
 
diff --git a/src/vs/editor/standalone/browser/simpleServices.ts b/src/vs/editor/standalone/browser/simpleServices.ts
index 87566d71df1..e45ae59ff28 100644
--- a/src/vs/editor/standalone/browser/simpleServices.ts
+++ b/src/vs/editor/standalone/browser/simpleServices.ts
@@ -17,7 +17,6 @@ import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayo
 import { KeybindingResolver } from 'vs/platform/keybinding/common/keybindingResolver';
 import { IKeybindingEvent, KeybindingSource, IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
 import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IConfirmation, IMessageService, IConfirmationResult } from 'vs/platform/message/common/message';
 import { IWorkspaceContextService, IWorkspace, WorkbenchState, IWorkspaceFolder, IWorkspaceFoldersChangeEvent, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { ICodeEditor, IDiffEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -39,6 +38,8 @@ import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKe
 import { OS } from 'vs/base/common/platform';
 import { IRange } from 'vs/editor/common/core/range';
 import { ITextModel } from 'vs/editor/common/model';
+import { INotificationService, INotification, INotificationHandle, NoOpNotification } from 'vs/platform/notification/common/notification';
+import { IConfirmation, IConfirmationResult, IConfirmationService } from 'vs/platform/dialogs/common/dialogs';
 
 export class SimpleEditor implements IEditor {
 
@@ -234,33 +235,10 @@ export class SimpleProgressService implements IProgressService {
 	}
 }
 
-export class SimpleMessageService implements IMessageService {
+export class SimpleConfirmationService implements IConfirmationService {
 
 	public _serviceBrand: any;
 
-	private static readonly Empty = function () { /* nothing */ };
-
-	public show(sev: Severity, message: any): () => void {
-
-		switch (sev) {
-			case Severity.Error:
-				console.error(message);
-				break;
-			case Severity.Warning:
-				console.warn(message);
-				break;
-			default:
-				console.log(message);
-				break;
-		}
-
-		return SimpleMessageService.Empty;
-	}
-
-	public hideAll(): void {
-		// No-op
-	}
-
 	public confirm(confirmation: IConfirmation): TPromise<boolean> {
 		let messageText = confirmation.message;
 		if (confirmation.detail) {
@@ -280,6 +258,41 @@ export class SimpleMessageService implements IMessageService {
 	}
 }
 
+export class SimpleNotificationService implements INotificationService {
+
+	public _serviceBrand: any;
+
+	private static readonly NO_OP: INotificationHandle = new NoOpNotification();
+
+	public info(message: string): INotificationHandle {
+		return this.notify({ severity: Severity.Info, message });
+	}
+
+	public warn(message: string): INotificationHandle {
+		return this.notify({ severity: Severity.Warning, message });
+	}
+
+	public error(error: string | Error): INotificationHandle {
+		return this.notify({ severity: Severity.Error, message: error });
+	}
+
+	public notify(notification: INotification): INotificationHandle {
+		switch (notification.severity) {
+			case Severity.Error:
+				console.error(notification.message);
+				break;
+			case Severity.Warning:
+				console.warn(notification.message);
+				break;
+			default:
+				console.log(notification.message);
+				break;
+		}
+
+		return SimpleNotificationService.NO_OP;
+	}
+}
+
 export class StandaloneCommandService implements ICommandService {
 	_serviceBrand: any;
 
@@ -328,10 +341,10 @@ export class StandaloneKeybindingService extends AbstractKeybindingService {
 		contextKeyService: IContextKeyService,
 		commandService: ICommandService,
 		telemetryService: ITelemetryService,
-		messageService: IMessageService,
+		notificationService: INotificationService,
 		domNode: HTMLElement
 	) {
-		super(contextKeyService, commandService, telemetryService, messageService);
+		super(contextKeyService, commandService, telemetryService, notificationService);
 
 		this._cachedResolver = null;
 		this._dynamicKeybindings = [];
diff --git a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
index 340b2c163bb..14e25fa01f9 100644
--- a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
@@ -27,9 +27,9 @@ import { MenuId, MenuRegistry, IMenuItem } from 'vs/platform/actions/common/acti
 import { IDiffEditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import * as aria from 'vs/base/browser/ui/aria/aria';
-import { IMessageService } from 'vs/platform/message/common/message';
 import * as nls from 'vs/nls';
 import * as browser from 'vs/base/browser/browser';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 /**
  * Description of an action contribution
@@ -360,14 +360,14 @@ export class StandaloneDiffEditor extends DiffEditorWidget implements IStandalon
 		@IEditorWorkerService editorWorkerService: IEditorWorkerService,
 		@ICodeEditorService codeEditorService: ICodeEditorService,
 		@IStandaloneThemeService themeService: IStandaloneThemeService,
-		@IMessageService messageService: IMessageService
+		@INotificationService notificationService: INotificationService
 	) {
 		options = options || {};
 		if (typeof options.theme === 'string') {
 			options.theme = themeService.setTheme(options.theme);
 		}
 
-		super(domElement, options, editorWorkerService, contextKeyService, instantiationService, codeEditorService, themeService, messageService);
+		super(domElement, options, editorWorkerService, contextKeyService, instantiationService, codeEditorService, themeService, notificationService);
 
 		this._contextViewService = <IEditorContextViewService>contextViewService;
 
diff --git a/src/vs/editor/standalone/browser/standaloneEditor.ts b/src/vs/editor/standalone/browser/standaloneEditor.ts
index 85abea91789..53493117eb5 100644
--- a/src/vs/editor/standalone/browser/standaloneEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneEditor.ts
@@ -36,8 +36,8 @@ import { Token } from 'vs/editor/common/core/token';
 import { FontInfo, BareFontInfo } from 'vs/editor/common/config/fontInfo';
 import * as editorOptions from 'vs/editor/common/config/editorOptions';
 import { CursorChangeReason } from 'vs/editor/common/controller/cursorEvents';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { ITextModel, OverviewRulerLane, EndOfLinePreference, DefaultEndOfLine, EndOfLineSequence, TrackedRangeStickiness, TextModelResolvedOptions, FindMatch } from 'vs/editor/common/model';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 function withAllStandaloneServices<T extends editorCommon.IEditor>(domElement: HTMLElement, override: IEditorOverrideServices, callback: (services: DynamicStandaloneServices) => T): T {
 	let services = new DynamicStandaloneServices(domElement, override);
@@ -123,7 +123,7 @@ export function createDiffEditor(domElement: HTMLElement, options?: IDiffEditorC
 			services.get(IEditorWorkerService),
 			services.get(ICodeEditorService),
 			services.get(IStandaloneThemeService),
-			services.get(IMessageService)
+			services.get(INotificationService)
 		);
 	});
 }
diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts
index 552156aca88..3e056e78703 100644
--- a/src/vs/editor/standalone/browser/standaloneServices.ts
+++ b/src/vs/editor/standalone/browser/standaloneServices.ts
@@ -17,7 +17,6 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { MarkerService } from 'vs/platform/markers/common/markerService';
 import { IMarkerService } from 'vs/platform/markers/common/markers';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { IStorageService, NullStorageService } from 'vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -32,15 +31,17 @@ import { IModelService } from 'vs/editor/common/services/modelService';
 import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
 import { CodeEditorServiceImpl } from 'vs/editor/browser/services/codeEditorServiceImpl';
 import {
-	SimpleConfigurationService, SimpleResourceConfigurationService, SimpleMenuService, SimpleMessageService,
-	SimpleProgressService, StandaloneCommandService, StandaloneKeybindingService,
-	StandaloneTelemetryService, SimpleWorkspaceContextService
+	SimpleConfigurationService, SimpleResourceConfigurationService, SimpleMenuService,
+	SimpleProgressService, StandaloneCommandService, StandaloneKeybindingService, SimpleNotificationService,
+	StandaloneTelemetryService, SimpleWorkspaceContextService, SimpleConfirmationService
 } from 'vs/editor/standalone/browser/simpleServices';
 import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
 import { IMenuService } from 'vs/platform/actions/common/actions';
 import { IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneThemeService';
 import { StandaloneThemeServiceImpl } from 'vs/editor/standalone/browser/standaloneThemeServiceImpl';
 import { ILogService, NullLogService } from 'vs/platform/log/common/log';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IConfirmationService } from 'vs/platform/dialogs/common/dialogs';
 
 export interface IEditorContextViewService extends IContextViewService {
 	dispose(): void;
@@ -125,7 +126,9 @@ export module StaticServices {
 
 	export const telemetryService = define(ITelemetryService, () => new StandaloneTelemetryService());
 
-	export const messageService = define(IMessageService, () => new SimpleMessageService());
+	export const confirmationService = define(IConfirmationService, () => new SimpleConfirmationService());
+
+	export const notificationService = define(INotificationService, () => new SimpleNotificationService());
 
 	export const markerService = define(IMarkerService, () => new MarkerService());
 
@@ -160,7 +163,7 @@ export class DynamicStandaloneServices extends Disposable {
 		this._instantiationService = _instantiationService;
 
 		const configurationService = this.get(IConfigurationService);
-		const messageService = this.get(IMessageService);
+		const notificationService = this.get(INotificationService);
 		const telemetryService = this.get(ITelemetryService);
 
 		let ensure = <T>(serviceId: ServiceIdentifier<T>, factory: () => T): T => {
@@ -179,11 +182,11 @@ export class DynamicStandaloneServices extends Disposable {
 
 		let commandService = ensure(ICommandService, () => new StandaloneCommandService(this._instantiationService));
 
-		ensure(IKeybindingService, () => this._register(new StandaloneKeybindingService(contextKeyService, commandService, telemetryService, messageService, domElement)));
+		ensure(IKeybindingService, () => this._register(new StandaloneKeybindingService(contextKeyService, commandService, telemetryService, notificationService, domElement)));
 
-		let contextViewService = ensure(IContextViewService, () => this._register(new ContextViewService(domElement, telemetryService, messageService)));
+		let contextViewService = ensure(IContextViewService, () => this._register(new ContextViewService(domElement, telemetryService, new NullLogService())));
 
-		ensure(IContextMenuService, () => this._register(new ContextMenuService(domElement, telemetryService, messageService, contextViewService)));
+		ensure(IContextMenuService, () => this._register(new ContextMenuService(domElement, telemetryService, notificationService, contextViewService)));
 
 		ensure(IMenuService, () => new SimpleMenuService(commandService));
 	}
diff --git a/src/vs/editor/standalone/test/browser/simpleServices.test.ts b/src/vs/editor/standalone/test/browser/simpleServices.test.ts
index e2a6120ec59..e13eab64aa9 100644
--- a/src/vs/editor/standalone/test/browser/simpleServices.test.ts
+++ b/src/vs/editor/standalone/test/browser/simpleServices.test.ts
@@ -6,7 +6,7 @@
 
 import * as assert from 'assert';
 import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
-import { SimpleConfigurationService, SimpleMessageService, StandaloneKeybindingService, StandaloneCommandService } from 'vs/editor/standalone/browser/simpleServices';
+import { SimpleConfigurationService, StandaloneKeybindingService, StandaloneCommandService, SimpleNotificationService } from 'vs/editor/standalone/browser/simpleServices';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { KeyCode } from 'vs/base/common/keyCodes';
@@ -32,11 +32,11 @@ suite('StandaloneKeybindingService', () => {
 
 		let commandService = new StandaloneCommandService(instantiationService);
 
-		let messageService = new SimpleMessageService();
+		let notificationService = new SimpleNotificationService();
 
 		let domElement = document.createElement('div');
 
-		let keybindingService = new TestStandaloneKeybindingService(contextKeyService, commandService, NullTelemetryService, messageService, domElement);
+		let keybindingService = new TestStandaloneKeybindingService(contextKeyService, commandService, NullTelemetryService, notificationService, domElement);
 
 		let commandInvoked = false;
 		keybindingService.addDynamicKeybinding('testCommand', KeyCode.F9, () => {
diff --git a/src/vs/loader.js b/src/vs/loader.js
index aa1ae79ae5e..291f0e8b6b3 100644
--- a/src/vs/loader.js
+++ b/src/vs/loader.js
@@ -22,20 +22,55 @@ var _amdLoaderGlobal = this;
 var AMDLoader;
 (function (AMDLoader) {
     AMDLoader.global = _amdLoaderGlobal;
-    var Environment = (function () {
-        function Environment(opts) {
-            this.isWindows = opts.isWindows;
-            this.isNode = opts.isNode;
-            this.isElectronRenderer = opts.isElectronRenderer;
-            this.isWebWorker = opts.isWebWorker;
+    var Environment = /** @class */ (function () {
+        function Environment() {
+            this._detected = false;
+            this._isWindows = false;
+            this._isNode = false;
+            this._isElectronRenderer = false;
+            this._isWebWorker = false;
         }
-        Environment.detect = function () {
-            return new Environment({
-                isWindows: this._isWindows(),
-                isNode: (typeof module !== 'undefined' && !!module.exports),
-                isElectronRenderer: (typeof process !== 'undefined' && typeof process.versions !== 'undefined' && typeof process.versions.electron !== 'undefined' && process.type === 'renderer'),
-                isWebWorker: (typeof AMDLoader.global.importScripts === 'function')
-            });
+        Object.defineProperty(Environment.prototype, "isWindows", {
+            get: function () {
+                this._detect();
+                return this._isWindows;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(Environment.prototype, "isNode", {
+            get: function () {
+                this._detect();
+                return this._isNode;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(Environment.prototype, "isElectronRenderer", {
+            get: function () {
+                this._detect();
+                return this._isElectronRenderer;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(Environment.prototype, "isWebWorker", {
+            get: function () {
+                this._detect();
+                return this._isWebWorker;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Environment.prototype._detect = function () {
+            if (this._detected) {
+                return;
+            }
+            this._detected = true;
+            this._isWindows = Environment._isWindows();
+            this._isNode = (typeof module !== 'undefined' && !!module.exports);
+            this._isElectronRenderer = (typeof process !== 'undefined' && typeof process.versions !== 'undefined' && typeof process.versions.electron !== 'undefined' && process.type === 'renderer');
+            this._isWebWorker = (typeof AMDLoader.global.importScripts === 'function');
         };
         Environment._isWindows = function () {
             if (typeof navigator !== 'undefined') {
@@ -58,20 +93,7 @@ var AMDLoader;
  *--------------------------------------------------------------------------------------------*/
 var AMDLoader;
 (function (AMDLoader) {
-    var LoaderEventType;
-    (function (LoaderEventType) {
-        LoaderEventType[LoaderEventType["LoaderAvailable"] = 1] = "LoaderAvailable";
-        LoaderEventType[LoaderEventType["BeginLoadingScript"] = 10] = "BeginLoadingScript";
-        LoaderEventType[LoaderEventType["EndLoadingScriptOK"] = 11] = "EndLoadingScriptOK";
-        LoaderEventType[LoaderEventType["EndLoadingScriptError"] = 12] = "EndLoadingScriptError";
-        LoaderEventType[LoaderEventType["BeginInvokeFactory"] = 21] = "BeginInvokeFactory";
-        LoaderEventType[LoaderEventType["EndInvokeFactory"] = 22] = "EndInvokeFactory";
-        LoaderEventType[LoaderEventType["NodeBeginEvaluatingScript"] = 31] = "NodeBeginEvaluatingScript";
-        LoaderEventType[LoaderEventType["NodeEndEvaluatingScript"] = 32] = "NodeEndEvaluatingScript";
-        LoaderEventType[LoaderEventType["NodeBeginNativeRequire"] = 33] = "NodeBeginNativeRequire";
-        LoaderEventType[LoaderEventType["NodeEndNativeRequire"] = 34] = "NodeEndNativeRequire";
-    })(LoaderEventType = AMDLoader.LoaderEventType || (AMDLoader.LoaderEventType = {}));
-    var LoaderEvent = (function () {
+    var LoaderEvent = /** @class */ (function () {
         function LoaderEvent(type, detail, timestamp) {
             this.type = type;
             this.detail = detail;
@@ -80,9 +102,9 @@ var AMDLoader;
         return LoaderEvent;
     }());
     AMDLoader.LoaderEvent = LoaderEvent;
-    var LoaderEventRecorder = (function () {
+    var LoaderEventRecorder = /** @class */ (function () {
         function LoaderEventRecorder(loaderAvailableTimestamp) {
-            this._events = [new LoaderEvent(LoaderEventType.LoaderAvailable, '', loaderAvailableTimestamp)];
+            this._events = [new LoaderEvent(1 /* LoaderAvailable */, '', loaderAvailableTimestamp)];
         }
         LoaderEventRecorder.prototype.record = function (type, detail) {
             this._events.push(new LoaderEvent(type, detail, AMDLoader.Utilities.getHighPerformanceTimestamp()));
@@ -93,7 +115,7 @@ var AMDLoader;
         return LoaderEventRecorder;
     }());
     AMDLoader.LoaderEventRecorder = LoaderEventRecorder;
-    var NullLoaderEventRecorder = (function () {
+    var NullLoaderEventRecorder = /** @class */ (function () {
         function NullLoaderEventRecorder() {
         }
         NullLoaderEventRecorder.prototype.record = function (type, detail) {
@@ -102,9 +124,9 @@ var AMDLoader;
         NullLoaderEventRecorder.prototype.getEvents = function () {
             return [];
         };
+        NullLoaderEventRecorder.INSTANCE = new NullLoaderEventRecorder();
         return NullLoaderEventRecorder;
     }());
-    NullLoaderEventRecorder.INSTANCE = new NullLoaderEventRecorder();
     AMDLoader.NullLoaderEventRecorder = NullLoaderEventRecorder;
 })(AMDLoader || (AMDLoader = {}));
 /*---------------------------------------------------------------------------------------------
@@ -113,7 +135,7 @@ var AMDLoader;
  *--------------------------------------------------------------------------------------------*/
 var AMDLoader;
 (function (AMDLoader) {
-    var Utilities = (function () {
+    var Utilities = /** @class */ (function () {
         function Utilities() {
         }
         /**
@@ -199,11 +221,11 @@ var AMDLoader;
             }
             return (this.HAS_PERFORMANCE_NOW ? AMDLoader.global.performance.now() : Date.now());
         };
+        Utilities.NEXT_ANONYMOUS_ID = 1;
+        Utilities.PERFORMANCE_NOW_PROBED = false;
+        Utilities.HAS_PERFORMANCE_NOW = false;
         return Utilities;
     }());
-    Utilities.NEXT_ANONYMOUS_ID = 1;
-    Utilities.PERFORMANCE_NOW_PROBED = false;
-    Utilities.HAS_PERFORMANCE_NOW = false;
     AMDLoader.Utilities = Utilities;
 })(AMDLoader || (AMDLoader = {}));
 /*---------------------------------------------------------------------------------------------
@@ -212,13 +234,13 @@ var AMDLoader;
  *--------------------------------------------------------------------------------------------*/
 var AMDLoader;
 (function (AMDLoader) {
-    var ConfigurationOptionsUtil = (function () {
+    var ConfigurationOptionsUtil = /** @class */ (function () {
         function ConfigurationOptionsUtil() {
         }
         /**
          * Ensure configuration options make sense
          */
-        ConfigurationOptionsUtil.validateConfigurationOptions = function (isWebWorker, options) {
+        ConfigurationOptionsUtil.validateConfigurationOptions = function (options) {
             function defaultOnError(err) {
                 if (err.errorCode === 'load') {
                     console.error('Loading "' + err.moduleId + '" failed');
@@ -253,8 +275,7 @@ var AMDLoader;
                 options.config = {};
             }
             if (typeof options.catchError === 'undefined') {
-                // Catch errors by default in web workers, do not catch errors by default in other contexts
-                options.catchError = isWebWorker;
+                options.catchError = false;
             }
             if (typeof options.urlArgs !== 'string') {
                 options.urlArgs = '';
@@ -295,7 +316,7 @@ var AMDLoader;
             }
             return options;
         };
-        ConfigurationOptionsUtil.mergeConfigurationOptions = function (isWebWorker, overwrite, base) {
+        ConfigurationOptionsUtil.mergeConfigurationOptions = function (overwrite, base) {
             if (overwrite === void 0) { overwrite = null; }
             if (base === void 0) { base = null; }
             var result = AMDLoader.Utilities.recursiveClone(base || {});
@@ -314,25 +335,25 @@ var AMDLoader;
                     result[key] = AMDLoader.Utilities.recursiveClone(value);
                 }
             });
-            return ConfigurationOptionsUtil.validateConfigurationOptions(isWebWorker, result);
+            return ConfigurationOptionsUtil.validateConfigurationOptions(result);
         };
         return ConfigurationOptionsUtil;
     }());
     AMDLoader.ConfigurationOptionsUtil = ConfigurationOptionsUtil;
-    var Configuration = (function () {
+    var Configuration = /** @class */ (function () {
         function Configuration(env, options) {
             this._env = env;
-            this.options = ConfigurationOptionsUtil.mergeConfigurationOptions(this._env.isWebWorker, options);
+            this.options = ConfigurationOptionsUtil.mergeConfigurationOptions(options);
             this._createIgnoreDuplicateModulesMap();
             this._createNodeModulesMap();
             this._createSortedPathsRules();
             if (this.options.baseUrl === '') {
-                if (this._env.isNode && this.options.nodeRequire && this.options.nodeRequire.main && this.options.nodeRequire.main.filename) {
+                if (this.options.nodeRequire && this.options.nodeRequire.main && this.options.nodeRequire.main.filename && this._env.isNode) {
                     var nodeMain = this.options.nodeRequire.main.filename;
                     var dirnameIndex = Math.max(nodeMain.lastIndexOf('/'), nodeMain.lastIndexOf('\\'));
                     this.options.baseUrl = nodeMain.substring(0, dirnameIndex + 1);
                 }
-                if (this._env.isNode && this.options.nodeMain) {
+                if (this.options.nodeMain && this._env.isNode) {
                     var nodeMain = this.options.nodeMain;
                     var dirnameIndex = Math.max(nodeMain.lastIndexOf('/'), nodeMain.lastIndexOf('\\'));
                     this.options.baseUrl = nodeMain.substring(0, dirnameIndex + 1);
@@ -383,7 +404,7 @@ var AMDLoader;
          * @result A new configuration
          */
         Configuration.prototype.cloneAndMerge = function (options) {
-            return new Configuration(this._env, ConfigurationOptionsUtil.mergeConfigurationOptions(this._env.isWebWorker, options, this.options));
+            return new Configuration(this._env, ConfigurationOptionsUtil.mergeConfigurationOptions(options, this.options));
         };
         /**
          * Get current options bag. Useful for passing it forward to plugins.
@@ -530,41 +551,49 @@ var AMDLoader;
     /**
      * Load `scriptSrc` only once (avoid multiple <script> tags)
      */
-    var OnlyOnceScriptLoader = (function () {
-        function OnlyOnceScriptLoader(actualScriptLoader) {
-            this.actualScriptLoader = actualScriptLoader;
-            this.callbackMap = {};
+    var OnlyOnceScriptLoader = /** @class */ (function () {
+        function OnlyOnceScriptLoader(env) {
+            this._env = env;
+            this._scriptLoader = null;
+            this._callbackMap = {};
         }
         OnlyOnceScriptLoader.prototype.load = function (moduleManager, scriptSrc, callback, errorback) {
             var _this = this;
+            if (!this._scriptLoader) {
+                this._scriptLoader = (this._env.isWebWorker
+                    ? new WorkerScriptLoader()
+                    : this._env.isNode
+                        ? new NodeScriptLoader(this._env)
+                        : new BrowserScriptLoader());
+            }
             var scriptCallbacks = {
                 callback: callback,
                 errorback: errorback
             };
-            if (this.callbackMap.hasOwnProperty(scriptSrc)) {
-                this.callbackMap[scriptSrc].push(scriptCallbacks);
+            if (this._callbackMap.hasOwnProperty(scriptSrc)) {
+                this._callbackMap[scriptSrc].push(scriptCallbacks);
                 return;
             }
-            this.callbackMap[scriptSrc] = [scriptCallbacks];
-            this.actualScriptLoader.load(moduleManager, scriptSrc, function () { return _this.triggerCallback(scriptSrc); }, function (err) { return _this.triggerErrorback(scriptSrc, err); });
+            this._callbackMap[scriptSrc] = [scriptCallbacks];
+            this._scriptLoader.load(moduleManager, scriptSrc, function () { return _this.triggerCallback(scriptSrc); }, function (err) { return _this.triggerErrorback(scriptSrc, err); });
         };
         OnlyOnceScriptLoader.prototype.triggerCallback = function (scriptSrc) {
-            var scriptCallbacks = this.callbackMap[scriptSrc];
-            delete this.callbackMap[scriptSrc];
+            var scriptCallbacks = this._callbackMap[scriptSrc];
+            delete this._callbackMap[scriptSrc];
             for (var i = 0; i < scriptCallbacks.length; i++) {
                 scriptCallbacks[i].callback();
             }
         };
         OnlyOnceScriptLoader.prototype.triggerErrorback = function (scriptSrc, err) {
-            var scriptCallbacks = this.callbackMap[scriptSrc];
-            delete this.callbackMap[scriptSrc];
+            var scriptCallbacks = this._callbackMap[scriptSrc];
+            delete this._callbackMap[scriptSrc];
             for (var i = 0; i < scriptCallbacks.length; i++) {
                 scriptCallbacks[i].errorback(err);
             }
         };
         return OnlyOnceScriptLoader;
     }());
-    var BrowserScriptLoader = (function () {
+    var BrowserScriptLoader = /** @class */ (function () {
         function BrowserScriptLoader() {
         }
         /**
@@ -597,7 +626,7 @@ var AMDLoader;
         };
         return BrowserScriptLoader;
     }());
-    var WorkerScriptLoader = (function () {
+    var WorkerScriptLoader = /** @class */ (function () {
         function WorkerScriptLoader() {
         }
         WorkerScriptLoader.prototype.load = function (moduleManager, scriptSrc, callback, errorback) {
@@ -611,7 +640,7 @@ var AMDLoader;
         };
         return WorkerScriptLoader;
     }());
-    var NodeScriptLoader = (function () {
+    var NodeScriptLoader = /** @class */ (function () {
         function NodeScriptLoader(env) {
             this._env = env;
             this._didInitialize = false;
@@ -761,12 +790,12 @@ var AMDLoader;
         };
         NodeScriptLoader.prototype._loadAndEvalScript = function (moduleManager, scriptSrc, vmScriptSrc, contents, options, recorder) {
             // create script, run script
-            recorder.record(AMDLoader.LoaderEventType.NodeBeginEvaluatingScript, scriptSrc);
+            recorder.record(31 /* NodeBeginEvaluatingScript */, scriptSrc);
             var script = new this._vm.Script(contents, options);
             var r = script.runInThisContext(options);
             r.call(AMDLoader.global, moduleManager.getGlobalAMDRequireFunc(), moduleManager.getGlobalAMDDefineFunc(), vmScriptSrc, this._path.dirname(scriptSrc));
             // signal done
-            recorder.record(AMDLoader.LoaderEventType.NodeEndEvaluatingScript, scriptSrc);
+            recorder.record(32 /* NodeEndEvaluatingScript */, scriptSrc);
             return script;
         };
         NodeScriptLoader.prototype._getCachedDataPath = function (basedir, filename) {
@@ -814,15 +843,11 @@ var AMDLoader;
             var timeout = minTimeout + Math.ceil(Math.random() * minTimeout);
             setTimeout(callback, timeout);
         };
+        NodeScriptLoader._BOM = 0xFEFF;
         return NodeScriptLoader;
     }());
-    NodeScriptLoader._BOM = 0xFEFF;
     function createScriptLoader(env) {
-        return new OnlyOnceScriptLoader(env.isWebWorker ?
-            new WorkerScriptLoader()
-            : env.isNode ?
-                new NodeScriptLoader(env)
-                : new BrowserScriptLoader());
+        return new OnlyOnceScriptLoader(env);
     }
     AMDLoader.createScriptLoader = createScriptLoader;
 })(AMDLoader || (AMDLoader = {}));
@@ -834,7 +859,7 @@ var AMDLoader;
 (function (AMDLoader) {
     // ------------------------------------------------------------------------
     // ModuleIdResolver
-    var ModuleIdResolver = (function () {
+    var ModuleIdResolver = /** @class */ (function () {
         function ModuleIdResolver(fromModuleId) {
             var lastSlash = fromModuleId.lastIndexOf('/');
             if (lastSlash !== -1) {
@@ -877,13 +902,13 @@ var AMDLoader;
             }
             return result;
         };
+        ModuleIdResolver.ROOT = new ModuleIdResolver('');
         return ModuleIdResolver;
     }());
-    ModuleIdResolver.ROOT = new ModuleIdResolver('');
     AMDLoader.ModuleIdResolver = ModuleIdResolver;
     // ------------------------------------------------------------------------
     // Module
-    var Module = (function () {
+    var Module = /** @class */ (function () {
         function Module(id, strId, dependencies, callback, errorback, moduleIdResolver) {
             this.id = id;
             this.strId = strId;
@@ -930,10 +955,10 @@ var AMDLoader;
             var producedError = null;
             if (this._callback) {
                 if (typeof this._callback === 'function') {
-                    recorder.record(AMDLoader.LoaderEventType.BeginInvokeFactory, this.strId);
+                    recorder.record(21 /* BeginInvokeFactory */, this.strId);
                     var r = Module._invokeFactory(config, this.strId, this._callback, dependenciesValues);
                     producedError = r.producedError;
-                    recorder.record(AMDLoader.LoaderEventType.EndInvokeFactory, this.strId);
+                    recorder.record(22 /* EndInvokeFactory */, this.strId);
                     if (!producedError && typeof r.returnedValue !== 'undefined' && (!this.exportsPassedIn || AMDLoader.Utilities.isEmpty(this.exports))) {
                         this.exports = r.returnedValue;
                     }
@@ -973,7 +998,7 @@ var AMDLoader;
         return Module;
     }());
     AMDLoader.Module = Module;
-    var ModuleIdProvider = (function () {
+    var ModuleIdProvider = /** @class */ (function () {
         function ModuleIdProvider() {
             this._nextId = 0;
             this._strModuleIdToIntModuleId = new Map();
@@ -1000,17 +1025,17 @@ var AMDLoader;
         };
         return ModuleIdProvider;
     }());
-    var RegularDependency = (function () {
+    var RegularDependency = /** @class */ (function () {
         function RegularDependency(id) {
             this.id = id;
         }
+        RegularDependency.EXPORTS = new RegularDependency(0 /* EXPORTS */);
+        RegularDependency.MODULE = new RegularDependency(1 /* MODULE */);
+        RegularDependency.REQUIRE = new RegularDependency(2 /* REQUIRE */);
         return RegularDependency;
     }());
-    RegularDependency.EXPORTS = new RegularDependency(0 /* EXPORTS */);
-    RegularDependency.MODULE = new RegularDependency(1 /* MODULE */);
-    RegularDependency.REQUIRE = new RegularDependency(2 /* REQUIRE */);
     AMDLoader.RegularDependency = RegularDependency;
-    var PluginDependency = (function () {
+    var PluginDependency = /** @class */ (function () {
         function PluginDependency(id, pluginId, pluginParam) {
             this.id = id;
             this.pluginId = pluginId;
@@ -1019,7 +1044,7 @@ var AMDLoader;
         return PluginDependency;
     }());
     AMDLoader.PluginDependency = PluginDependency;
-    var ModuleManager = (function () {
+    var ModuleManager = /** @class */ (function () {
         function ModuleManager(env, scriptLoader, defineFunc, requireFunc, loaderAvailableTimestamp) {
             if (loaderAvailableTimestamp === void 0) { loaderAvailableTimestamp = 0; }
             this._env = env;
@@ -1397,15 +1422,15 @@ var AMDLoader;
                         _this._onLoad(moduleId);
                         return;
                     }
-                    recorder_1.record(AMDLoader.LoaderEventType.BeginLoadingScript, currentPath_1);
+                    recorder_1.record(10 /* BeginLoadingScript */, currentPath_1);
                     _this._scriptLoader.load(_this, currentPath_1, function () {
                         if (_this._config.isBuild()) {
                             _this._buildInfoPath[moduleId] = currentPath_1;
                         }
-                        recorder_1.record(AMDLoader.LoaderEventType.EndLoadingScriptOK, currentPath_1);
+                        recorder_1.record(11 /* EndLoadingScriptOK */, currentPath_1);
                         _this._onLoad(moduleId);
                     }, function (err) {
-                        recorder_1.record(AMDLoader.LoaderEventType.EndLoadingScriptError, currentPath_1);
+                        recorder_1.record(12 /* EndLoadingScriptError */, currentPath_1);
                         loadNextPath(err);
                     });
                 }
@@ -1564,118 +1589,110 @@ var AMDLoader;
 var define;
 var AMDLoader;
 (function (AMDLoader) {
+    var env = new AMDLoader.Environment();
     var moduleManager = null;
-    var DefineFunc = null;
-    var RequireFunc = null;
-    function createGlobalAMDFuncs() {
-        var _defineFunc = function (id, dependencies, callback) {
-            if (typeof id !== 'string') {
-                callback = dependencies;
-                dependencies = id;
-                id = null;
+    var DefineFunc = function (id, dependencies, callback) {
+        if (typeof id !== 'string') {
+            callback = dependencies;
+            dependencies = id;
+            id = null;
+        }
+        if (typeof dependencies !== 'object' || !Array.isArray(dependencies)) {
+            callback = dependencies;
+            dependencies = null;
+        }
+        if (!dependencies) {
+            dependencies = ['require', 'exports', 'module'];
+        }
+        if (id) {
+            moduleManager.defineModule(id, dependencies, callback, null, null);
+        }
+        else {
+            moduleManager.enqueueDefineAnonymousModule(dependencies, callback);
+        }
+    };
+    DefineFunc.amd = {
+        jQuery: true
+    };
+    var _requireFunc_config = function (params, shouldOverwrite) {
+        if (shouldOverwrite === void 0) { shouldOverwrite = false; }
+        moduleManager.configure(params, shouldOverwrite);
+    };
+    var RequireFunc = function () {
+        if (arguments.length === 1) {
+            if ((arguments[0] instanceof Object) && !Array.isArray(arguments[0])) {
+                _requireFunc_config(arguments[0]);
+                return;
             }
-            if (typeof dependencies !== 'object' || !Array.isArray(dependencies)) {
-                callback = dependencies;
-                dependencies = null;
+            if (typeof arguments[0] === 'string') {
+                return moduleManager.synchronousRequire(arguments[0]);
             }
-            if (!dependencies) {
-                dependencies = ['require', 'exports', 'module'];
+        }
+        if (arguments.length === 2 || arguments.length === 3) {
+            if (Array.isArray(arguments[0])) {
+                moduleManager.defineModule(AMDLoader.Utilities.generateAnonymousModule(), arguments[0], arguments[1], arguments[2], null);
+                return;
             }
-            if (id) {
-                moduleManager.defineModule(id, dependencies, callback, null, null);
-            }
-            else {
-                moduleManager.enqueueDefineAnonymousModule(dependencies, callback);
-            }
-        };
-        DefineFunc = _defineFunc;
-        DefineFunc.amd = {
-            jQuery: true
-        };
-        var _requireFunc_config = function (params, shouldOverwrite) {
-            if (shouldOverwrite === void 0) { shouldOverwrite = false; }
-            moduleManager.configure(params, shouldOverwrite);
-        };
-        var _requireFunc = function () {
-            if (arguments.length === 1) {
-                if ((arguments[0] instanceof Object) && !Array.isArray(arguments[0])) {
-                    _requireFunc_config(arguments[0]);
-                    return;
-                }
-                if (typeof arguments[0] === 'string') {
-                    return moduleManager.synchronousRequire(arguments[0]);
-                }
-            }
-            if (arguments.length === 2 || arguments.length === 3) {
-                if (Array.isArray(arguments[0])) {
-                    moduleManager.defineModule(AMDLoader.Utilities.generateAnonymousModule(), arguments[0], arguments[1], arguments[2], null);
-                    return;
-                }
-            }
-            throw new Error('Unrecognized require call');
-        };
-        RequireFunc = _requireFunc;
-        RequireFunc.config = _requireFunc_config;
-        RequireFunc.getConfig = function () {
-            return moduleManager.getConfig().getOptionsLiteral();
-        };
-        RequireFunc.reset = function () {
-            moduleManager = moduleManager.reset();
-        };
-        RequireFunc.getBuildInfo = function () {
-            return moduleManager.getBuildInfo();
-        };
-        RequireFunc.getStats = function () {
-            return moduleManager.getLoaderEvents();
-        };
-    }
+        }
+        throw new Error('Unrecognized require call');
+    };
+    RequireFunc.config = _requireFunc_config;
+    RequireFunc.getConfig = function () {
+        return moduleManager.getConfig().getOptionsLiteral();
+    };
+    RequireFunc.reset = function () {
+        moduleManager = moduleManager.reset();
+    };
+    RequireFunc.getBuildInfo = function () {
+        return moduleManager.getBuildInfo();
+    };
+    RequireFunc.getStats = function () {
+        return moduleManager.getLoaderEvents();
+    };
     function init() {
-        createGlobalAMDFuncs();
-        var env = AMDLoader.Environment.detect();
-        var scriptLoader = AMDLoader.createScriptLoader(env);
-        moduleManager = new AMDLoader.ModuleManager(env, scriptLoader, DefineFunc, RequireFunc, AMDLoader.Utilities.getHighPerformanceTimestamp());
-        if (env.isNode) {
-            var _nodeRequire = (AMDLoader.global.require || require);
-            var nodeRequire = function (what) {
-                moduleManager.getRecorder().record(AMDLoader.LoaderEventType.NodeBeginNativeRequire, what);
-                try {
-                    return _nodeRequire(what);
-                }
-                finally {
-                    moduleManager.getRecorder().record(AMDLoader.LoaderEventType.NodeEndNativeRequire, what);
-                }
-            };
-            AMDLoader.global.nodeRequire = nodeRequire;
-            RequireFunc.nodeRequire = nodeRequire;
+        if (typeof AMDLoader.global.require !== 'undefined' || typeof require !== 'undefined') {
+            var _nodeRequire_1 = (AMDLoader.global.require || require);
+            if (typeof _nodeRequire_1 === 'function' && typeof _nodeRequire_1.resolve === 'function') {
+                // re-expose node's require function
+                var nodeRequire = function (what) {
+                    moduleManager.getRecorder().record(33 /* NodeBeginNativeRequire */, what);
+                    try {
+                        return _nodeRequire_1(what);
+                    }
+                    finally {
+                        moduleManager.getRecorder().record(34 /* NodeEndNativeRequire */, what);
+                    }
+                };
+                AMDLoader.global.nodeRequire = nodeRequire;
+                RequireFunc.nodeRequire = nodeRequire;
+                RequireFunc.__$__nodeRequire = nodeRequire;
+            }
         }
         if (env.isNode && !env.isElectronRenderer) {
             module.exports = RequireFunc;
-            // These two defs are fore the local closure defined in node in the case that the loader is concatenated
-            define = function () {
-                DefineFunc.apply(null, arguments);
-            };
             require = RequireFunc;
         }
         else {
-            // The global variable require can configure the loader
-            if (typeof AMDLoader.global.require !== 'undefined' && typeof AMDLoader.global.require !== 'function') {
-                RequireFunc.config(AMDLoader.global.require);
-            }
             if (!env.isElectronRenderer) {
-                AMDLoader.global.define = define = DefineFunc;
-            }
-            else {
-                define = function () {
-                    DefineFunc.apply(null, arguments);
-                };
+                AMDLoader.global.define = DefineFunc;
             }
             AMDLoader.global.require = RequireFunc;
-            AMDLoader.global.require.__$__nodeRequire = nodeRequire;
         }
     }
     AMDLoader.init = init;
-    if (typeof doNotInitLoader === 'undefined' &&
-        (typeof AMDLoader.global.define !== 'function' || !AMDLoader.global.define.amd)) {
-        init();
+    if (typeof AMDLoader.global.define !== 'function' || !AMDLoader.global.define.amd) {
+        moduleManager = new AMDLoader.ModuleManager(env, AMDLoader.createScriptLoader(env), DefineFunc, RequireFunc, AMDLoader.Utilities.getHighPerformanceTimestamp());
+        // The global variable require can configure the loader
+        if (typeof AMDLoader.global.require !== 'undefined' && typeof AMDLoader.global.require !== 'function') {
+            RequireFunc.config(AMDLoader.global.require);
+        }
+        // This define is for the local closure defined in node in the case that the loader is concatenated
+        define = function () {
+            return DefineFunc.apply(null, arguments);
+        };
+        define.amd = DefineFunc.amd;
+        if (typeof doNotInitLoader === 'undefined') {
+            init();
+        }
     }
 })(AMDLoader || (AMDLoader = {}));
diff --git a/src/vs/nls.js b/src/vs/nls.js
index 2d633b44f9a..79b64a22484 100644
--- a/src/vs/nls.js
+++ b/src/vs/nls.js
@@ -17,13 +17,24 @@
 var NLSLoaderPlugin;
 (function (NLSLoaderPlugin) {
     var Environment = /** @class */ (function () {
-        function Environment(isPseudo) {
-            this.isPseudo = isPseudo;
-            //
+        function Environment() {
+            this._detected = false;
+            this._isPseudo = false;
         }
-        Environment.detect = function () {
-            var isPseudo = (typeof document !== 'undefined' && document.location && document.location.hash.indexOf('pseudo=true') >= 0);
-            return new Environment(isPseudo);
+        Object.defineProperty(Environment.prototype, "isPseudo", {
+            get: function () {
+                this._detect();
+                return this._isPseudo;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Environment.prototype._detect = function () {
+            if (this._detected) {
+                return;
+            }
+            this._detected = true;
+            this._isPseudo = (typeof document !== 'undefined' && document.location && document.location.hash.indexOf('pseudo=true') >= 0);
         };
         return Environment;
     }());
@@ -79,7 +90,7 @@ var NLSLoaderPlugin;
             };
         }
         NLSPlugin.prototype.setPseudoTranslation = function (value) {
-            this._env = new Environment(value);
+            this._env._isPseudo = value;
         };
         NLSPlugin.prototype.create = function (key, data) {
             return {
@@ -130,11 +141,5 @@ var NLSLoaderPlugin;
         return NLSPlugin;
     }());
     NLSLoaderPlugin.NLSPlugin = NLSPlugin;
-    function init() {
-        define('vs/nls', new NLSPlugin(Environment.detect()));
-    }
-    NLSLoaderPlugin.init = init;
-    if (typeof doNotInitLoader === 'undefined') {
-        init();
-    }
+    define('vs/nls', new NLSPlugin(new Environment()));
 })(NLSLoaderPlugin || (NLSLoaderPlugin = {}));
diff --git a/src/vs/platform/actions/browser/menuItemActionItem.ts b/src/vs/platform/actions/browser/menuItemActionItem.ts
index 9f8e5bda400..5cf90e0d73f 100644
--- a/src/vs/platform/actions/browser/menuItemActionItem.ts
+++ b/src/vs/platform/actions/browser/menuItemActionItem.ts
@@ -8,8 +8,6 @@
 import { localize } from 'vs/nls';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IMenu, MenuItemAction, IMenuActionOptions, ICommandAction } from 'vs/platform/actions/common/actions';
-import { IMessageService } from 'vs/platform/message/common/message';
-import Severity from 'vs/base/common/severity';
 import { IAction } from 'vs/base/common/actions';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { ActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
@@ -20,6 +18,7 @@ import { memoize } from 'vs/base/common/decorators';
 import { IdGenerator } from 'vs/base/common/idGenerator';
 import { createCSSRule } from 'vs/base/browser/dom';
 import URI from 'vs/base/common/uri';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 class AltKeyEmitter extends Emitter<boolean> {
 
@@ -110,9 +109,9 @@ export function fillInActions(menu: IMenu, options: IMenuActionOptions, target:
 }
 
 
-export function createActionItem(action: IAction, keybindingService: IKeybindingService, messageService: IMessageService, contextMenuService: IContextMenuService): ActionItem {
+export function createActionItem(action: IAction, keybindingService: IKeybindingService, notificationService: INotificationService, contextMenuService: IContextMenuService): ActionItem {
 	if (action instanceof MenuItemAction) {
-		return new MenuItemActionItem(action, keybindingService, messageService, contextMenuService);
+		return new MenuItemActionItem(action, keybindingService, notificationService, contextMenuService);
 	}
 	return undefined;
 }
@@ -128,9 +127,9 @@ export class MenuItemActionItem extends ActionItem {
 
 	constructor(
 		public _action: MenuItemAction,
-		@IKeybindingService private _keybindingService: IKeybindingService,
-		@IMessageService protected _messageService: IMessageService,
-		@IContextMenuService private _contextMenuService: IContextMenuService
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@INotificationService protected _notificationService: INotificationService,
+		@IContextMenuService private readonly _contextMenuService: IContextMenuService
 	) {
 		super(undefined, _action, { icon: !!(_action.class || _action.item.iconPath), label: !_action.class && !_action.item.iconPath });
 	}
@@ -144,7 +143,7 @@ export class MenuItemActionItem extends ActionItem {
 		event.stopPropagation();
 
 		this.actionRunner.run(this._commandAction)
-			.done(undefined, err => this._messageService.show(Severity.Error, err));
+			.done(undefined, err => this._notificationService.error(err));
 	}
 
 	render(container: HTMLElement): void {
@@ -248,6 +247,6 @@ export class ContextAwareMenuItemActionItem extends MenuItemActionItem {
 		event.stopPropagation();
 
 		this.actionRunner.run(this._commandAction, this._context)
-			.done(undefined, err => this._messageService.show(Severity.Error, err));
+			.done(undefined, err => this._notificationService.error(err));
 	}
 }
\ No newline at end of file
diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index f8786606a24..b1150d970f3 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -154,7 +154,7 @@ export class ExecuteCommandAction extends Action {
 	constructor(
 		id: string,
 		label: string,
-		@ICommandService private _commandService: ICommandService) {
+		@ICommandService private readonly _commandService: ICommandService) {
 
 		super(id, label);
 	}
diff --git a/src/vs/platform/actions/common/menu.ts b/src/vs/platform/actions/common/menu.ts
index eed9d50ea4c..e9d904f3345 100644
--- a/src/vs/platform/actions/common/menu.ts
+++ b/src/vs/platform/actions/common/menu.ts
@@ -23,8 +23,8 @@ export class Menu implements IMenu {
 	constructor(
 		id: MenuId,
 		startupSignal: TPromise<boolean>,
-		@ICommandService private _commandService: ICommandService,
-		@IContextKeyService private _contextKeyService: IContextKeyService
+		@ICommandService private readonly _commandService: ICommandService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService
 	) {
 		startupSignal.then(_ => {
 			const menuItems = MenuRegistry.getMenuItems(id);
diff --git a/src/vs/platform/actions/common/menuService.ts b/src/vs/platform/actions/common/menuService.ts
index c48ef95154b..db0ec647dac 100644
--- a/src/vs/platform/actions/common/menuService.ts
+++ b/src/vs/platform/actions/common/menuService.ts
@@ -16,8 +16,8 @@ export class MenuService implements IMenuService {
 	_serviceBrand: any;
 
 	constructor(
-		@IExtensionService private _extensionService: IExtensionService,
-		@ICommandService private _commandService: ICommandService
+		@IExtensionService private readonly _extensionService: IExtensionService,
+		@ICommandService private readonly _commandService: ICommandService
 	) {
 		//
 	}
diff --git a/src/vs/platform/commands/common/commandService.ts b/src/vs/platform/commands/common/commandService.ts
index db0aff02f20..b104d7c776c 100644
--- a/src/vs/platform/commands/common/commandService.ts
+++ b/src/vs/platform/commands/common/commandService.ts
@@ -22,9 +22,9 @@ export class CommandService extends Disposable implements ICommandService {
 	public readonly onWillExecuteCommand: Event<ICommandEvent> = this._onWillExecuteCommand.event;
 
 	constructor(
-		@IInstantiationService private _instantiationService: IInstantiationService,
-		@IExtensionService private _extensionService: IExtensionService,
-		@ILogService private _logService: ILogService
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IExtensionService private readonly _extensionService: IExtensionService,
+		@ILogService private readonly _logService: ILogService
 	) {
 		super();
 		this._extensionService.whenInstalledExtensionsRegistered().then(value => this._extensionHostIsReady = value);
diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts
index 518898d9d85..34b7a40b1c3 100644
--- a/src/vs/platform/configuration/common/configurationRegistry.ts
+++ b/src/vs/platform/configuration/common/configurationRegistry.ts
@@ -336,7 +336,13 @@ export function validateProperty(property: string): string {
 	return null;
 }
 
-export function getScopes(keys: string[]): ConfigurationScope[] {
+export function getScopes(): { [key: string]: ConfigurationScope } {
+	const scopes = {};
 	const configurationProperties = configurationRegistry.getConfigurationProperties();
-	return keys.map(key => configurationProperties[key].scope);
+	for (const key of Object.keys(configurationProperties)) {
+		scopes[key] = configurationProperties[key].scope;
+	}
+	scopes['launch'] = ConfigurationScope.RESOURCE;
+	scopes['task'] = ConfigurationScope.RESOURCE;
+	return scopes;
 }
diff --git a/src/vs/platform/contextview/browser/contextMenuHandler.ts b/src/vs/platform/contextview/browser/contextMenuHandler.ts
index 5a1eb74ce0e..c0dd673a14d 100644
--- a/src/vs/platform/contextview/browser/contextMenuHandler.ts
+++ b/src/vs/platform/contextview/browser/contextMenuHandler.ts
@@ -11,16 +11,16 @@ import { combinedDisposable, IDisposable } from 'vs/base/common/lifecycle';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { IActionRunner, ActionRunner, IAction, IRunEvent } from 'vs/base/common/actions';
 import { Menu } from 'vs/base/browser/ui/menu/menu';
-import Severity from 'vs/base/common/severity';
 
-import { IContextViewService, IContextMenuDelegate } from 'vs/platform/contextview/browser/contextView';
+import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IMessageService } from 'vs/platform/message/common/message';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IContextMenuDelegate } from 'vs/base/browser/contextmenu';
 
 export class ContextMenuHandler {
 
 	private contextViewService: IContextViewService;
-	private messageService: IMessageService;
+	private notificationService: INotificationService;
 	private telemetryService: ITelemetryService;
 
 	private actionRunner: IActionRunner;
@@ -28,12 +28,12 @@ export class ContextMenuHandler {
 	private menuContainerElement: HTMLElement;
 	private toDispose: IDisposable[];
 
-	constructor(element: HTMLElement, contextViewService: IContextViewService, telemetryService: ITelemetryService, messageService: IMessageService) {
+	constructor(element: HTMLElement, contextViewService: IContextViewService, telemetryService: ITelemetryService, notificationService: INotificationService) {
 		this.setContainer(element);
 
 		this.contextViewService = contextViewService;
 		this.telemetryService = telemetryService;
-		this.messageService = messageService;
+		this.notificationService = notificationService;
 
 		this.actionRunner = new ActionRunner();
 		this.menuContainerElement = null;
@@ -66,8 +66,8 @@ export class ContextMenuHandler {
 
 			hideViewOnRun = false;
 
-			if (e.error && this.messageService) {
-				this.messageService.show(Severity.Error, e.error);
+			if (e.error && this.notificationService) {
+				this.notificationService.error(e.error);
 			}
 		}));
 	}
diff --git a/src/vs/platform/contextview/browser/contextMenuService.ts b/src/vs/platform/contextview/browser/contextMenuService.ts
index a6208963db0..65b3cf6c993 100644
--- a/src/vs/platform/contextview/browser/contextMenuService.ts
+++ b/src/vs/platform/contextview/browser/contextMenuService.ts
@@ -5,10 +5,11 @@
 'use strict';
 
 import { ContextMenuHandler } from './contextMenuHandler';
-import { IContextViewService, IContextMenuService, IContextMenuDelegate } from './contextView';
+import { IContextViewService, IContextMenuService } from './contextView';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IMessageService } from 'vs/platform/message/common/message';
 import Event, { Emitter } from 'vs/base/common/event';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IContextMenuDelegate } from 'vs/base/browser/contextmenu';
 
 
 export class ContextMenuService implements IContextMenuService {
@@ -17,8 +18,8 @@ export class ContextMenuService implements IContextMenuService {
 	private contextMenuHandler: ContextMenuHandler;
 	private _onDidContextMenu = new Emitter<void>();
 
-	constructor(container: HTMLElement, telemetryService: ITelemetryService, messageService: IMessageService, contextViewService: IContextViewService) {
-		this.contextMenuHandler = new ContextMenuHandler(container, contextViewService, telemetryService, messageService);
+	constructor(container: HTMLElement, telemetryService: ITelemetryService, notificationService: INotificationService, contextViewService: IContextViewService) {
+		this.contextMenuHandler = new ContextMenuHandler(container, contextViewService, telemetryService, notificationService);
 	}
 
 	public dispose(): void {
diff --git a/src/vs/platform/contextview/browser/contextView.ts b/src/vs/platform/contextview/browser/contextView.ts
index a111eef4669..88f6c7fbb67 100644
--- a/src/vs/platform/contextview/browser/contextView.ts
+++ b/src/vs/platform/contextview/browser/contextView.ts
@@ -5,12 +5,9 @@
 'use strict';
 
 import { IDisposable } from 'vs/base/common/lifecycle';
-import { IAction, IActionRunner, Action } from 'vs/base/common/actions';
-import { IActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
-import { TPromise } from 'vs/base/common/winjs.base';
 import Event from 'vs/base/common/event';
-import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IContextMenuDelegate } from 'vs/base/browser/contextmenu';
 
 export const IContextViewService = createDecorator<IContextViewService>('contextViewService');
 
@@ -36,29 +33,4 @@ export interface IContextMenuService {
 	showContextMenu(delegate: IContextMenuDelegate): void;
 	// TODO@isidor these event should be removed once we get async context menus
 	onDidContextMenu: Event<void>;
-}
-
-export interface IEvent {
-	shiftKey?: boolean;
-	ctrlKey?: boolean;
-	altKey?: boolean;
-	metaKey?: boolean;
-}
-
-export interface IContextMenuDelegate {
-	getAnchor(): HTMLElement | { x: number; y: number; };
-	getActions(): TPromise<(IAction | ContextSubMenu)[]>;
-	getActionItem?(action: IAction): IActionItem;
-	getActionsContext?(event?: IEvent): any;
-	getKeyBinding?(action: IAction): ResolvedKeybinding;
-	getMenuClassName?(): string;
-	onHide?(didCancel: boolean): void;
-	actionRunner?: IActionRunner;
-	autoSelectFirstItem?: boolean;
-}
-
-export class ContextSubMenu extends Action {
-	constructor(label: string, public entries: (ContextSubMenu | IAction)[]) {
-		super('contextsubmenu', label, '', true);
-	}
-}
+}
\ No newline at end of file
diff --git a/src/vs/platform/contextview/browser/contextViewService.ts b/src/vs/platform/contextview/browser/contextViewService.ts
index f1086b3f6f0..871a806c7e9 100644
--- a/src/vs/platform/contextview/browser/contextViewService.ts
+++ b/src/vs/platform/contextview/browser/contextViewService.ts
@@ -7,7 +7,7 @@
 import { IContextViewService, IContextViewDelegate } from './contextView';
 import { ContextView } from 'vs/base/browser/ui/contextview/contextview';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IMessageService } from 'vs/platform/message/common/message';
+import { ILogService } from 'vs/platform/log/common/log';
 
 export class ContextViewService implements IContextViewService {
 	public _serviceBrand: any;
@@ -17,7 +17,7 @@ export class ContextViewService implements IContextViewService {
 	constructor(
 		container: HTMLElement,
 		@ITelemetryService telemetryService: ITelemetryService,
-		@IMessageService messageService: IMessageService
+		@ILogService private logService: ILogService
 	) {
 		this.contextView = new ContextView(container);
 	}
@@ -29,10 +29,12 @@ export class ContextViewService implements IContextViewService {
 	// ContextView
 
 	public setContainer(container: HTMLElement): void {
+		this.logService.trace('ContextViewService#setContainer');
 		this.contextView.setContainer(container);
 	}
 
 	public showContextView(delegate: IContextViewDelegate): void {
+		this.logService.trace('ContextViewService#showContextView');
 		this.contextView.show(delegate);
 	}
 
@@ -41,6 +43,7 @@ export class ContextViewService implements IContextViewService {
 	}
 
 	public hideContextView(data?: any): void {
+		this.logService.trace('ContextViewService#hideContextView');
 		this.contextView.hide(data);
 	}
 }
\ No newline at end of file
diff --git a/src/vs/platform/message/common/messageIpc.ts b/src/vs/platform/dialogs/common/choiceIpc.ts
similarity index 88%
rename from src/vs/platform/message/common/messageIpc.ts
rename to src/vs/platform/dialogs/common/choiceIpc.ts
index 069ca25321d..e5329e9643e 100644
--- a/src/vs/platform/message/common/messageIpc.ts
+++ b/src/vs/platform/dialogs/common/choiceIpc.ts
@@ -7,7 +7,8 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IChoiceService, Severity } from 'vs/platform/message/common/message';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
+import Severity from 'vs/base/common/severity';
 
 export interface IChoiceChannel extends IChannel {
 	call(command: 'choose'): TPromise<number>;
@@ -33,7 +34,7 @@ export class ChoiceChannelClient implements IChoiceService {
 
 	constructor(private channel: IChoiceChannel) { }
 
-	choose(severity: Severity, message: string, options: string[], cancelId: number, modal?: boolean): TPromise<number> {
+	choose(severity: Severity, message: string, options: string[], cancelId?: number, modal?: boolean): TPromise<number> {
 		return this.channel.call('choose', [severity, message, options, cancelId, modal]);
 	}
 }
\ No newline at end of file
diff --git a/src/vs/platform/dialogs/common/dialogs.ts b/src/vs/platform/dialogs/common/dialogs.ts
new file mode 100644
index 00000000000..6b01e74d0e1
--- /dev/null
+++ b/src/vs/platform/dialogs/common/dialogs.ts
@@ -0,0 +1,84 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { TPromise } from 'vs/base/common/winjs.base';
+import Severity from 'vs/base/common/severity';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+
+export interface IConfirmation {
+	title?: string;
+	type?: 'none' | 'info' | 'error' | 'question' | 'warning';
+	message: string;
+	detail?: string;
+	primaryButton?: string;
+	secondaryButton?: string;
+	checkbox?: {
+		label: string;
+		checked?: boolean;
+	};
+}
+
+export interface IConfirmationResult {
+	confirmed: boolean;
+	checkboxChecked?: boolean;
+}
+
+export const IConfirmationService = createDecorator<IConfirmationService>('confirmationService');
+
+export interface IConfirmationService {
+
+	_serviceBrand: any;
+
+	/**
+	 * Ask the user for confirmation with a modal dialog.
+	 */
+	confirm(confirmation: IConfirmation): TPromise<boolean>;
+
+	/**
+	 * Ask the user for confirmation with a checkbox in a modal dialog.
+	 */
+	confirmWithCheckbox(confirmation: IConfirmation): TPromise<IConfirmationResult>;
+}
+
+export const IChoiceService = createDecorator<IChoiceService>('choiceService');
+
+/**
+ * The choices to present to the user. The `ISecondaryChoice` hint allows to control where
+ * choices appear when the `modal` option is set to `false`. In that case, the choices
+ * are presented as part of a notification and secondary choices will appear less
+ * prominent.
+ */
+export interface SecondaryChoice {
+	label: string;
+	keepOpen?: boolean;
+}
+export type PrimaryChoice = string;
+export type Choice = PrimaryChoice | SecondaryChoice;
+
+export interface IChoiceService {
+
+	_serviceBrand: any;
+
+	/**
+	 * Prompt the user for a choice between multiple choices.
+	 *
+	 * @param choices the choices to present to the user. The `isSecondary` hint allows
+	 * to control where are presented as part of a notification and secondary choices will
+	 * appear less choices appear when the `modal` option is set to `false`. In that case,
+	 * the choices prominent.
+	 *
+	 * @param when `modal` is true, this will block the user until chooses.
+	 *
+	 * @returns A promise with the selected choice index. The promise is cancellable
+	 * which hides the message. The promise can return an error, meaning that
+	 * the user refused to choose.
+	 *
+	 * When `modal` is true and user refused to choose, then promise with index of
+	 * `Cancel` option is returned. If there is no such option then promise with
+	 * `0` index is returned.
+	 */
+	choose(severity: Severity, message: string, choices: Choice[], cancelId?: number, modal?: boolean): TPromise<number>;
+}
\ No newline at end of file
diff --git a/src/vs/platform/message/node/messageCli.ts b/src/vs/platform/dialogs/node/choiceCli.ts
similarity index 88%
rename from src/vs/platform/message/node/messageCli.ts
rename to src/vs/platform/dialogs/node/choiceCli.ts
index 846261e9574..09123c2ab06 100644
--- a/src/vs/platform/message/node/messageCli.ts
+++ b/src/vs/platform/dialogs/node/choiceCli.ts
@@ -5,13 +5,14 @@
 
 import * as readline from 'readline';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IChoiceService, Severity } from 'vs/platform/message/common/message';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
+import Severity from 'vs/base/common/severity';
 
 export class ChoiceCliService implements IChoiceService {
 
 	_serviceBrand: any;
 
-	choose(severity: Severity, message: string, options: string[], cancelId: number): TPromise<number> {
+	choose(severity: Severity, message: string, options: string[]): TPromise<number> {
 		const promise = new TPromise<number>((c, e) => {
 			const rl = readline.createInterface({
 				input: process.stdin,
diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts
index ea31afddd32..5917f324e14 100644
--- a/src/vs/platform/environment/common/environment.ts
+++ b/src/vs/platform/environment/common/environment.ts
@@ -53,6 +53,7 @@ export interface ParsedArgs {
 	'disable-updates'?: string;
 	'disable-crash-reporter'?: string;
 	'skip-add-to-recently-opened'?: boolean;
+	'max-memory'?: number;
 	'file-write'?: boolean;
 	'file-chmod'?: boolean;
 	'upload-logs'?: string;
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
index bea31250516..ed297cda684 100644
--- a/src/vs/platform/environment/node/argv.ts
+++ b/src/vs/platform/environment/node/argv.ts
@@ -167,6 +167,7 @@ const troubleshootingHelp: { [name: string]: string; } = {
 	'--inspect-brk-extensions': localize('inspect-brk-extensions', "Allow debugging and profiling of extensions with the extension host being paused after start. Check the developer tools for the connection uri."),
 	'--disable-gpu': localize('disableGPU', "Disable GPU hardware acceleration."),
 	'--upload-logs': localize('uploadLogs', "Uploads logs from current session to a secure endpoint."),
+	'--max-memory': localize('maxMemory', "Max memory size for a window (in Mbytes).")
 };
 
 export function formatOptions(options: { [name: string]: string; }, columns: number): string {
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index 026353790fd..f605d18f232 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -342,7 +342,7 @@ export interface IExtensionTipsService {
 	_serviceBrand: any;
 	getAllRecommendationsWithReason(): { [id: string]: { reasonId: ExtensionRecommendationReason, reasonText: string }; };
 	getFileBasedRecommendations(): string[];
-	getOtherRecommendations(): string[];
+	getOtherRecommendations(): TPromise<string[]>;
 	getWorkspaceRecommendations(): TPromise<string[]>;
 	getKeymapRecommendations(): string[];
 	getKeywordsForExtension(extension: string): string[];
diff --git a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts
index 6cef891ca00..9c883bbb82f 100644
--- a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts
@@ -635,7 +635,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 						"galleryService:requestError" : {
 							"url" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 							"cdn": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							"message": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+							"message": { "classification": "CallstackOrException", "purpose": "FeatureInsight" }
 						}
 					*/
 					this.telemetryService.publicLog('galleryService:requestError', { url, cdn: true, message });
@@ -658,7 +658,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 							"galleryService:requestError" : {
 								"url" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 								"cdn": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-								"message": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+								"message": { "classification": "CallstackOrException", "purpose": "FeatureInsight" }
 							}
 						*/
 						this.telemetryService.publicLog('galleryService:requestError', { url: fallbackUrl, cdn: false, message });
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 3ed914afb14..718e8fd1b3d 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -29,11 +29,12 @@ import { Limiter } from 'vs/base/common/async';
 import Event, { Emitter } from 'vs/base/common/event';
 import * as semver from 'semver';
 import URI from 'vs/base/common/uri';
-import { IChoiceService, Severity } from 'vs/platform/message/common/message';
 import pkg from 'vs/platform/node/package';
 import { isMacintosh } from 'vs/base/common/platform';
 import { ILogService } from 'vs/platform/log/common/log';
 import { ExtensionsManifestCache } from 'vs/platform/extensionManagement/node/extensionsManifestCache';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
+import Severity from 'vs/base/common/severity';
 
 const SystemExtensionsRoot = path.normalize(path.join(URI.parse(require.toUrl('')).fsPath, '..', 'extensions'));
 const ERROR_SCANNING_SYS_EXTENSIONS = 'scanningSystem';
diff --git a/src/vs/platform/extensions/common/extensionsRegistry.ts b/src/vs/platform/extensions/common/extensionsRegistry.ts
index 52af538246f..d5cf06b32c3 100644
--- a/src/vs/platform/extensions/common/extensionsRegistry.ts
+++ b/src/vs/platform/extensions/common/extensionsRegistry.ts
@@ -148,7 +148,7 @@ const schema: IJSONSchema = {
 			uniqueItems: true,
 			items: {
 				type: 'string',
-				enum: ['Languages', 'Snippets', 'Linters', 'Themes', 'Debuggers', 'Other', 'Keymaps', 'Formatters', 'Extension Packs', 'SCM Providers', 'Azure']
+				enum: ['Languages', 'Snippets', 'Linters', 'Themes', 'Debuggers', 'Other', 'Keymaps', 'Formatters', 'Extension Packs', 'SCM Providers', 'Azure', 'Language Packs']
 			}
 		},
 		galleryBanner: {
diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts
index 1cccbb587e0..5ffee751d2d 100644
--- a/src/vs/platform/files/common/files.ts
+++ b/src/vs/platform/files/common/files.ts
@@ -410,6 +410,11 @@ export interface IFileStat extends IBaseStat {
 	 */
 	isDirectory: boolean;
 
+	/**
+	 * The resource is a symbolic link.
+	 */
+	isSymbolicLink?: boolean;
+
 	/**
 	 * The children of the file stat or undefined if none.
 	 */
@@ -604,7 +609,8 @@ export enum FileOperationResult {
 	FILE_READ_ONLY,
 	FILE_PERMISSION_DENIED,
 	FILE_TOO_LARGE,
-	FILE_INVALID_PATH
+	FILE_INVALID_PATH,
+	FILE_EXCEED_MEMORY_LIMIT
 }
 
 export const AutoSaveConfiguration = {
diff --git a/src/vs/platform/files/node/files.ts b/src/vs/platform/files/node/files.ts
index b6263d0970f..629a67e8499 100644
--- a/src/vs/platform/files/node/files.ts
+++ b/src/vs/platform/files/node/files.ts
@@ -7,4 +7,9 @@
 const WIN32_MAX_FILE_SIZE = 300 * 1024 * 1024; // 300 MB
 const GENERAL_MAX_FILE_SIZE = 16 * 1024 * 1024 * 1024; // 16 GB
 
-export const MAX_FILE_SIZE = process.arch === 'ia32' ? WIN32_MAX_FILE_SIZE : GENERAL_MAX_FILE_SIZE;
\ No newline at end of file
+// See https://github.com/v8/v8/blob/5918a23a3d571b9625e5cce246bdd5b46ff7cd8b/src/heap/heap.cc#L149
+const WIN32_MAX_HEAP_SIZE = 700 * 1024 * 1024; // 700 MB
+const GENERAL_MAX_HEAP_SIZE = 700 * 2 * 1024 * 1024; // 1400 MB
+
+export const MAX_FILE_SIZE = process.arch === 'ia32' ? WIN32_MAX_FILE_SIZE : GENERAL_MAX_FILE_SIZE;
+export const MAX_HEAP_SIZE = process.arch === 'ia32' ? WIN32_MAX_HEAP_SIZE : GENERAL_MAX_HEAP_SIZE;
\ No newline at end of file
diff --git a/src/vs/platform/integrity/node/integrityServiceImpl.ts b/src/vs/platform/integrity/node/integrityServiceImpl.ts
index 63c7816a33c..f5274caa770 100644
--- a/src/vs/platform/integrity/node/integrityServiceImpl.ts
+++ b/src/vs/platform/integrity/node/integrityServiceImpl.ts
@@ -9,13 +9,12 @@ import * as fs from 'fs';
 import * as crypto from 'crypto';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IIntegrityService, IntegrityTestResult, ChecksumPair } from 'vs/platform/integrity/common/integrity';
-import { IMessageService } from 'vs/platform/message/common/message';
 import product from 'vs/platform/node/product';
 import URI from 'vs/base/common/uri';
 import Severity from 'vs/base/common/severity';
-import { Action } from 'vs/base/common/actions';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { IChoiceService, Choice } from 'vs/platform/dialogs/common/dialogs';
 
 interface IStorageData {
 	dontShowPrompt: boolean;
@@ -59,16 +58,14 @@ export class IntegrityServiceImpl implements IIntegrityService {
 
 	public _serviceBrand: any;
 
-	private _messageService: IMessageService;
 	private _storage: IntegrityStorage;
 	private _isPurePromise: Thenable<IntegrityTestResult>;
 
 	constructor(
-		@IMessageService messageService: IMessageService,
+		@IChoiceService private choiceService: IChoiceService,
 		@IStorageService storageService: IStorageService,
 		@ILifecycleService private lifecycleService: ILifecycleService
 	) {
-		this._messageService = messageService;
 		this._storage = new IntegrityStorage(storageService);
 
 		this._isPurePromise = this._isPure();
@@ -88,41 +85,22 @@ export class IntegrityServiceImpl implements IIntegrityService {
 			// Do not prompt
 			return;
 		}
-		const okAction = new Action(
-			'integrity.ok',
-			nls.localize('integrity.ok', "OK"),
-			null,
-			true,
-			() => TPromise.as(true)
-		);
-		const dontShowAgainAction = new Action(
-			'integrity.dontShowAgain',
-			nls.localize('integrity.dontShowAgain', "Don't Show Again"),
-			null,
-			true,
-			() => {
-				this._storage.set({
-					dontShowPrompt: true,
-					commit: product.commit
-				});
-				return TPromise.as(true);
-			}
-		);
-		const moreInfoAction = new Action(
-			'integrity.moreInfo',
-			nls.localize('integrity.moreInfo', "More information"),
-			null,
-			true,
-			() => {
-				const uri = URI.parse(product.checksumFailMoreInfoUrl);
-				window.open(uri.toString(true));
-				return TPromise.as(true);
-			}
-		);
 
-		this._messageService.show(Severity.Warning, {
-			message: nls.localize('integrity.prompt', "Your {0} installation appears to be corrupt. Please reinstall.", product.nameShort),
-			actions: [okAction, moreInfoAction, dontShowAgainAction]
+		const choices: Choice[] = [nls.localize('integrity.moreInformation', "More Information"), { label: nls.localize('integrity.dontShowAgain', "Don't Show Again") }];
+
+		this.choiceService.choose(Severity.Warning, nls.localize('integrity.prompt', "Your {0} installation appears to be corrupt. Please reinstall.", product.nameShort), choices).then(choice => {
+			switch (choice) {
+				case 0 /* More Information */:
+					const uri = URI.parse(product.checksumFailMoreInfoUrl);
+					window.open(uri.toString(true));
+					break;
+				case 1 /* Do not show again */:
+					this._storage.set({
+						dontShowPrompt: true,
+						commit: product.commit
+					});
+					break;
+			}
 		});
 	}
 
diff --git a/src/vs/platform/issue/common/issue.ts b/src/vs/platform/issue/common/issue.ts
index e095b0e2a4b..8955b50b076 100644
--- a/src/vs/platform/issue/common/issue.ts
+++ b/src/vs/platform/issue/common/issue.ts
@@ -55,6 +55,9 @@ export interface ISettingsSearchIssueReporterData extends IssueReporterData {
 	filterResultCount: number;
 }
 
+export interface IssueReporterFeatures {
+}
+
 export interface IIssueService {
 	_serviceBrand: any;
 	openReporter(data: IssueReporterData): TPromise<void>;
diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts
index 13179eb7184..ce01cabbc9e 100644
--- a/src/vs/platform/issue/electron-main/issueService.ts
+++ b/src/vs/platform/issue/electron-main/issueService.ts
@@ -9,12 +9,13 @@ import { TPromise, Promise } from 'vs/base/common/winjs.base';
 import { localize } from 'vs/nls';
 import * as objects from 'vs/base/common/objects';
 import { parseArgs } from 'vs/platform/environment/node/argv';
-import { IIssueService, IssueReporterData } from 'vs/platform/issue/common/issue';
+import { IIssueService, IssueReporterData, IssueReporterFeatures } from 'vs/platform/issue/common/issue';
 import { BrowserWindow, ipcMain, screen } from 'electron';
 import { ILaunchService } from 'vs/code/electron-main/launch';
 import { getPerformanceInfo, PerformanceInfo, getSystemInfo, SystemInfo } from 'vs/code/electron-main/diagnostics';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { isMacintosh } from 'vs/base/common/platform';
+import { ILogService } from 'vs/platform/log/common/log';
 
 const DEFAULT_BACKGROUND_COLOR = '#1E1E1E';
 
@@ -26,7 +27,8 @@ export class IssueService implements IIssueService {
 	constructor(
 		private machineId: string,
 		@IEnvironmentService private environmentService: IEnvironmentService,
-		@ILaunchService private launchService: ILaunchService
+		@ILaunchService private launchService: ILaunchService,
+		@ILogService private logService: ILogService
 	) { }
 
 	openReporter(data: IssueReporterData): TPromise<void> {
@@ -43,7 +45,7 @@ export class IssueService implements IIssueService {
 		});
 
 		ipcMain.on('workbenchCommand', (event, arg) => {
-			this._parentWindow.webContents.send('vscode:runAction', { id: arg });
+			this._parentWindow.webContents.send('vscode:runAction', { id: arg, from: 'issueReporter' });
 		});
 
 		this._parentWindow = BrowserWindow.getFocusedWindow();
@@ -61,7 +63,11 @@ export class IssueService implements IIssueService {
 
 		this._issueWindow.setMenuBarVisibility(false); // workaround for now, until a menu is implemented
 
-		this._issueWindow.loadURL(this.getIssueReporterPath(data));
+		// Modified when testing UI
+		const features: IssueReporterFeatures = {};
+
+		this.logService.trace('issueService#openReporter: opening issue reporter');
+		this._issueWindow.loadURL(this.getIssueReporterPath(data, features));
 
 		return TPromise.as(null);
 	}
@@ -152,19 +158,21 @@ export class IssueService implements IIssueService {
 						resolve(diagnosticInfo);
 					})
 					.catch(err => {
+						this.logService.warn('issueService#getPerformanceInfo ', err.message);
 						reject(err);
 					});
 			});
 		});
 	}
 
-	private getIssueReporterPath(data: IssueReporterData) {
+	private getIssueReporterPath(data: IssueReporterData, features: IssueReporterFeatures) {
 		const windowConfiguration = {
 			appRoot: this.environmentService.appRoot,
 			nodeCachedDataDir: this.environmentService.nodeCachedDataDir,
 			windowId: this._issueWindow.id,
 			machineId: this.machineId,
-			data
+			data,
+			features
 		};
 
 		const environment = parseArgs(process.argv);
diff --git a/src/vs/platform/keybinding/common/abstractKeybindingService.ts b/src/vs/platform/keybinding/common/abstractKeybindingService.ts
index 85e8ad8165a..99b7003cb62 100644
--- a/src/vs/platform/keybinding/common/abstractKeybindingService.ts
+++ b/src/vs/platform/keybinding/common/abstractKeybindingService.ts
@@ -7,16 +7,15 @@
 import * as nls from 'vs/nls';
 import { ResolvedKeybinding, Keybinding } from 'vs/base/common/keyCodes';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import Severity from 'vs/base/common/severity';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { KeybindingResolver, IResolveResult } from 'vs/platform/keybinding/common/keybindingResolver';
 import { IKeybindingEvent, IKeybindingService, IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
 import { IContextKeyService, IContextKeyServiceTarget } from 'vs/platform/contextkey/common/contextkey';
 import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar';
-import { IMessageService } from 'vs/platform/message/common/message';
 import Event, { Emitter } from 'vs/base/common/event';
 import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 interface CurrentChord {
 	keypress: string;
@@ -34,7 +33,7 @@ export abstract class AbstractKeybindingService implements IKeybindingService {
 
 	private _contextKeyService: IContextKeyService;
 	private _statusService: IStatusbarService;
-	private _messageService: IMessageService;
+	private _notificationService: INotificationService;
 	protected _commandService: ICommandService;
 	protected _telemetryService: ITelemetryService;
 
@@ -42,14 +41,14 @@ export abstract class AbstractKeybindingService implements IKeybindingService {
 		contextKeyService: IContextKeyService,
 		commandService: ICommandService,
 		telemetryService: ITelemetryService,
-		messageService: IMessageService,
+		notificationService: INotificationService,
 		statusService?: IStatusbarService
 	) {
 		this._contextKeyService = contextKeyService;
 		this._commandService = commandService;
 		this._telemetryService = telemetryService;
 		this._statusService = statusService;
-		this._messageService = messageService;
+		this._notificationService = notificationService;
 
 		this._currentChord = null;
 		this._currentChordStatusMessage = null;
@@ -163,7 +162,7 @@ export abstract class AbstractKeybindingService implements IKeybindingService {
 				shouldPreventDefault = true;
 			}
 			this._commandService.executeCommand(resolveResult.commandId, resolveResult.commandArgs || {}).done(undefined, err => {
-				this._messageService.show(Severity.Warning, err);
+				this._notificationService.warn(err);
 			});
 			/* __GDPR__
 				"workbenchActionExecuted" : {
diff --git a/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts b/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
index 82518d718f8..81926ed06fa 100644
--- a/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
+++ b/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
@@ -14,12 +14,12 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
 import { KeybindingResolver } from 'vs/platform/keybinding/common/keybindingResolver';
 import { IContext, ContextKeyExpr, IContextKeyService, IContextKeyServiceTarget } from 'vs/platform/contextkey/common/contextkey';
 import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
 import { OS } from 'vs/base/common/platform';
 import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
 import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { INotificationService, NoOpNotification, INotification } from 'vs/platform/notification/common/notification';
 
 function createContext(ctx: any) {
 	return {
@@ -38,10 +38,10 @@ suite('AbstractKeybindingService', () => {
 			resolver: KeybindingResolver,
 			contextKeyService: IContextKeyService,
 			commandService: ICommandService,
-			messageService: IMessageService,
+			notificationService: INotificationService,
 			statusService?: IStatusbarService
 		) {
-			super(contextKeyService, commandService, NullTelemetryService, messageService, statusService);
+			super(contextKeyService, commandService, NullTelemetryService, notificationService, statusService);
 			this._resolver = resolver;
 		}
 
@@ -121,17 +121,23 @@ suite('AbstractKeybindingService', () => {
 				}
 			};
 
-			let messageService: IMessageService = {
+			let notificationService: INotificationService = {
 				_serviceBrand: undefined,
-				hideAll: undefined,
-				confirm: undefined,
-				confirmWithCheckbox: undefined,
-				show: (sev: Severity, message: any): () => void => {
-					showMessageCalls.push({
-						sev: sev,
-						message: message
-					});
-					return null;
+				notify: (notification: INotification) => {
+					showMessageCalls.push({ sev: notification.severity, message: notification.message });
+					return new NoOpNotification();
+				},
+				info: (message: any) => {
+					showMessageCalls.push({ sev: Severity.Info, message });
+					return new NoOpNotification();
+				},
+				warn: (message: any) => {
+					showMessageCalls.push({ sev: Severity.Warning, message });
+					return new NoOpNotification();
+				},
+				error: (message: any) => {
+					showMessageCalls.push({ sev: Severity.Error, message });
+					return new NoOpNotification();
 				}
 			};
 
@@ -150,7 +156,7 @@ suite('AbstractKeybindingService', () => {
 
 			let resolver = new KeybindingResolver(items, []);
 
-			return new TestKeybindingService(resolver, contextKeyService, commandService, messageService, statusbarService);
+			return new TestKeybindingService(resolver, contextKeyService, commandService, notificationService, statusbarService);
 		};
 	});
 
diff --git a/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts b/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts
index 26d27676441..14db6d6a698 100644
--- a/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts
+++ b/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts
@@ -5,10 +5,8 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import Severity from 'vs/base/common/severity';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { ILifecycleService, ShutdownEvent, ShutdownReason, StartupKind, LifecyclePhase, handleVetos } from 'vs/platform/lifecycle/common/lifecycle';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { ipcRenderer as ipc } from 'electron';
 import Event, { Emitter } from 'vs/base/common/event';
@@ -16,6 +14,7 @@ import { IWindowService } from 'vs/platform/windows/common/windows';
 import { mark } from 'vs/base/common/performance';
 import { Barrier } from 'vs/base/common/async';
 import { ILogService } from 'vs/platform/log/common/log';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class LifecycleService implements ILifecycleService {
 
@@ -31,10 +30,10 @@ export class LifecycleService implements ILifecycleService {
 	private _phaseWhen = new Map<LifecyclePhase, Barrier>();
 
 	constructor(
-		@IMessageService private _messageService: IMessageService,
-		@IWindowService private _windowService: IWindowService,
-		@IStorageService private _storageService: IStorageService,
-		@ILogService private _logService: ILogService
+		@INotificationService private readonly _notificationService: INotificationService,
+		@IWindowService private readonly _windowService: IWindowService,
+		@IStorageService private readonly _storageService: IStorageService,
+		@ILogService private readonly _logService: ILogService
 	) {
 		const lastShutdownReason = this._storageService.getInteger(LifecycleService._lastShutdownReasonKey, StorageScope.WORKSPACE);
 		this._storageService.remove(LifecycleService._lastShutdownReasonKey, StorageScope.WORKSPACE);
@@ -93,7 +92,7 @@ export class LifecycleService implements ILifecycleService {
 			reason
 		});
 
-		return handleVetos(vetos, err => this._messageService.show(Severity.Error, toErrorMessage(err)));
+		return handleVetos(vetos, err => this._notificationService.error(toErrorMessage(err)));
 	}
 
 	public get phase(): LifecyclePhase {
diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts
index 9fa1ab9b76b..ff6b4129615 100644
--- a/src/vs/platform/list/browser/listService.ts
+++ b/src/vs/platform/list/browser/listService.ts
@@ -24,6 +24,7 @@ import { DefaultController, IControllerOptions, OpenMode, ClickBehavior } from '
 import { isUndefinedOrNull } from 'vs/base/common/types';
 import { IEditorOptions } from 'vs/platform/editor/common/editor';
 import Event, { Emitter } from 'vs/base/common/event';
+
 export type ListWidget = List<any> | PagedList<any> | ITree;
 
 export const IListService = createDecorator<IListService>('listService');
@@ -83,10 +84,9 @@ const RawWorkbenchListFocusContextKey = new RawContextKey<boolean>('listFocus',
 export const WorkbenchListSupportsMultiSelectContextKey = new RawContextKey<boolean>('listSupportsMultiselect', true);
 export const WorkbenchListFocusContextKey = ContextKeyExpr.and(RawWorkbenchListFocusContextKey, ContextKeyExpr.not(InputFocusedContextKey));
 export const WorkbenchListDoubleSelection = new RawContextKey<boolean>('listDoubleSelection', false);
+export const WorkbenchListMultiSelection = new RawContextKey<boolean>('listMultiSelection', false);
 
-export type Widget = List<any> | PagedList<any> | ITree;
-
-function createScopedContextKeyService(contextKeyService: IContextKeyService, widget: Widget): IContextKeyService {
+function createScopedContextKeyService(contextKeyService: IContextKeyService, widget: ListWidget): IContextKeyService {
 	const result = contextKeyService.createScoped(widget.getHTMLElement());
 
 	if (widget instanceof List || widget instanceof PagedList) {
@@ -127,7 +127,7 @@ class MultipleSelectionController<T> implements IMultipleSelectionController<T>
 
 class WorkbenchOpenController implements IOpenController {
 
-	constructor(private configurationService: IConfigurationService) { }
+	constructor(private configurationService: IConfigurationService, private existingOpenController?: IOpenController) { }
 
 	shouldOpen(event: UIEvent): boolean {
 		if (event instanceof MouseEvent) {
@@ -136,10 +136,14 @@ class WorkbenchOpenController implements IOpenController {
 				return false;
 			}
 
-			return event.button === 0 /* left mouse button */ || event.button === 1 /* middle mouse button */;
+			if (event.button === 0 /* left mouse button */ || event.button === 1 /* middle mouse button */) {
+				return this.existingOpenController ? this.existingOpenController.shouldOpen(event) : true;
+			}
+
+			return false;
 		}
 
-		return true;
+		return this.existingOpenController ? this.existingOpenController.shouldOpen(event) : true;
 	}
 }
 
@@ -148,7 +152,7 @@ function handleListControllers<T>(options: IListOptions<T>, configurationService
 		options.multipleSelectionController = new MultipleSelectionController(configurationService);
 	}
 
-	options.openController = new WorkbenchOpenController(configurationService);
+	options.openController = new WorkbenchOpenController(configurationService, options.openController);
 
 	return options;
 }
@@ -166,6 +170,7 @@ export class WorkbenchList<T> extends List<T> {
 	readonly contextKeyService: IContextKeyService;
 
 	private listDoubleSelection: IContextKey<boolean>;
+	private listMultiSelection: IContextKey<boolean>;
 
 	private _useAltAsMultipleSelectionModifier: boolean;
 
@@ -179,10 +184,11 @@ export class WorkbenchList<T> extends List<T> {
 		@IThemeService themeService: IThemeService,
 		@IConfigurationService private configurationService: IConfigurationService
 	) {
-		super(container, delegate, renderers, mixin(handleListControllers(options, configurationService), { keyboardSupport: false, selectOnMouseDown: true } as IListOptions<any>, false));
+		super(container, delegate, renderers, mixin(handleListControllers(options, configurationService), { keyboardSupport: false, selectOnMouseDown: true } as IListOptions<T>, false));
 
 		this.contextKeyService = createScopedContextKeyService(contextKeyService, this);
 		this.listDoubleSelection = WorkbenchListDoubleSelection.bindTo(this.contextKeyService);
+		this.listMultiSelection = WorkbenchListMultiSelection.bindTo(this.contextKeyService);
 
 		this._useAltAsMultipleSelectionModifier = useAltAsMultipleSelectionModifier(configurationService);
 
@@ -190,7 +196,11 @@ export class WorkbenchList<T> extends List<T> {
 			this.contextKeyService,
 			(listService as ListService).register(this),
 			attachListStyler(this, themeService),
-			this.onSelectionChange(() => this.listDoubleSelection.set(this.getSelection().length === 2))
+			this.onSelectionChange(() => {
+				const selection = this.getSelection();
+				this.listMultiSelection.set(selection.length > 1);
+				this.listDoubleSelection.set(selection.length === 2);
+			})
 		]));
 
 		this.registerListeners();
@@ -221,13 +231,13 @@ export class WorkbenchPagedList<T> extends PagedList<T> {
 		container: HTMLElement,
 		delegate: IDelegate<number>,
 		renderers: IPagedRenderer<T, any>[],
-		options: IListOptions<any>,
+		options: IListOptions<T>,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IListService listService: IListService,
 		@IThemeService themeService: IThemeService,
 		@IConfigurationService private configurationService: IConfigurationService
 	) {
-		super(container, delegate, renderers, mixin(handleListControllers(options, configurationService), { keyboardSupport: false, selectOnMouseDown: true } as IListOptions<any>, false));
+		super(container, delegate, renderers, mixin(handleListControllers(options, configurationService), { keyboardSupport: false, selectOnMouseDown: true } as IListOptions<T>, false));
 
 		this.contextKeyService = createScopedContextKeyService(contextKeyService, this);
 
@@ -266,6 +276,7 @@ export class WorkbenchTree extends Tree {
 	protected disposables: IDisposable[] = [];
 
 	private listDoubleSelection: IContextKey<boolean>;
+	private listMultiSelection: IContextKey<boolean>;
 
 	private _openOnSingleClick: boolean;
 	private _useAltAsMultipleSelectionModifier: boolean;
@@ -284,6 +295,7 @@ export class WorkbenchTree extends Tree {
 
 		this.contextKeyService = createScopedContextKeyService(contextKeyService, this);
 		this.listDoubleSelection = WorkbenchListDoubleSelection.bindTo(this.contextKeyService);
+		this.listMultiSelection = WorkbenchListMultiSelection.bindTo(this.contextKeyService);
 
 		this._openOnSingleClick = useSingleClickToOpen(configurationService);
 		this._useAltAsMultipleSelectionModifier = useAltAsMultipleSelectionModifier(configurationService);
@@ -309,6 +321,7 @@ export class WorkbenchTree extends Tree {
 		this.disposables.push(this.onDidChangeSelection(() => {
 			const selection = this.getSelection();
 			this.listDoubleSelection.set(selection && selection.length === 2);
+			this.listMultiSelection.set(selection && selection.length > 1);
 		}));
 
 		this.disposables.push(this.configurationService.onDidChangeConfiguration(e => {
diff --git a/src/vs/platform/message/common/message.ts b/src/vs/platform/message/common/message.ts
deleted file mode 100644
index 4211798a0a9..00000000000
--- a/src/vs/platform/message/common/message.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import nls = require('vs/nls');
-import uri from 'vs/base/common/uri';
-import paths = require('vs/base/common/paths');
-import { TPromise } from 'vs/base/common/winjs.base';
-import Severity from 'vs/base/common/severity';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Action } from 'vs/base/common/actions';
-
-export interface IMessageWithAction {
-	message: string;
-	actions: Action[];
-	source?: string;
-}
-
-export interface IConfirmation {
-	title?: string;
-	type?: 'none' | 'info' | 'error' | 'question' | 'warning';
-	message: string;
-	detail?: string;
-	primaryButton?: string;
-	secondaryButton?: string;
-	checkbox?: {
-		label: string;
-		checked?: boolean;
-	};
-}
-
-export const CloseAction = new Action('close.message', nls.localize('close', "Close"), null, true, () => TPromise.as(true));
-export const LaterAction = new Action('later.message', nls.localize('later', "Later"), null, true, () => TPromise.as(true));
-export const CancelAction = new Action('cancel.message', nls.localize('cancel', "Cancel"), null, true, () => TPromise.as(true));
-
-export const IMessageService = createDecorator<IMessageService>('messageService');
-
-const MAX_CONFIRM_FILES = 10;
-export function getConfirmMessage(start: string, resourcesToConfirm: uri[]): string {
-	const message = [start];
-	message.push('');
-	message.push(...resourcesToConfirm.slice(0, MAX_CONFIRM_FILES).map(r => paths.basename(r.fsPath)));
-
-	if (resourcesToConfirm.length > MAX_CONFIRM_FILES) {
-		if (resourcesToConfirm.length - MAX_CONFIRM_FILES === 1) {
-			message.push(nls.localize('moreFile', "...1 additional file not shown"));
-		} else {
-			message.push(nls.localize('moreFiles', "...{0} additional files not shown", resourcesToConfirm.length - MAX_CONFIRM_FILES));
-		}
-	}
-
-	message.push('');
-	return message.join('\n');
-}
-
-export interface IConfirmationResult {
-	confirmed: boolean;
-	checkboxChecked?: boolean;
-}
-
-export interface IMessageService {
-
-	_serviceBrand: any;
-
-	/**
-	 * Tells the service to show a message with a given severity
-	 * the returned function can be used to hide the message again
-	 */
-	show(sev: Severity, message: string): () => void;
-	show(sev: Severity, message: Error): () => void;
-	show(sev: Severity, message: string[]): () => void;
-	show(sev: Severity, message: Error[]): () => void;
-	show(sev: Severity, message: IMessageWithAction): () => void;
-
-	/**
-	 * Hide any messages showing currently.
-	 */
-	hideAll(): void;
-
-	/**
-	 * Ask the user for confirmation.
-	 */
-	confirm(confirmation: IConfirmation): TPromise<boolean>;
-
-	/**
-	 * Ask the user for confirmation with a checkbox.
-	 */
-	confirmWithCheckbox(confirmation: IConfirmation): TPromise<IConfirmationResult>;
-}
-
-export const IChoiceService = createDecorator<IChoiceService>('choiceService');
-
-export interface IChoiceService {
-
-	_serviceBrand: any;
-
-	/**
-	 * Prompt the user for a choice between multiple options.
-	 *
-	 * @param when `modal` is true, this will block the user until chooses.
-	 *
-	 * @returns A promise with the selected choice index. The promise is cancellable
-	 * which hides the message. The promise can return an error, meaning that
-	 * the user refused to choose.
-	 *
-	 * When `modal` is true and user refused to choose, then promise with index of
-	 * `Cancel` option is returned. If there is no such option then promise with
-	 * `0` index is returned.
-	 */
-	choose(severity: Severity, message: string, options: string[], cancelId: number, modal?: boolean): TPromise<number>;
-}
-
-export import Severity = Severity;
diff --git a/src/vs/platform/notification/common/notification.ts b/src/vs/platform/notification/common/notification.ts
new file mode 100644
index 00000000000..a50aa94d9f0
--- /dev/null
+++ b/src/vs/platform/notification/common/notification.ts
@@ -0,0 +1,183 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import Severity from 'vs/base/common/severity';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { IMarkdownString } from 'vs/base/common/htmlContent';
+import { IAction } from 'vs/base/common/actions';
+import Event, { Emitter } from 'vs/base/common/event';
+
+export import Severity = Severity;
+
+export const INotificationService = createDecorator<INotificationService>('notificationService');
+
+export type NotificationMessage = string | IMarkdownString | Error;
+
+export interface INotification {
+
+	/**
+	 * The severity of the notification. Either `Info`, `Warning` or `Error`.
+	 */
+	severity: Severity;
+
+	/**
+	 * The message of the notification. This can either be a `string`, `Error`
+	 * or `IMarkdownString`.
+	 *
+	 * **Note:** Currently only links are supported in notifications. Links to commands can
+	 * be embedded provided that the `IMarkdownString` is trusted.
+	 */
+	message: NotificationMessage;
+
+	/**
+	 * The source of the notification appears as additional information.
+	 */
+	source?: string;
+
+	/**
+	 * Actions to show as part of the notification. Primary actions show up as
+	 * buttons as part of the message and will close the notification once clicked.
+	 *
+	 * Secondary actions are meant to provide additional configuration or context
+	 * for the notification and will show up less prominent. A notification does not
+	 * close automatically when invoking a secondary action.
+	 *
+	 * **Note:** If your intent is to show a message with actions to the user, consider
+	 * the `IChoiceService` and `IConfirmationService` instead which are optimized for
+	 * this usecase and much easier to use!
+	 */
+	actions?: INotificationActions;
+}
+
+export interface INotificationActions {
+
+	/**
+	 * Primary actions show up as buttons as part of the message and will close
+	 * the notification once clicked.
+	 */
+	primary?: IAction[];
+
+	/**
+	 * Secondary actions are meant to provide additional configuration or context
+	 * for the notification and will show up less prominent. A notification does not
+	 * close automatically when invoking a secondary action.
+	 */
+	secondary?: IAction[];
+}
+
+export interface INotificationProgress {
+
+	/**
+	 * Causes the progress bar to spin infinitley.
+	 */
+	infinite(): void;
+
+	/**
+	 * Indicate the total amount of work.
+	 */
+	total(value: number): void;
+
+	/**
+	 * Indicate that a specific chunk of work is done.
+	 */
+	worked(value: number): void;
+
+	/**
+	 * Indicate that the long running operation is done.
+	 */
+	done(): void;
+}
+
+export interface INotificationHandle extends IDisposable {
+
+	/**
+	 * Will be fired once the notification is disposed.
+	 */
+	readonly onDidDispose: Event<void>;
+
+	/**
+	 * Allows to indicate progress on the notification even after the
+	 * notification is already visible.
+	 */
+	readonly progress: INotificationProgress;
+
+	/**
+	 * Allows to update the severity of the notification.
+	 */
+	updateSeverity(severity: Severity): void;
+
+	/**
+	 * Allows to update the message of the notification even after the
+	 * notification is already visible.
+	 */
+	updateMessage(message: NotificationMessage): void;
+
+	/**
+	 * Allows to update the actions of the notification even after the
+	 * notification is already visible.
+	 */
+	updateActions(actions?: INotificationActions): void;
+}
+
+export interface INotificationService {
+
+	_serviceBrand: any;
+
+	/**
+	 * Show the provided notification to the user. The returned `INotificationHandle`
+	 * can be used to control the notification afterwards.
+	 *
+	 * **Note:** If your intent is to show a message with actions to the user, consider
+	 * the `IChoiceService` and `IConfirmationService` instead which are optimized for
+	 * this usecase and much easier to use!
+	 */
+	notify(notification: INotification): INotificationHandle;
+
+	/**
+	 * A convinient way of reporting infos. Use the `INotificationService.notify`
+	 * method if you need more control over the notification.
+	 */
+	info(message: NotificationMessage | NotificationMessage[]): void;
+
+	/**
+	 * A convinient way of reporting warnings. Use the `INotificationService.notify`
+	 * method if you need more control over the notification.
+	 */
+	warn(message: NotificationMessage | NotificationMessage[]): void;
+
+	/**
+	 * A convinient way of reporting errors. Use the `INotificationService.notify`
+	 * method if you need more control over the notification.
+	 */
+	error(message: NotificationMessage | NotificationMessage[]): void;
+}
+
+export class NoOpNotification implements INotificationHandle {
+	readonly progress = new NoOpProgress();
+
+	private _onDidDispose: Emitter<void> = new Emitter();
+
+	public get onDidDispose(): Event<void> {
+		return this._onDidDispose.event;
+	}
+
+	updateSeverity(severity: Severity): void { }
+	updateMessage(message: NotificationMessage): void { }
+	updateActions(actions?: INotificationActions): void { }
+
+	dispose(): void {
+		this._onDidDispose.dispose();
+	}
+}
+
+export class NoOpProgress implements INotificationProgress {
+	infinite(): void { }
+	done(): void { }
+	total(value: number): void { }
+	worked(value: number): void { }
+}
\ No newline at end of file
diff --git a/src/vs/platform/opener/browser/openerService.ts b/src/vs/platform/opener/browser/openerService.ts
index fa76e7730b4..83cadb145e2 100644
--- a/src/vs/platform/opener/browser/openerService.ts
+++ b/src/vs/platform/opener/browser/openerService.ts
@@ -22,8 +22,8 @@ export class OpenerService implements IOpenerService {
 	_serviceBrand: any;
 
 	constructor(
-		@IEditorService private _editorService: IEditorService,
-		@ICommandService private _commandService: ICommandService,
+		@IEditorService private readonly _editorService: IEditorService,
+		@ICommandService private readonly _commandService: ICommandService,
 		@optional(ITelemetryService) private _telemetryService: ITelemetryService = NullTelemetryService
 	) {
 		//
diff --git a/src/vs/platform/request/electron-browser/requestService.ts b/src/vs/platform/request/electron-browser/requestService.ts
index 27bb2bba0c2..3a65e8ea555 100644
--- a/src/vs/platform/request/electron-browser/requestService.ts
+++ b/src/vs/platform/request/electron-browser/requestService.ts
@@ -19,29 +19,6 @@ export class RequestService extends NodeRequestService {
 	}
 }
 
-class ArrayBufferStream extends Readable {
-
-	private _buffer: Buffer;
-	private _offset: number;
-	private _length: number;
-
-	constructor(arraybuffer: ArrayBuffer) {
-		super();
-		this._buffer = new Buffer(new Uint8Array(arraybuffer));
-		this._offset = 0;
-		this._length = this._buffer.length;
-	}
-
-	_read(size: number) {
-		if (this._offset < this._length) {
-			this.push(this._buffer.slice(this._offset, (this._offset + size)));
-			this._offset += size;
-		} else {
-			this.push(null);
-		}
-	}
-}
-
 export const xhrRequest: IRequestFunction = (options: IRequestOptions): TPromise<IRequestContext> => {
 
 	const xhr = new XMLHttpRequest();
@@ -58,7 +35,29 @@ export const xhrRequest: IRequestFunction = (options: IRequestOptions): TPromise
 					statusCode: xhr.status,
 					headers: getResponseHeaders(xhr)
 				},
-				stream: new ArrayBufferStream(xhr.response)
+				stream: new class ArrayBufferStream extends Readable {
+
+					private _buffer: Buffer;
+					private _offset: number;
+					private _length: number;
+
+					constructor(arraybuffer: ArrayBuffer) {
+						super();
+						this._buffer = new Buffer(new Uint8Array(arraybuffer));
+						this._offset = 0;
+						this._length = this._buffer.length;
+					}
+
+					_read(size: number) {
+						if (this._offset < this._length) {
+							this.push(this._buffer.slice(this._offset, (this._offset + size)));
+							this._offset += size;
+						} else {
+							this.push(null);
+						}
+					}
+
+				}(xhr.response)
 			});
 		};
 		xhr.ontimeout = e => reject(new Error(`XHR timeout: ${options.timeout}ms`));
diff --git a/src/vs/platform/request/node/requestService.ts b/src/vs/platform/request/node/requestService.ts
index 8b6f3fabd19..8571028ceb6 100644
--- a/src/vs/platform/request/node/requestService.ts
+++ b/src/vs/platform/request/node/requestService.ts
@@ -11,6 +11,7 @@ import { IRequestOptions, IRequestContext, IRequestFunction, request } from 'vs/
 import { getProxyAgent } from 'vs/base/node/proxy';
 import { IRequestService, IHTTPConfiguration } from 'vs/platform/request/node/request';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ILogService } from '../../log/common/log';
 
 /**
  * This service exposes the `request` API, while using the global
@@ -26,7 +27,8 @@ export class RequestService implements IRequestService {
 	private disposables: IDisposable[] = [];
 
 	constructor(
-		@IConfigurationService configurationService: IConfigurationService
+		@IConfigurationService configurationService: IConfigurationService,
+		@ILogService private logService: ILogService
 	) {
 		this.configure(configurationService.getValue<IHTTPConfiguration>());
 		configurationService.onDidChangeConfiguration(() => this.configure(configurationService.getValue()), this, this.disposables);
@@ -39,6 +41,8 @@ export class RequestService implements IRequestService {
 	}
 
 	async request(options: IRequestOptions, requestFn: IRequestFunction = request): TPromise<IRequestContext> {
+		this.logService.trace('RequestService#request', options.url);
+
 		const { proxyUrl, strictSSL } = this;
 
 		options.agent = options.agent || await getProxyAgent(options.url, { proxyUrl, strictSSL });
diff --git a/src/vs/platform/telemetry/browser/errorTelemetry.ts b/src/vs/platform/telemetry/browser/errorTelemetry.ts
index 976335c3d81..140b0fbe8ab 100644
--- a/src/vs/platform/telemetry/browser/errorTelemetry.ts
+++ b/src/vs/platform/telemetry/browser/errorTelemetry.ts
@@ -145,12 +145,12 @@ export default class ErrorTelemetry {
 		for (let error of this._buffer) {
 			/* __GDPR__
 			"UnhandledError" : {
-					"message" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-					"name": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-					"stack": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-					"id": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-					"line": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-					"column": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+					"message" : { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
+					"name": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
+					"stack": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
+					"id": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
+					"line": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
+					"column": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" }
 				}
 			*/
 			// __GDPR__TODO__ what's the complete set of properties?
diff --git a/src/vs/platform/theme/common/colorRegistry.ts b/src/vs/platform/theme/common/colorRegistry.ts
index 9adba34254f..14e74226c78 100644
--- a/src/vs/platform/theme/common/colorRegistry.ts
+++ b/src/vs/platform/theme/common/colorRegistry.ts
@@ -243,6 +243,8 @@ export const editorSelectionBackground = registerColor('editor.selectionBackgrou
 export const editorSelectionForeground = registerColor('editor.selectionForeground', { light: null, dark: null, hc: '#000000' }, nls.localize('editorSelectionForeground', "Color of the selected text for high contrast."));
 export const editorInactiveSelection = registerColor('editor.inactiveSelectionBackground', { light: transparent(editorSelectionBackground, 0.5), dark: transparent(editorSelectionBackground, 0.5), hc: transparent(editorSelectionBackground, 0.5) }, nls.localize('editorInactiveSelection', "Color of the selection in an inactive editor. The color must not be opaque to not hide underlying decorations."), true);
 export const editorSelectionHighlight = registerColor('editor.selectionHighlightBackground', { light: lessProminent(editorSelectionBackground, editorBackground, 0.3, 0.6), dark: lessProminent(editorSelectionBackground, editorBackground, 0.3, 0.6), hc: null }, nls.localize('editorSelectionHighlight', 'Color for regions with the same content as the selection. The color must not be opaque to not hide underlying decorations.'), true);
+export const editorSelectionHighlightBorder = registerColor('editor.selectionHighlightBorder', { light: null, dark: null, hc: activeContrastBorder }, nls.localize('editorSelectionHighlightBorder', "Border color for regions with the same content as the selection."));
+
 
 /**
  * Editor find match colors.
@@ -250,6 +252,9 @@ export const editorSelectionHighlight = registerColor('editor.selectionHighlight
 export const editorFindMatch = registerColor('editor.findMatchBackground', { light: '#A8AC94', dark: '#515C6A', hc: null }, nls.localize('editorFindMatch', "Color of the current search match."));
 export const editorFindMatchHighlight = registerColor('editor.findMatchHighlightBackground', { light: '#EA5C0055', dark: '#EA5C0055', hc: null }, nls.localize('findMatchHighlight', "Color of the other search matches. The color must not be opaque to not hide underlying decorations."), true);
 export const editorFindRangeHighlight = registerColor('editor.findRangeHighlightBackground', { dark: '#3a3d4166', light: '#b4b4b44d', hc: null }, nls.localize('findRangeHighlight', "Color the range limiting the search. The color must not be opaque to not hide underlying decorations."), true);
+export const editorFindMatchBorder = registerColor('editor.findMatchBorder', { light: null, dark: null, hc: activeContrastBorder }, nls.localize('editorFindMatchBorder', "Border color of the current search match."));
+export const editorFindMatchHighlightBorder = registerColor('editor.findMatchHighlightBorder', { light: null, dark: null, hc: activeContrastBorder }, nls.localize('findMatchHighlightBorder', "Border color of the other search matches."));
+export const editorFindRangeHighlightBorder = registerColor('editor.findRangeHighlightBorder', { dark: null, light: null, hc: transparent(activeContrastBorder, 0.4) }, nls.localize('findRangeHighlightBorder', "Border color the range limiting the search. The color must not be opaque to not hide underlying decorations."), true);
 
 /**
  * Editor hover
@@ -269,8 +274,8 @@ export const editorActiveLinkForeground = registerColor('editorLink.activeForegr
 export const defaultInsertColor = new Color(new RGBA(155, 185, 85, 0.2));
 export const defaultRemoveColor = new Color(new RGBA(255, 0, 0, 0.2));
 
-export const diffInserted = registerColor('diffEditor.insertedTextBackground', { dark: defaultInsertColor, light: defaultInsertColor, hc: null }, nls.localize('diffEditorInserted', 'Background color for text that got inserted.'));
-export const diffRemoved = registerColor('diffEditor.removedTextBackground', { dark: defaultRemoveColor, light: defaultRemoveColor, hc: null }, nls.localize('diffEditorRemoved', 'Background color for text that got removed.'));
+export const diffInserted = registerColor('diffEditor.insertedTextBackground', { dark: defaultInsertColor, light: defaultInsertColor, hc: null }, nls.localize('diffEditorInserted', 'Background color for text that got inserted. The color must not be opaque to not hide underlying decorations.'), true);
+export const diffRemoved = registerColor('diffEditor.removedTextBackground', { dark: defaultRemoveColor, light: defaultRemoveColor, hc: null }, nls.localize('diffEditorRemoved', 'Background color for text that got removed. The color must not be opaque to not hide underlying decorations.'), true);
 
 export const diffInsertedOutline = registerColor('diffEditor.insertedTextBorder', { dark: null, light: null, hc: '#33ff2eff' }, nls.localize('diffEditorInsertedOutline', 'Outline color for the text that got inserted.'));
 export const diffRemovedOutline = registerColor('diffEditor.removedTextBorder', { dark: null, light: null, hc: '#FF008F' }, nls.localize('diffEditorRemovedOutline', 'Outline color for text that got removed.'));
diff --git a/src/vs/platform/url/electron-main/urlService.ts b/src/vs/platform/url/electron-main/urlService.ts
index 595d3b38c97..f18cf977d41 100644
--- a/src/vs/platform/url/electron-main/urlService.ts
+++ b/src/vs/platform/url/electron-main/urlService.ts
@@ -10,6 +10,7 @@ import { IURLService } from 'vs/platform/url/common/url';
 import product from 'vs/platform/node/product';
 import { app } from 'electron';
 import URI from 'vs/base/common/uri';
+import { ILogService } from '../../log/common/log';
 
 export class URLService implements IURLService {
 
@@ -18,7 +19,10 @@ export class URLService implements IURLService {
 	private openUrlEmitter: Emitter<string> = new Emitter<string>();
 	onOpenURL: Event<URI>;
 
-	constructor(initial: string | string[] = []) {
+	constructor(
+		@ILogService private logService: ILogService,
+		initial: string | string[] = []
+	) {
 		const globalBuffer = (global.getOpenUrls() || []) as string[];
 		const initialBuffer = [
 			...(typeof initial === 'string' ? [initial] : initial),
@@ -51,6 +55,7 @@ export class URLService implements IURLService {
 	}
 
 	open(url: string): void {
+		this.logService.trace('urlService#open', url);
 		this.openUrlEmitter.fire(url);
 	}
 }
diff --git a/src/vs/platform/windows/electron-main/windowsService.ts b/src/vs/platform/windows/electron-main/windowsService.ts
index 553b78f3dfc..51f8d64a09e 100644
--- a/src/vs/platform/windows/electron-main/windowsService.ts
+++ b/src/vs/platform/windows/electron-main/windowsService.ts
@@ -24,6 +24,7 @@ import { ICommandAction } from 'vs/platform/actions/common/actions';
 import { Schemas } from 'vs/base/common/network';
 import { mnemonicButtonLabel } from 'vs/base/common/labels';
 import { isWindows } from 'vs/base/common/platform';
+import { ILogService } from '../../log/common/log';
 
 export class WindowsService implements IWindowsService, IDisposable {
 
@@ -41,7 +42,8 @@ export class WindowsService implements IWindowsService, IDisposable {
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@IURLService urlService: IURLService,
 		@ILifecycleService private lifecycleService: ILifecycleService,
-		@IHistoryMainService private historyService: IHistoryMainService
+		@IHistoryMainService private historyService: IHistoryMainService,
+		@ILogService private logService: ILogService
 	) {
 		// Catch file URLs
 		chain(urlService.onOpenURL)
@@ -57,48 +59,56 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	pickFileFolderAndOpen(options: INativeOpenDialogOptions): TPromise<void> {
+		this.logService.trace('windowsService#pickFileFolderAndOpen');
 		this.windowsMainService.pickFileFolderAndOpen(options);
 
 		return TPromise.as(null);
 	}
 
 	pickFileAndOpen(options: INativeOpenDialogOptions): TPromise<void> {
+		this.logService.trace('windowsService#pickFileAndOpen');
 		this.windowsMainService.pickFileAndOpen(options);
 
 		return TPromise.as(null);
 	}
 
 	pickFolderAndOpen(options: INativeOpenDialogOptions): TPromise<void> {
+		this.logService.trace('windowsService#pickFolderAndOpen');
 		this.windowsMainService.pickFolderAndOpen(options);
 
 		return TPromise.as(null);
 	}
 
 	pickWorkspaceAndOpen(options: INativeOpenDialogOptions): TPromise<void> {
+		this.logService.trace('windowsService#pickWorkspaceAndOpen');
 		this.windowsMainService.pickWorkspaceAndOpen(options);
 
 		return TPromise.as(null);
 	}
 
 	showMessageBox(windowId: number, options: Electron.MessageBoxOptions): TPromise<IMessageBoxResult> {
+		this.logService.trace('windowsService#showMessageBox', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		return this.windowsMainService.showMessageBox(options, codeWindow);
 	}
 
 	showSaveDialog(windowId: number, options: Electron.SaveDialogOptions): TPromise<string> {
+		this.logService.trace('windowsService#showSaveDialog', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		return this.windowsMainService.showSaveDialog(options, codeWindow);
 	}
 
 	showOpenDialog(windowId: number, options: Electron.OpenDialogOptions): TPromise<string[]> {
+		this.logService.trace('windowsService#showOpenDialog', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		return this.windowsMainService.showOpenDialog(options, codeWindow);
 	}
 
 	reloadWindow(windowId: number): TPromise<void> {
+		this.logService.trace('windowsService#reloadWindow', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		if (codeWindow) {
@@ -109,6 +119,7 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	openDevTools(windowId: number): TPromise<void> {
+		this.logService.trace('windowsService#openDevTools', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		if (codeWindow) {
@@ -119,6 +130,7 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	toggleDevTools(windowId: number): TPromise<void> {
+		this.logService.trace('windowsService#toggleDevTools', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		if (codeWindow) {
@@ -134,6 +146,7 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	updateTouchBar(windowId: number, items: ICommandAction[][]): TPromise<void> {
+		this.logService.trace('windowsService#updateTouchBar', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		if (codeWindow) {
@@ -144,6 +157,7 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	closeWorkspace(windowId: number): TPromise<void> {
+		this.logService.trace('windowsService#closeWorkspace', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		if (codeWindow) {
@@ -154,6 +168,7 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	createAndEnterWorkspace(windowId: number, folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<IEnterWorkspaceResult> {
+		this.logService.trace('windowsService#createAndEnterWorkspace', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		if (codeWindow) {
@@ -164,6 +179,7 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	saveAndEnterWorkspace(windowId: number, path: string): TPromise<IEnterWorkspaceResult> {
+		this.logService.trace('windowsService#saveAndEnterWorkspace', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		if (codeWindow) {
@@ -174,6 +190,7 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	toggleFullScreen(windowId: number): TPromise<void> {
+		this.logService.trace('windowsService#toggleFullScreen', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		if (codeWindow) {
@@ -184,6 +201,7 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	setRepresentedFilename(windowId: number, fileName: string): TPromise<void> {
+		this.logService.trace('windowsService#setRepresentedFilename', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		if (codeWindow) {
@@ -194,24 +212,28 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	addRecentlyOpened(files: string[]): TPromise<void> {
+		this.logService.trace('windowsService#addRecentlyOpened');
 		this.historyService.addRecentlyOpened(void 0, files);
 
 		return TPromise.as(null);
 	}
 
 	removeFromRecentlyOpened(paths: string[]): TPromise<void> {
+		this.logService.trace('windowsService#removeFromRecentlyOpened');
 		this.historyService.removeFromRecentlyOpened(paths);
 
 		return TPromise.as(null);
 	}
 
 	clearRecentlyOpened(): TPromise<void> {
+		this.logService.trace('windowsService#clearRecentlyOpened');
 		this.historyService.clearRecentlyOpened();
 
 		return TPromise.as(null);
 	}
 
 	getRecentlyOpened(windowId: number): TPromise<IRecentlyOpened> {
+		this.logService.trace('windowsService#getRecentlyOpened', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		if (codeWindow) {
@@ -222,36 +244,42 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	showPreviousWindowTab(): TPromise<void> {
+		this.logService.trace('windowsService#showPreviousWindowTab');
 		Menu.sendActionToFirstResponder('selectPreviousTab:');
 
 		return TPromise.as(void 0);
 	}
 
 	showNextWindowTab(): TPromise<void> {
+		this.logService.trace('windowsService#showNextWindowTab');
 		Menu.sendActionToFirstResponder('selectNextTab:');
 
 		return TPromise.as(void 0);
 	}
 
 	moveWindowTabToNewWindow(): TPromise<void> {
+		this.logService.trace('windowsService#moveWindowTabToNewWindow');
 		Menu.sendActionToFirstResponder('moveTabToNewWindow:');
 
 		return TPromise.as(void 0);
 	}
 
 	mergeAllWindowTabs(): TPromise<void> {
+		this.logService.trace('windowsService#mergeAllWindowTabs');
 		Menu.sendActionToFirstResponder('mergeAllWindows:');
 
 		return TPromise.as(void 0);
 	}
 
 	toggleWindowTabsBar(): TPromise<void> {
+		this.logService.trace('windowsService#toggleWindowTabsBar');
 		Menu.sendActionToFirstResponder('toggleTabBar:');
 
 		return TPromise.as(void 0);
 	}
 
 	focusWindow(windowId: number): TPromise<void> {
+		this.logService.trace('windowsService#focusWindow', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		if (codeWindow) {
@@ -262,6 +290,7 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	closeWindow(windowId: number): TPromise<void> {
+		this.logService.trace('windowsService#closeWindow', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		if (codeWindow) {
@@ -272,6 +301,7 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	isFocused(windowId: number): TPromise<boolean> {
+		this.logService.trace('windowsService#isFocused', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		if (codeWindow) {
@@ -282,6 +312,7 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	isMaximized(windowId: number): TPromise<boolean> {
+		this.logService.trace('windowsService#isMaximized', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		if (codeWindow) {
@@ -292,6 +323,7 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	maximizeWindow(windowId: number): TPromise<void> {
+		this.logService.trace('windowsService#maximizeWindow', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		if (codeWindow) {
@@ -302,6 +334,7 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	unmaximizeWindow(windowId: number): TPromise<void> {
+		this.logService.trace('windowsService#unmaximizeWindow', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		if (codeWindow) {
@@ -312,6 +345,7 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	onWindowTitleDoubleClick(windowId: number): TPromise<void> {
+		this.logService.trace('windowsService#onWindowTitleDoubleClick', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		if (codeWindow) {
@@ -322,6 +356,7 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	setDocumentEdited(windowId: number, flag: boolean): TPromise<void> {
+		this.logService.trace('windowsService#setDocumentEdited', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		if (codeWindow && codeWindow.win.isDocumentEdited() !== flag) {
@@ -332,6 +367,7 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	openWindow(paths: string[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean }): TPromise<void> {
+		this.logService.trace('windowsService#openWindow');
 		if (!paths || !paths.length) {
 			return TPromise.as(null);
 		}
@@ -349,11 +385,13 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	openNewWindow(): TPromise<void> {
+		this.logService.trace('windowsService#openNewWindow');
 		this.windowsMainService.openNewWindow(OpenContext.API);
 		return TPromise.as(null);
 	}
 
 	showWindow(windowId: number): TPromise<void> {
+		this.logService.trace('windowsService#showWindow', windowId);
 		const codeWindow = this.windowsMainService.getWindowById(windowId);
 
 		if (codeWindow) {
@@ -364,6 +402,7 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	getWindows(): TPromise<{ id: number; workspace?: IWorkspaceIdentifier; folderPath?: string; title: string; filename?: string; }[]> {
+		this.logService.trace('windowsService#getWindows');
 		const windows = this.windowsMainService.getWindows();
 		const result = windows.map(w => ({ id: w.id, workspace: w.openedWorkspace, openedFolderPath: w.openedFolderPath, title: w.win.getTitle(), filename: w.getRepresentedFilename() }));
 
@@ -371,6 +410,7 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	getWindowCount(): TPromise<number> {
+		this.logService.trace('windowsService#getWindowCount');
 		return TPromise.as(this.windowsMainService.getWindows().length);
 	}
 
@@ -380,40 +420,48 @@ export class WindowsService implements IWindowsService, IDisposable {
 	}
 
 	showItemInFolder(path: string): TPromise<void> {
+		this.logService.trace('windowsService#showItemInFolder');
 		shell.showItemInFolder(path);
 		return TPromise.as(null);
 	}
 
 	openExternal(url: string): TPromise<boolean> {
+		this.logService.trace('windowsService#openExternal');
 		return TPromise.as(shell.openExternal(url));
 	}
 
 	startCrashReporter(config: Electron.CrashReporterStartOptions): TPromise<void> {
+		this.logService.trace('windowsService#startCrashReporter');
 		crashReporter.start(config);
 		return TPromise.as(null);
 	}
 
 	quit(): TPromise<void> {
+		this.logService.trace('windowsService#quit');
 		this.windowsMainService.quit();
 		return TPromise.as(null);
 	}
 
 	relaunch(options: { addArgs?: string[], removeArgs?: string[] }): TPromise<void> {
+		this.logService.trace('windowsService#relaunch');
 		this.lifecycleService.relaunch(options);
 
 		return TPromise.as(null);
 	}
 
 	whenSharedProcessReady(): TPromise<void> {
+		this.logService.trace('windowsService#whenSharedProcessReady');
 		return this.sharedProcess.whenReady();
 	}
 
 	toggleSharedProcess(): TPromise<void> {
+		this.logService.trace('windowsService#toggleSharedProcess');
 		this.sharedProcess.toggle();
 		return TPromise.as(null);
 	}
 
 	openAboutDialog(): TPromise<void> {
+		this.logService.trace('windowsService#openAboutDialog');
 		const lastActiveWindow = this.windowsMainService.getFocusedWindow() || this.windowsMainService.getLastActiveWindow();
 
 		const detail = nls.localize('aboutDetail',
diff --git a/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts b/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts
index ff060086c77..3037a489d34 100644
--- a/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts
+++ b/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts
@@ -18,6 +18,8 @@ import { WORKSPACE_EXTENSION, IWorkspaceSavedEvent, IWorkspaceIdentifier, IRawFi
 import { ConsoleLogMainService } from 'vs/platform/log/common/log';
 import URI from 'vs/base/common/uri';
 import { getRandomTestPath } from 'vs/workbench/test/workbenchTestServices';
+import { isWindows } from 'vs/base/common/platform';
+import { normalizeDriveLetter } from 'vs/base/common/labels';
 
 suite('WorkspacesMainService', () => {
 	const parentDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'workspacesservice');
@@ -67,6 +69,15 @@ suite('WorkspacesMainService', () => {
 		extfs.del(workspacesHome, os.tmpdir(), done);
 	});
 
+	function assertPathEquals(p1: string, p2): void {
+		if (isWindows) {
+			p1 = normalizeDriveLetter(p1);
+			p2 = normalizeDriveLetter(p2);
+		}
+
+		assert.equal(p1, p2);
+	}
+
 	test('createWorkspace (folders)', done => {
 		return createWorkspace([process.cwd(), os.tmpdir()]).then(workspace => {
 			assert.ok(workspace);
@@ -75,8 +86,8 @@ suite('WorkspacesMainService', () => {
 
 			const ws = JSON.parse(fs.readFileSync(workspace.configPath).toString()) as IStoredWorkspace;
 			assert.equal(ws.folders.length, 2); //
-			assert.equal((<IRawFileWorkspaceFolder>ws.folders[0]).path, process.cwd());
-			assert.equal((<IRawFileWorkspaceFolder>ws.folders[1]).path, os.tmpdir());
+			assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[0]).path, process.cwd());
+			assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[1]).path, os.tmpdir());
 
 			assert.ok(!(<IRawFileWorkspaceFolder>ws.folders[0]).name);
 			assert.ok(!(<IRawFileWorkspaceFolder>ws.folders[1]).name);
@@ -93,8 +104,8 @@ suite('WorkspacesMainService', () => {
 
 			const ws = JSON.parse(fs.readFileSync(workspace.configPath).toString()) as IStoredWorkspace;
 			assert.equal(ws.folders.length, 2); //
-			assert.equal((<IRawFileWorkspaceFolder>ws.folders[0]).path, process.cwd());
-			assert.equal((<IRawFileWorkspaceFolder>ws.folders[1]).path, os.tmpdir());
+			assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[0]).path, process.cwd());
+			assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[1]).path, os.tmpdir());
 
 			assert.equal((<IRawFileWorkspaceFolder>ws.folders[0]).name, 'currentworkingdirectory');
 			assert.equal((<IRawFileWorkspaceFolder>ws.folders[1]).name, 'tempdir');
@@ -127,8 +138,8 @@ suite('WorkspacesMainService', () => {
 
 		const ws = JSON.parse(fs.readFileSync(workspace.configPath).toString()) as IStoredWorkspace;
 		assert.equal(ws.folders.length, 2);
-		assert.equal((<IRawFileWorkspaceFolder>ws.folders[0]).path, process.cwd());
-		assert.equal((<IRawFileWorkspaceFolder>ws.folders[1]).path, os.tmpdir());
+		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[0]).path, process.cwd());
+		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[1]).path, os.tmpdir());
 
 		assert.ok(!(<IRawFileWorkspaceFolder>ws.folders[0]).name);
 		assert.ok(!(<IRawFileWorkspaceFolder>ws.folders[1]).name);
@@ -142,8 +153,8 @@ suite('WorkspacesMainService', () => {
 
 		const ws = JSON.parse(fs.readFileSync(workspace.configPath).toString()) as IStoredWorkspace;
 		assert.equal(ws.folders.length, 2);
-		assert.equal((<IRawFileWorkspaceFolder>ws.folders[0]).path, process.cwd());
-		assert.equal((<IRawFileWorkspaceFolder>ws.folders[1]).path, os.tmpdir());
+		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[0]).path, process.cwd());
+		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[1]).path, os.tmpdir());
 
 		assert.equal((<IRawFileWorkspaceFolder>ws.folders[0]).name, 'currentworkingdirectory');
 		assert.equal((<IRawFileWorkspaceFolder>ws.folders[1]).name, 'tempdir');
@@ -253,12 +264,12 @@ suite('WorkspacesMainService', () => {
 
 				const ws = JSON.parse(fs.readFileSync(savedWorkspace.configPath).toString()) as IStoredWorkspace;
 				assert.equal(ws.folders.length, 3);
-				assert.equal((<IRawFileWorkspaceFolder>ws.folders[0]).path, process.cwd()); // absolute
-				assert.equal((<IRawFileWorkspaceFolder>ws.folders[1]).path, '.'); // relative
-				assert.equal((<IRawFileWorkspaceFolder>ws.folders[2]).path, path.relative(path.dirname(workspaceConfigPath), path.join(os.tmpdir(), 'somefolder'))); // relative
+				assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[0]).path, process.cwd()); // absolute
+				assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[1]).path, '.'); // relative
+				assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[2]).path, path.relative(path.dirname(workspaceConfigPath), path.join(os.tmpdir(), 'somefolder'))); // relative
 
 				assert.equal(savedWorkspace, savedEvent.workspace);
-				assert.equal(workspace.configPath, savedEvent.oldConfigPath);
+				assertPathEquals(workspace.configPath, savedEvent.oldConfigPath);
 
 				assert.deepEqual(deletedEvent, workspace);
 
@@ -281,13 +292,13 @@ suite('WorkspacesMainService', () => {
 				return service.saveWorkspace(savedWorkspace, newWorkspaceConfigPath).then(newSavedWorkspace => {
 					assert.ok(newSavedWorkspace.id);
 					assert.notEqual(newSavedWorkspace.id, workspace.id);
-					assert.equal(newSavedWorkspace.configPath, newWorkspaceConfigPath);
+					assertPathEquals(newSavedWorkspace.configPath, newWorkspaceConfigPath);
 
 					const ws = JSON.parse(fs.readFileSync(newSavedWorkspace.configPath).toString()) as IStoredWorkspace;
 					assert.equal(ws.folders.length, 3);
-					assert.equal((<IRawFileWorkspaceFolder>ws.folders[0]).path, process.cwd()); // absolute path because outside of tmpdir
-					assert.equal((<IRawFileWorkspaceFolder>ws.folders[1]).path, '.'); // relative path because inside of tmpdir
-					assert.equal((<IRawFileWorkspaceFolder>ws.folders[2]).path, path.relative(path.dirname(workspaceConfigPath), path.join(os.tmpdir(), 'somefolder'))); // relative
+					assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[0]).path, process.cwd()); // absolute path because outside of tmpdir
+					assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[1]).path, '.'); // relative path because inside of tmpdir
+					assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[2]).path, path.relative(path.dirname(workspaceConfigPath), path.join(os.tmpdir(), 'somefolder'))); // relative
 
 					extfs.delSync(workspaceConfigPath);
 					extfs.delSync(newWorkspaceConfigPath);
@@ -310,7 +321,7 @@ suite('WorkspacesMainService', () => {
 				return service.saveWorkspace(savedWorkspace, newWorkspaceConfigPath).then(newSavedWorkspace => {
 					assert.ok(newSavedWorkspace.id);
 					assert.notEqual(newSavedWorkspace.id, workspace.id);
-					assert.equal(newSavedWorkspace.configPath, newWorkspaceConfigPath);
+					assertPathEquals(newSavedWorkspace.configPath, newWorkspaceConfigPath);
 
 					const savedContents = fs.readFileSync(newSavedWorkspace.configPath).toString();
 					assert.equal(0, savedContents.indexOf('// this is a comment'));
@@ -336,7 +347,7 @@ suite('WorkspacesMainService', () => {
 				return service.saveWorkspace(savedWorkspace, newWorkspaceConfigPath).then(newSavedWorkspace => {
 					assert.ok(newSavedWorkspace.id);
 					assert.notEqual(newSavedWorkspace.id, workspace.id);
-					assert.equal(newSavedWorkspace.configPath, newWorkspaceConfigPath);
+					assertPathEquals(newSavedWorkspace.configPath, newWorkspaceConfigPath);
 
 					const ws = JSON.parse(fs.readFileSync(newSavedWorkspace.configPath).toString()) as IStoredWorkspace;
 					assert.ok(ws.folders.every(f => (<IRawFileWorkspaceFolder>f).path.indexOf('\\') < 0));
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index cfcb69a2975..3ca7322116d 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -5089,6 +5089,11 @@ declare module 'vscode' {
 		 */
 		resourceUri?: Uri;
 
+		/**
+		 * The tooltip text when you hover over this item.
+		 */
+		tooltip?: string | undefined;
+
 		/**
 		 * The [command](#Command) which should be run when the tree item is selected.
 		 */
@@ -6321,21 +6326,79 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * Namespace for dealing with debug sessions.
+	 * An event describing the changes to the set of [breakpoints](#debug.Breakpoint).
 	 */
-	export namespace debug {
+	export interface BreakpointsChangeEvent {
+		/**
+		 * Added breakpoints.
+		 */
+		readonly added: Breakpoint[];
 
 		/**
-		 * Start debugging by using either a named launch or named compound configuration,
-		 * or by directly passing a [DebugConfiguration](#DebugConfiguration).
-		 * The named configurations are looked up in '.vscode/launch.json' found in the given folder.
-		 * Before debugging starts, all unsaved files are saved and the launch configurations are brought up-to-date.
-		 * Folder specific variables used in the configuration (e.g. '${workspaceFolder}') are resolved against the given folder.
-		 * @param folder The [workspace folder](#WorkspaceFolder) for looking up named configurations and resolving variables or `undefined` for a non-folder setup.
-		 * @param nameOrConfiguration Either the name of a debug or compound configuration or a [DebugConfiguration](#DebugConfiguration) object.
-		 * @return A thenable that resolves when debugging could be successfully started.
+		 * Removed breakpoints.
 		 */
-		export function startDebugging(folder: WorkspaceFolder | undefined, nameOrConfiguration: string | DebugConfiguration): Thenable<boolean>;
+		readonly removed: Breakpoint[];
+
+		/**
+		 * Changed breakpoints.
+		 */
+		readonly changed: Breakpoint[];
+	}
+
+	/**
+	 * The base class of all breakpoint types.
+	 */
+	export class Breakpoint {
+		/**
+		 * Is breakpoint enabled.
+		 */
+		readonly enabled: boolean;
+		/**
+		 * An optional expression for conditional breakpoints.
+		 */
+		readonly condition?: string;
+		/**
+		 * An optional expression that controls how many hits of the breakpoint are ignored.
+		 */
+		readonly hitCondition?: string;
+
+		protected constructor(enabled?: boolean, condition?: string, hitCondition?: string);
+	}
+
+	/**
+	 * A breakpoint specified by a source location.
+	 */
+	export class SourceBreakpoint extends Breakpoint {
+		/**
+		 * The source and line position of this breakpoint.
+		 */
+		readonly location: Location;
+
+		/**
+		 * Create a new breakpoint for a source location.
+		 */
+		constructor(location: Location, enabled?: boolean, condition?: string, hitCondition?: string);
+	}
+
+	/**
+	 * A breakpoint specified by a function name.
+	 */
+	export class FunctionBreakpoint extends Breakpoint {
+		/**
+		 * The name of the function to which this breakpoint is attached.
+		 */
+		readonly functionName: string;
+
+		/**
+		 * Create a new function breakpoint.
+		 */
+		constructor(functionName: string, enabled?: boolean, condition?: string, hitCondition?: string);
+	}
+
+	/**
+	 * Namespace for debug functionality.
+	 */
+	export namespace debug {
 
 		/**
 		 * The currently active [debug session](#DebugSession) or `undefined`. The active debug session is the one
@@ -6349,6 +6412,12 @@ declare module 'vscode' {
 		 */
 		export let activeDebugConsole: DebugConsole;
 
+		/**
+		 * List of breakpoints.
+		 */
+		export let breakpoints: Breakpoint[];
+
+
 		/**
 		 * An [event](#Event) which fires when the [active debug session](#debug.activeDebugSession)
 		 * has changed. *Note* that the event also fires when the active debug session changes
@@ -6371,6 +6440,12 @@ declare module 'vscode' {
 		 */
 		export const onDidTerminateDebugSession: Event<DebugSession>;
 
+		/**
+		 * An [event](#Event) that is emitted when the set of breakpoints is added, removed, or changed.
+		 */
+		export const onDidChangeBreakpoints: Event<BreakpointsChangeEvent>;
+
+
 		/**
 		 * Register a [debug configuration provider](#DebugConfigurationProvider) for a specifc debug type.
 		 * More than one provider can be registered for the same type.
@@ -6380,6 +6455,30 @@ declare module 'vscode' {
 		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
 		 */
 		export function registerDebugConfigurationProvider(debugType: string, provider: DebugConfigurationProvider): Disposable;
+
+		/**
+		 * Start debugging by using either a named launch or named compound configuration,
+		 * or by directly passing a [DebugConfiguration](#DebugConfiguration).
+		 * The named configurations are looked up in '.vscode/launch.json' found in the given folder.
+		 * Before debugging starts, all unsaved files are saved and the launch configurations are brought up-to-date.
+		 * Folder specific variables used in the configuration (e.g. '${workspaceFolder}') are resolved against the given folder.
+		 * @param folder The [workspace folder](#WorkspaceFolder) for looking up named configurations and resolving variables or `undefined` for a non-folder setup.
+		 * @param nameOrConfiguration Either the name of a debug or compound configuration or a [DebugConfiguration](#DebugConfiguration) object.
+		 * @return A thenable that resolves when debugging could be successfully started.
+		 */
+		export function startDebugging(folder: WorkspaceFolder | undefined, nameOrConfiguration: string | DebugConfiguration): Thenable<boolean>;
+
+		/**
+		 * Add breakpoints.
+		 * @param breakpoints The breakpoints to add.
+		*/
+		export function addBreakpoints(breakpoints: Breakpoint[]): void;
+
+		/**
+		 * Remove breakpoints.
+		 * @param breakpoints The breakpoints to remove.
+		 */
+		export function removeBreakpoints(breakpoints: Breakpoint[]): void;
 	}
 
 	/**
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
index 757a2d14339..dc2a142150c 100644
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -265,103 +265,6 @@ declare module 'vscode' {
 
 	//#endregion
 
-	export namespace debug {
-
-		/**
-		 * List of breakpoints.
-		 *
-		 * @readonly
-		 */
-		export let breakpoints: Breakpoint[];
-
-		/**
-		 * An event that is emitted when a breakpoint is added, removed, or changed.
-		 */
-		export const onDidChangeBreakpoints: Event<BreakpointsChangeEvent>;
-
-		/**
-		 * Add breakpoints.
-		 * @param breakpoints The breakpoints to add.
-		*/
-		export function addBreakpoints(breakpoints: Breakpoint[]): void;
-
-		/**
-		 * Remove breakpoints.
-		 * @param breakpoints The breakpoints to remove.
-		 */
-		export function removeBreakpoints(breakpoints: Breakpoint[]): void;
-	}
-
-	/**
-	 * An event describing a change to the set of [breakpoints](#debug.Breakpoint).
-	 */
-	export interface BreakpointsChangeEvent {
-		/**
-		 * Added breakpoints.
-		 */
-		readonly added: Breakpoint[];
-
-		/**
-		 * Removed breakpoints.
-		 */
-		readonly removed: Breakpoint[];
-
-		/**
-		 * Changed breakpoints.
-		 */
-		readonly changed: Breakpoint[];
-	}
-
-	/**
-	 * The base class of all breakpoint types.
-	 */
-	export class Breakpoint {
-		/**
-		 * Is breakpoint enabled.
-		 */
-		readonly enabled: boolean;
-		/**
-		 * An optional expression for conditional breakpoints.
-		 */
-		readonly condition?: string;
-		/**
-		 * An optional expression that controls how many hits of the breakpoint are ignored.
-		 */
-		readonly hitCondition?: string;
-
-		protected constructor(enabled?: boolean, condition?: string, hitCondition?: string);
-	}
-
-	/**
-	 * A breakpoint specified by a source location.
-	 */
-	export class SourceBreakpoint extends Breakpoint {
-		/**
-		 * The source and line position of this breakpoint.
-		 */
-		readonly location: Location;
-
-		/**
-		 * Create a new breakpoint for a source location.
-		 */
-		constructor(location: Location, enabled?: boolean, condition?: string, hitCondition?: string);
-	}
-
-	/**
-	 * A breakpoint specified by a function name.
-	 */
-	export class FunctionBreakpoint extends Breakpoint {
-		/**
-		 * The name of the function to which this breakpoint is attached.
-		 */
-		readonly functionName: string;
-
-		/**
-		 * Create a new function breakpoint.
-		 */
-		constructor(functionName: string, enabled?: boolean, condition?: string, hitCondition?: string);
-	}
-
 	/**
 	 * Represents a debug adapter executable and optional arguments passed to it.
 	 */
@@ -437,7 +340,6 @@ declare module 'vscode' {
 	}
 
 	export namespace languages {
-
 		export interface RenameProvider2 extends RenameProvider {
 			resolveInitialRenameValue?(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<RenameInitialValue>;
 		}
@@ -488,4 +390,103 @@ declare module 'vscode' {
 		 */
 		validateInput?(value: string, cursorPosition: number): ProviderResult<SourceControlInputBoxValidation | undefined | null>;
 	}
+
+	/**
+	 * Content settings for a webview.
+	 */
+	export interface WebviewOptions {
+		/**
+		 * Should scripts be enabled in the webview contetn?
+		 *
+		 * Defaults to false (scripts-disabled).
+		 */
+		readonly enableScripts?: boolean;
+
+		/**
+		 * Should command uris be enabled in webview content?
+		 *
+		 * Defaults to false.
+		 */
+		readonly enableCommandUris?: boolean;
+
+		/**
+		 * Should the webview content be kept arount even when the webview is no longer visible?
+		 *
+		 * Normally a webview content is created when the webview becomes visible
+		 * and destroyed when the webview is hidden. Apps that have complex state
+		 * or UI can set the `keepAlive` property to make VS Code keep the webview
+		 * content around, even when the webview itself is no longer visible. When
+		 * the webview becomes visible again, the content is automatically restored
+		 * in the exact same state it was in originally
+		 *
+		 * `keepAlive` has a high memory overhead and should only be used if your
+		 * webview content cannot be quickly saved and restored.
+		 */
+		readonly keepAlive?: boolean;
+	}
+
+	/**
+	 * A webview is an editor with html content, like an iframe.
+	 */
+	export interface Webview {
+		/**
+		 * Title of the webview.
+		 */
+		title: string;
+
+		/**
+		 * Contents of the webview.
+		 */
+		html: string;
+
+		/**
+		 * Content settings for the webview.
+		 */
+		options: WebviewOptions;
+
+		/**
+		 * The column in which the webview is showing.
+		 */
+		readonly viewColumn?: ViewColumn;
+
+		/**
+		 * Fired when the webview content posts a message.
+		 */
+		readonly onMessage: Event<any>;
+
+		/**
+		 * Fired when the webview becomes the active editor.
+		 */
+		readonly onBecameActive: Event<void>;
+
+		/**
+		 * Fired when the webview stops being the active editor
+		 */
+		readonly onBecameInactive: Event<void>;
+
+		/**
+		 * Post a message to the webview content.
+		 *
+		 * Messages are only develivered if the webview is visible.
+		 *
+		 * @param message Body of the message.
+		 */
+		postMessage(message: any): Thenable<any>;
+
+		/**
+		 * Dispose the webview.
+		 */
+		dispose(): any;
+	}
+
+	namespace window {
+		/**
+		 * Create and show a new webview.
+		 *
+		 * @param title Title of the webview.
+		 * @param column Editor column to show the new webview in.
+		 * @param options Webview content options.
+		 */
+		export function createWebview(title: string, column: ViewColumn, options: WebviewOptions): Webview;
+	}
 }
diff --git a/src/vs/workbench/api/electron-browser/extensionHost.contribution.ts b/src/vs/workbench/api/electron-browser/extensionHost.contribution.ts
index d610ada2b88..93091f5ba0d 100644
--- a/src/vs/workbench/api/electron-browser/extensionHost.contribution.ts
+++ b/src/vs/workbench/api/electron-browser/extensionHost.contribution.ts
@@ -47,6 +47,7 @@ import './mainThreadTelemetry';
 import './mainThreadTerminalService';
 import './mainThreadTreeViews';
 import './mainThreadLogService';
+import './mainThreadWebview';
 import './mainThreadWindow';
 import './mainThreadWorkspace';
 
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts b/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
index f971f5722be..c7a0ba78a06 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
@@ -8,7 +8,6 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import uri from 'vs/base/common/uri';
 import { IDebugService, IConfig, IDebugConfigurationProvider, IBreakpoint, IFunctionBreakpoint, IBreakpointData } from 'vs/workbench/parts/debug/common/debug';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import {
 	ExtHostContext, ExtHostDebugServiceShape, MainThreadDebugServiceShape, DebugSessionUUID, MainContext,
 	IExtHostContext, IBreakpointsDeltaDto, ISourceMultiBreakpointDto, ISourceBreakpointDto, IFunctionBreakpointDto
@@ -25,8 +24,7 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape {
 
 	constructor(
 		extHostContext: IExtHostContext,
-		@IDebugService private debugService: IDebugService,
-		@IWorkspaceContextService private contextService: IWorkspaceContextService,
+		@IDebugService private debugService: IDebugService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostDebugService);
 		this._toDispose = [];
@@ -179,9 +177,9 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape {
 	}
 
 	public $startDebugging(_folderUri: uri | undefined, nameOrConfiguration: string | IConfig): TPromise<boolean> {
-		const folderUriString = _folderUri ? uri.revive(_folderUri).toString() : undefined;
-		const folder = folderUriString ? this.contextService.getWorkspace().folders.filter(wf => wf.uri.toString() === folderUriString).pop() : undefined;
-		return this.debugService.startDebugging(folder, nameOrConfiguration).then(x => {
+		const folderUri = _folderUri ? uri.revive(_folderUri) : undefined;
+		const launch = this.debugService.getConfigurationManager().getLaunch(folderUri);
+		return this.debugService.startDebugging(launch, nameOrConfiguration).then(x => {
 			return true;
 		}, err => {
 			return TPromise.wrapError(err && err.message ? err.message : 'cannot start debugging');
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts
index ab5c345cb80..8322e21dfc6 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts
@@ -16,7 +16,7 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi
 import { Position as EditorPosition, IEditor } from 'vs/platform/editor/common/editor';
 import { extHostCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 import { MainThreadDocuments } from 'vs/workbench/api/electron-browser/mainThreadDocuments';
-import { MainThreadEditors } from 'vs/workbench/api/electron-browser/mainThreadEditors';
+import { MainThreadTextEditors } from 'vs/workbench/api/electron-browser/mainThreadEditors';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IFileService } from 'vs/platform/files/common/files';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
@@ -77,7 +77,7 @@ namespace delta {
 	}
 }
 
-class EditorSnapshot {
+class TextEditorSnapshot {
 
 	readonly id: string;
 
@@ -95,8 +95,8 @@ class DocumentAndEditorStateDelta {
 	constructor(
 		readonly removedDocuments: ITextModel[],
 		readonly addedDocuments: ITextModel[],
-		readonly removedEditors: EditorSnapshot[],
-		readonly addedEditors: EditorSnapshot[],
+		readonly removedEditors: TextEditorSnapshot[],
+		readonly addedEditors: TextEditorSnapshot[],
 		readonly oldActiveEditor: string,
 		readonly newActiveEditor: string,
 	) {
@@ -124,12 +124,12 @@ class DocumentAndEditorState {
 		if (!before) {
 			return new DocumentAndEditorStateDelta(
 				[], mapset.setValues(after.documents),
-				[], mapset.mapValues(after.editors),
+				[], mapset.mapValues(after.textEditors),
 				undefined, after.activeEditor
 			);
 		}
 		const documentDelta = delta.ofSets(before.documents, after.documents);
-		const editorDelta = delta.ofMaps(before.editors, after.editors);
+		const editorDelta = delta.ofMaps(before.textEditors, after.textEditors);
 		const oldActiveEditor = before.activeEditor !== after.activeEditor ? before.activeEditor : undefined;
 		const newActiveEditor = before.activeEditor !== after.activeEditor ? after.activeEditor : undefined;
 
@@ -142,7 +142,7 @@ class DocumentAndEditorState {
 
 	constructor(
 		readonly documents: Set<ITextModel>,
-		readonly editors: Map<string, EditorSnapshot>,
+		readonly textEditors: Map<string, TextEditorSnapshot>,
 		readonly activeEditor: string,
 	) {
 		//
@@ -157,9 +157,9 @@ class MainThreadDocumentAndEditorStateComputer {
 
 	constructor(
 		private readonly _onDidChangeState: (delta: DocumentAndEditorStateDelta) => void,
-		@IModelService private _modelService: IModelService,
-		@ICodeEditorService private _codeEditorService: ICodeEditorService,
-		@IWorkbenchEditorService private _workbenchEditorService: IWorkbenchEditorService
+		@IModelService private readonly _modelService: IModelService,
+		@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
+		@IWorkbenchEditorService private readonly _workbenchEditorService: IWorkbenchEditorService
 	) {
 		this._modelService.onModelAdded(this._updateStateOnModelAdd, this, this._toDispose);
 		this._modelService.onModelRemoved(this._updateState, this, this._toDispose);
@@ -206,7 +206,7 @@ class MainThreadDocumentAndEditorStateComputer {
 		// small (fast) delta
 		this._currentState = new DocumentAndEditorState(
 			this._currentState.documents.add(model),
-			this._currentState.editors,
+			this._currentState.textEditors,
 			this._currentState.activeEditor
 		);
 
@@ -229,7 +229,7 @@ class MainThreadDocumentAndEditorStateComputer {
 
 
 		// editor: only take those that have a not too large model
-		const editors = new Map<string, EditorSnapshot>();
+		const editors = new Map<string, TextEditorSnapshot>();
 		let activeEditor: string = null;
 
 		for (const editor of this._codeEditorService.listCodeEditors()) {
@@ -238,7 +238,7 @@ class MainThreadDocumentAndEditorStateComputer {
 				&& !model.isDisposed() // model disposed
 				&& Boolean(this._modelService.getModel(model.uri)) // model disposing, the flag didn't flip yet but the model service already removed it
 			) {
-				const apiEditor = new EditorSnapshot(editor);
+				const apiEditor = new TextEditorSnapshot(editor);
 				editors.set(apiEditor.id, apiEditor);
 				if (editor.isFocused()) {
 					activeEditor = apiEditor.id;
@@ -285,7 +285,7 @@ export class MainThreadDocumentsAndEditors {
 	private _toDispose: IDisposable[];
 	private _proxy: ExtHostDocumentsAndEditorsShape;
 	private _stateComputer: MainThreadDocumentAndEditorStateComputer;
-	private _editors = <{ [id: string]: MainThreadTextEditor }>Object.create(null);
+	private _textEditors = <{ [id: string]: MainThreadTextEditor }>Object.create(null);
 
 	private _onTextEditorAdd = new Emitter<MainThreadTextEditor[]>();
 	private _onTextEditorRemove = new Emitter<string[]>();
@@ -299,9 +299,9 @@ export class MainThreadDocumentsAndEditors {
 
 	constructor(
 		extHostContext: IExtHostContext,
-		@IModelService private _modelService: IModelService,
-		@ITextFileService private _textFileService: ITextFileService,
-		@IWorkbenchEditorService private _workbenchEditorService: IWorkbenchEditorService,
+		@IModelService private readonly _modelService: IModelService,
+		@ITextFileService private readonly _textFileService: ITextFileService,
+		@IWorkbenchEditorService private readonly _workbenchEditorService: IWorkbenchEditorService,
 		@ICodeEditorService codeEditorService: ICodeEditorService,
 		@IModeService modeService: IModeService,
 		@IFileService fileService: IFileService,
@@ -314,15 +314,15 @@ export class MainThreadDocumentsAndEditors {
 		const mainThreadDocuments = new MainThreadDocuments(this, extHostContext, this._modelService, modeService, this._textFileService, fileService, textModelResolverService, untitledEditorService);
 		extHostContext.set(MainContext.MainThreadDocuments, mainThreadDocuments);
 
-		const mainThreadEditors = new MainThreadEditors(this, extHostContext, codeEditorService, this._workbenchEditorService, editorGroupService, textModelResolverService, fileService, this._modelService);
-		extHostContext.set(MainContext.MainThreadEditors, mainThreadEditors);
+		const mainThreadTextEditors = new MainThreadTextEditors(this, extHostContext, codeEditorService, this._workbenchEditorService, editorGroupService, textModelResolverService, fileService, this._modelService);
+		extHostContext.set(MainContext.MainThreadTextEditors, mainThreadTextEditors);
 
 		// It is expected that the ctor of the state computer calls our `_onDelta`.
 		this._stateComputer = new MainThreadDocumentAndEditorStateComputer(delta => this._onDelta(delta), _modelService, codeEditorService, _workbenchEditorService);
 
 		this._toDispose = [
 			mainThreadDocuments,
-			mainThreadEditors,
+			mainThreadTextEditors,
 			this._stateComputer,
 			this._onTextEditorAdd,
 			this._onTextEditorRemove,
@@ -349,16 +349,16 @@ export class MainThreadDocumentsAndEditors {
 			const mainThreadEditor = new MainThreadTextEditor(apiEditor.id, apiEditor.editor.getModel(),
 				apiEditor.editor, { onGainedFocus() { }, onLostFocus() { } }, this._modelService);
 
-			this._editors[apiEditor.id] = mainThreadEditor;
+			this._textEditors[apiEditor.id] = mainThreadEditor;
 			addedEditors.push(mainThreadEditor);
 		}
 
 		// removed editors
 		for (const { id } of delta.removedEditors) {
-			const mainThreadEditor = this._editors[id];
+			const mainThreadEditor = this._textEditors[id];
 			if (mainThreadEditor) {
 				mainThreadEditor.dispose();
-				delete this._editors[id];
+				delete this._textEditors[id];
 				removedEditors.push(id);
 			}
 		}
@@ -428,8 +428,8 @@ export class MainThreadDocumentsAndEditors {
 	}
 
 	findTextEditorIdFor(editor: IEditor): string {
-		for (let id in this._editors) {
-			if (this._editors[id].matches(editor)) {
+		for (let id in this._textEditors) {
+			if (this._textEditors[id].matches(editor)) {
 				return id;
 			}
 		}
@@ -437,6 +437,6 @@ export class MainThreadDocumentsAndEditors {
 	}
 
 	getEditor(id: string): MainThreadTextEditor {
-		return this._editors[id];
+		return this._textEditors[id];
 	}
 }
diff --git a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts
index 409e9df963d..b45d2269dac 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts
@@ -18,7 +18,7 @@ import { MainThreadTextEditor } from './mainThreadEditor';
 import { ITextEditorConfigurationUpdate, TextEditorRevealType, IApplyEditsOptions, IUndoStopOptions, WorkspaceEditDto, reviveWorkspaceEditDto } from 'vs/workbench/api/node/extHost.protocol';
 import { MainThreadDocumentsAndEditors } from './mainThreadDocumentsAndEditors';
 import { equals as objectEquals } from 'vs/base/common/objects';
-import { ExtHostContext, MainThreadEditorsShape, ExtHostEditorsShape, ITextDocumentShowOptions, ITextEditorPositionData, IExtHostContext } from '../node/extHost.protocol';
+import { ExtHostContext, MainThreadTextEditorsShape, ExtHostEditorsShape, ITextDocumentShowOptions, ITextEditorPositionData, IExtHostContext } from '../node/extHost.protocol';
 import { IRange } from 'vs/editor/common/core/range';
 import { ISelection } from 'vs/editor/common/core/selection';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
@@ -28,7 +28,7 @@ import { IModelService } from 'vs/editor/common/services/modelService';
 import { isCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { isResourceFileEdit } from 'vs/editor/common/modes';
 
-export class MainThreadEditors implements MainThreadEditorsShape {
+export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 
 	private _proxy: ExtHostEditorsShape;
 	private _documentsAndEditors: MainThreadDocumentsAndEditors;
@@ -41,7 +41,7 @@ export class MainThreadEditors implements MainThreadEditorsShape {
 	constructor(
 		documentsAndEditors: MainThreadDocumentsAndEditors,
 		extHostContext: IExtHostContext,
-		@ICodeEditorService private _codeEditorService: ICodeEditorService,
+		@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
 		@IWorkbenchEditorService workbenchEditorService: IWorkbenchEditorService,
 		@IEditorGroupService editorGroupService: IEditorGroupService,
 		@ITextModelService private readonly _textModelResolverService: ITextModelService,
diff --git a/src/vs/workbench/api/electron-browser/mainThreadMessageService.ts b/src/vs/workbench/api/electron-browser/mainThreadMessageService.ts
index c62b072f539..355ad2e9b3c 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadMessageService.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadMessageService.ts
@@ -5,19 +5,23 @@
 'use strict';
 
 import nls = require('vs/nls');
-import { IMessageService, IChoiceService } from 'vs/platform/message/common/message';
 import Severity from 'vs/base/common/severity';
 import { Action } from 'vs/base/common/actions';
 import { MainThreadMessageServiceShape, MainContext, IExtHostContext, MainThreadMessageOptions } from '../node/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { once } from 'vs/base/common/event';
+import { ICommandService } from 'vs/platform/commands/common/commands';
 
 @extHostNamedCustomer(MainContext.MainThreadMessageService)
 export class MainThreadMessageService implements MainThreadMessageServiceShape {
 
 	constructor(
 		extHostContext: IExtHostContext,
-		@IMessageService private readonly _messageService: IMessageService,
+		@INotificationService private readonly _notificationService: INotificationService,
+		@ICommandService private readonly _commandService: ICommandService,
 		@IChoiceService private readonly _choiceService: IChoiceService
 	) {
 		//
@@ -39,39 +43,41 @@ export class MainThreadMessageService implements MainThreadMessageServiceShape {
 
 		return new Promise<number>(resolve => {
 
-			let messageHide: Function;
 			let actions: MessageItemAction[] = [];
-			let hasCloseAffordance = false;
 
 			class MessageItemAction extends Action {
 				constructor(id: string, label: string, handle: number) {
 					super(id, label, undefined, true, () => {
 						resolve(handle);
-						messageHide(); // triggers dispose! make sure promise is already resolved
 						return undefined;
 					});
 				}
-				dispose(): void {
-					resolve(undefined);
+			}
+
+			class ManageExtensionAction extends Action {
+				constructor(id: string, label: string, commandService: ICommandService) {
+					super(id, label, undefined, true, () => {
+						return commandService.executeCommand('_extensions.manage', id);
+					});
 				}
 			}
 
 			commands.forEach(command => {
-				if (command.isCloseAffordance === true) {
-					hasCloseAffordance = true;
-				}
 				actions.push(new MessageItemAction('_extension_message_handle_' + command.handle, command.title, command.handle));
 			});
 
-			if (!hasCloseAffordance) {
-				actions.push(new MessageItemAction('__close', nls.localize('close', "Close"), undefined));
-			}
-
-			messageHide = this._messageService.show(severity, {
+			const messageHandle = this._notificationService.notify({
+				severity,
 				message,
-				actions,
+				actions: { primary: actions, secondary: extension ? [new ManageExtensionAction(extension.id, nls.localize('manageExtension', "Manage Extension"), this._commandService)] : [] },
 				source: extension && `${extension.displayName || extension.name}`
 			});
+
+			// if promise has not been resolved yet, now is the time to ensure a return value
+			// otherwise if already resolved it means the user clicked one of the buttons
+			once(messageHandle.onDidDispose)(() => {
+				resolve(undefined);
+			});
 		});
 	}
 
diff --git a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
index 83ec60aedcf..1aee0cdd391 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
@@ -179,9 +179,9 @@ export class TrimFinalNewLinesParticipant implements ISaveParticipantParticipant
 class FormatOnSaveParticipant implements ISaveParticipantParticipant {
 
 	constructor(
-		@ICodeEditorService private _editorService: ICodeEditorService,
-		@IEditorWorkerService private _editorWorkerService: IEditorWorkerService,
-		@IConfigurationService private _configurationService: IConfigurationService
+		@ICodeEditorService private readonly _editorService: ICodeEditorService,
+		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService
 	) {
 		// Nothing
 	}
@@ -288,8 +288,8 @@ export class SaveParticipant implements ISaveParticipant {
 	constructor(
 		extHostContext: IExtHostContext,
 		@IInstantiationService instantiationService: IInstantiationService,
-		@IProgressService2 private _progressService: IProgressService2,
-		@ILogService private _logService: ILogService
+		@IProgressService2 private readonly _progressService: IProgressService2,
+		@ILogService private readonly _logService: ILogService
 	) {
 		this._saveParticipants = [
 			instantiationService.createInstance(TrimWhitespaceParticipant),
diff --git a/src/vs/workbench/api/electron-browser/mainThreadTask.ts b/src/vs/workbench/api/electron-browser/mainThreadTask.ts
index 9980e755deb..b6bf7cc83c5 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadTask.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadTask.ts
@@ -23,8 +23,8 @@ export class MainThreadTask implements MainThreadTaskShape {
 
 	constructor(
 		extHostContext: IExtHostContext,
-		@ITaskService private _taskService: ITaskService,
-		@IWorkspaceContextService private _workspaceContextServer: IWorkspaceContextService
+		@ITaskService private readonly _taskService: ITaskService,
+		@IWorkspaceContextService private readonly _workspaceContextServer: IWorkspaceContextService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostTask);
 		this._activeHandles = Object.create(null);
diff --git a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
index 50f205d1be5..0b19a1ecd1b 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
@@ -8,10 +8,10 @@ import Event, { Emitter } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { ExtHostContext, MainThreadTreeViewsShape, ExtHostTreeViewsShape, MainContext, IExtHostContext } from '../node/extHost.protocol';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { ITreeViewDataProvider, ITreeItem, ICustomViewsService } from 'vs/workbench/common/views';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 import { distinct } from 'vs/base/common/arrays';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 @extHostNamedCustomer(MainContext.MainThreadTreeViews)
 export class MainThreadTreeViews extends Disposable implements MainThreadTreeViewsShape {
@@ -22,16 +22,16 @@ export class MainThreadTreeViews extends Disposable implements MainThreadTreeVie
 	constructor(
 		extHostContext: IExtHostContext,
 		@ICustomViewsService private viewsService: ICustomViewsService,
-		@IMessageService private messageService: IMessageService
+		@INotificationService private notificationService: INotificationService
 	) {
 		super();
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostTreeViews);
 	}
 
 	$registerTreeViewDataProvider(treeViewId: string): void {
-		const dataProvider = this._register(new TreeViewDataProvider(treeViewId, this._proxy, this.messageService));
+		const dataProvider = this._register(new TreeViewDataProvider(treeViewId, this._proxy, this.notificationService));
 		this._dataProviders.set(treeViewId, dataProvider);
-		this.viewsService.registerTreeViewDataProvider(treeViewId, dataProvider);
+		this.viewsService.getTreeViewer(treeViewId).dataProvider = dataProvider;
 	}
 
 	$refresh(treeViewId: string, itemsToRefresh: { [treeItemHandle: string]: ITreeItem }): void {
@@ -61,7 +61,7 @@ class TreeViewDataProvider implements ITreeViewDataProvider {
 
 	constructor(private treeViewId: string,
 		private _proxy: ExtHostTreeViewsShape,
-		private messageService: IMessageService
+		private notificationService: INotificationService
 	) {
 	}
 
@@ -73,7 +73,7 @@ class TreeViewDataProvider implements ITreeViewDataProvider {
 			.then(children => {
 				return this.postGetChildren(children);
 			}, err => {
-				this.messageService.show(Severity.Error, err);
+				this.notificationService.error(err);
 				return [];
 			});
 	}
diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
new file mode 100644
index 00000000000..cf42eee83d2
--- /dev/null
+++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
@@ -0,0 +1,380 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as map from 'vs/base/common/map';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { MainThreadWebviewShape, MainContext, IExtHostContext, ExtHostContext, ExtHostWebviewsShape } from 'vs/workbench/api/node/extHost.protocol';
+import { IDisposable, dispose, toDisposable, Disposable } from 'vs/base/common/lifecycle';
+import { extHostNamedCustomer } from './extHostCustomers';
+import { EditorInput, EditorModel, EditorOptions } from 'vs/workbench/common/editor';
+import { IEditorModel, Position } from 'vs/platform/editor/common/editor';
+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { WebviewEditor as BaseWebviewEditor, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from 'vs/workbench/parts/html/browser/webviewEditor';
+import { Builder, Dimension } from 'vs/base/browser/builder';
+import { Webview } from 'vs/workbench/parts/html/browser/webview';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
+import { IEditorRegistry, EditorDescriptor, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
+import { localize } from 'vs/nls';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import * as vscode from 'vscode';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import URI from 'vs/base/common/uri';
+
+interface WebviewEvents {
+	onMessage(message: any): void;
+	onFocus(): void;
+	onBlur(): void;
+}
+
+class WebviewInput extends EditorInput {
+	private _name: string;
+	private _options: vscode.WebviewOptions;
+	private _html: string;
+
+	constructor(
+		name: string,
+		options: vscode.WebviewOptions,
+		html: string,
+		public readonly events: WebviewEvents
+	) {
+		super();
+		this._name = name;
+		this._options = options;
+		this._html = html;
+	}
+
+	public getName(): string {
+		return this._name;
+	}
+
+	public setName(value: string): void {
+		this._name = value;
+		this._onDidChangeLabel.fire();
+	}
+
+	public get html(): string {
+		return this._html;
+	}
+
+	public set html(value: string) {
+		this._html = value;
+	}
+
+	public get options(): vscode.WebviewOptions {
+		return this._options;
+	}
+
+	public set options(value: vscode.WebviewOptions) {
+		this._options = value;
+	}
+
+	public getTypeId(): string {
+		return 'webview';
+	}
+
+	public resolve(refresh?: boolean): TPromise<IEditorModel, any> {
+		return TPromise.as(new EditorModel());
+	}
+}
+
+class WebviewEditor extends BaseWebviewEditor {
+	private static webviewIndex = 0;
+
+	public static readonly ID = 'WebviewEditor';
+
+	private static readonly standardSupportedLinkSchemes = ['http', 'https', 'mailto'];
+
+	private frame: HTMLElement;
+	private container: HTMLElement;
+	private webviewContent: HTMLDivElement;
+
+	private _contentDisposables: IDisposable[] = [];
+
+	constructor(
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IStorageService storageService: IStorageService,
+		@IContextKeyService private _contextKeyService: IContextKeyService,
+		@IThemeService themeService: IThemeService,
+		@IPartService private readonly _partService: IPartService,
+		@IContextViewService private readonly _contextViewService: IContextViewService,
+		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
+		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
+		@IOpenerService private readonly _openerService: IOpenerService
+	) {
+		super(WebviewEditor.ID, telemetryService, themeService, storageService, _contextKeyService);
+	}
+
+	protected createEditor(parent: Builder): void {
+		this.frame = parent.getHTMLElement();
+		this.container = this._partService.getContainer(Parts.EDITOR_PART);
+
+		this.webviewContent = document.createElement('div');
+		this.webviewContent.id = `webview-${WebviewEditor.webviewIndex++}`;
+		this._contextKeyService = this._contextKeyService.createScoped(this.webviewContent);
+		this.contextKey = KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS.bindTo(this._contextKeyService);
+		this.findInputFocusContextKey = KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED.bindTo(this._contextKeyService);
+		this.findWidgetVisible = KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE.bindTo(this._contextKeyService);
+
+		this.container.appendChild(this.webviewContent);
+
+		this.content = document.createElement('div');
+		this.content.setAttribute('aria-flowto', this.webviewContent.id);
+
+		parent.append(this.content);
+		this.doUpdateContainer();
+	}
+
+	private doUpdateContainer() {
+		const frameRect = this.frame.getBoundingClientRect();
+		const containerRect = this.container.getBoundingClientRect();
+
+		this.webviewContent.style.position = 'absolute';
+		this.webviewContent.style.top = `${frameRect.top - containerRect.top}px`;
+		this.webviewContent.style.left = `${frameRect.left - containerRect.left}px`;
+		this.webviewContent.style.width = `${frameRect.width}px`;
+		this.webviewContent.style.height = `${frameRect.height}px`;
+	}
+
+	public layout(dimension: Dimension): void {
+		if (this._webview) {
+			this.doUpdateContainer();
+			this._webview.layout();
+		}
+	}
+
+	public focus() {
+		if (this._webview) {
+			this._webview.focus();
+		}
+	}
+
+	public dispose(): void {
+		this._contentDisposables = dispose(this._contentDisposables);
+		super.dispose();
+	}
+
+	public sendMessage(data: any): void {
+		if (this._webview) {
+			this._webview.sendMessage(data);
+		}
+	}
+
+	public getFocusContainer(): Builder {
+		return new Builder(this.webviewContent, false);
+	}
+
+	protected setEditorVisible(visible: boolean, position?: Position): void {
+		if (visible) {
+			this.webviewContent.style.visibility = 'visible';
+			this.doUpdateContainer();
+		} else {
+			if (this._webview) {
+				this.webviewContent.style.visibility = 'hidden';
+			}
+		}
+		super.setEditorVisible(visible, position);
+	}
+
+	public clearInput(): void {
+		if (this.input && this.input instanceof WebviewInput) {
+			if (this.input.options.keepAlive) {
+				// Noop
+				return;
+			}
+		}
+		super.clearInput();
+	}
+
+	async setInput(input: WebviewInput, options: EditorOptions): TPromise<void> {
+		if (this.input && this.input.matches(input)) {
+			return undefined;
+		}
+
+		await super.setInput(input, options);
+
+		this.webview.options = {
+			allowScripts: input.options.enableScripts,
+			enableWrappedPostMessage: true
+		};
+		this.webview.contents = input.html;
+		this.webview.style(this.themeService.getTheme());
+	}
+
+	private get webview(): Webview {
+		if (!this._webview) {
+			this._contentDisposables = dispose(this._contentDisposables);
+
+			this._webview = new Webview(
+				this.webviewContent,
+				this._partService.getContainer(Parts.EDITOR_PART),
+				this._environmentService,
+				this._contextService,
+				this._contextViewService,
+				this.contextKey,
+				this.findInputFocusContextKey,
+				{
+					enableWrappedPostMessage: true
+				},
+				false);
+			this.webview.style(this.themeService.getTheme());
+
+			this._webview.onDidClickLink(this.onDidClickLink, this, this._contentDisposables);
+
+
+			this.themeService.onThemeChange(theme => {
+				if (this._webview) {
+					this._webview.style(theme);
+				}
+			}, null, this._contentDisposables);
+
+			this._webview.onMessage(message => {
+				if (this.input) {
+					(this.input as WebviewInput).events.onMessage(message);
+				}
+			}, null, this._contentDisposables);
+
+			this._contentDisposables.push(this._webview);
+			this._contentDisposables.push(toDisposable(() => this._webview = null));
+		}
+		return this._webview;
+	}
+
+	private onDidClickLink(link: URI): void {
+		if (!link) {
+			return;
+		}
+
+		const enableCommandUris = (this.input as WebviewInput).options.enableCommandUris;
+		if (WebviewEditor.standardSupportedLinkSchemes.indexOf(link.scheme) >= 0 || enableCommandUris && link.scheme === 'command') {
+			this._openerService.open(link);
+		}
+	}
+}
+
+
+@extHostNamedCustomer(MainContext.MainThreadWebview)
+export class MainThreadWebview implements MainThreadWebviewShape {
+	private readonly _toDispose: Disposable[] = [];
+
+	private readonly _proxy: ExtHostWebviewsShape;
+	private readonly _webviews = new Map<number, WebviewInput>();
+	private _activeWebview: WebviewInput | undefined = undefined;
+
+	constructor(
+		context: IExtHostContext,
+		@IEditorGroupService _editorGroupService: IEditorGroupService,
+		@IWorkbenchEditorService private readonly _editorService: IWorkbenchEditorService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService
+	) {
+		this._proxy = context.getProxy(ExtHostContext.ExtHostWebviews);
+
+		_editorGroupService.onEditorsChanged(this.onEditorsChanged, this, this._toDispose);
+	}
+
+	dispose(): void {
+		dispose(this._toDispose);
+	}
+
+	$createWebview(handle: number): void {
+		const webview = new WebviewInput('', {}, '', {
+			onMessage: (message) => this._proxy.$onMessage(handle, message),
+			onFocus: () => this._proxy.$onBecameActive(handle),
+			onBlur: () => this._proxy.$onBecameInactive(handle)
+		});
+		this._webviews.set(handle, webview);
+	}
+
+	$disposeWebview(handle: number): void {
+		const webview = this._webviews.get(handle);
+		this._editorService.closeEditor(Position.ONE, webview);
+	}
+
+	$setTitle(handle: number, value: string): void {
+		const webview = this._webviews.get(handle);
+		webview.setName(value);
+	}
+
+	$setHtml(handle: number, value: string): void {
+		this.updateInput(handle, existingInput =>
+			this._instantiationService.createInstance(WebviewInput, existingInput.getName(), existingInput.options, value, existingInput.events));
+	}
+
+	$setOptions(handle: number, newOptions: vscode.WebviewOptions): void {
+		this.updateInput(handle, existingInput =>
+			this._instantiationService.createInstance(WebviewInput, existingInput.getName(), newOptions, existingInput.html, existingInput.events));
+	}
+
+	$show(handle: number, column: Position): void {
+		const webviewInput = this._webviews.get(handle);
+		this._editorService.openEditor(webviewInput, { pinned: true }, column);
+	}
+
+	async $sendMessage(handle: number, message: any): Promise<boolean> {
+		const webviewInput = this._webviews.get(handle);
+		const editors = this._editorService.getVisibleEditors()
+			.filter(e => e instanceof WebviewInput)
+			.map(e => e as WebviewEditor)
+			.filter(e => e.input.matches(webviewInput));
+
+		for (const editor of editors) {
+			editor.sendMessage(message);
+		}
+
+		return (editors.length > 0);
+	}
+
+	private updateInput(handle: number, f: (existingInput: WebviewInput) => WebviewInput) {
+		const existingInput = this._webviews.get(handle);
+		const newInput = f(existingInput);
+		this._webviews.set(handle, newInput);
+		this._editorService.replaceEditors([{ toReplace: existingInput, replaceWith: newInput }]);
+	}
+
+	private onEditorsChanged() {
+		const activeEditor = this._editorService.getActiveEditor();
+		let newActiveWebview: WebviewInput | undefined = undefined;
+		if (activeEditor && activeEditor.input instanceof WebviewInput) {
+			for (const handle of map.keys(this._webviews)) {
+				const input = this._webviews.get(handle);
+				if (input.matches(activeEditor.input)) {
+					newActiveWebview = input;
+					break;
+				}
+			}
+		}
+
+		if (newActiveWebview) {
+			if (!this._activeWebview || !newActiveWebview.matches(this._activeWebview)) {
+				if (this._activeWebview) {
+					this._activeWebview.events.onBlur();
+				}
+				newActiveWebview.events.onFocus();
+				this._activeWebview = newActiveWebview;
+			}
+		} else {
+			if (this._activeWebview) {
+				this._activeWebview.events.onBlur();
+				this._activeWebview = undefined;
+			}
+		}
+	}
+}
+
+(<IEditorRegistry>Registry.as(EditorExtensions.Editors)).registerEditor(new EditorDescriptor(
+	WebviewEditor,
+	WebviewEditor.ID,
+	localize('webview.editor.label', "webview editor")),
+	[new SyncDescriptor(WebviewInput)]);
\ No newline at end of file
diff --git a/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts b/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
index 275298bcad4..c85997bc5d4 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
@@ -30,9 +30,9 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		@ISearchService private readonly _searchService: ISearchService,
 		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
 		@ITextFileService private readonly _textFileService: ITextFileService,
-		@IConfigurationService private _configurationService: IConfigurationService,
-		@IWorkspaceEditingService private _workspaceEditingService: IWorkspaceEditingService,
-		@IStatusbarService private _statusbarService: IStatusbarService
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IWorkspaceEditingService private readonly _workspaceEditingService: IWorkspaceEditingService,
+		@IStatusbarService private readonly _statusbarService: IStatusbarService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostWorkspace);
 		this._contextService.onDidChangeWorkspaceFolders(this._onDidChangeWorkspace, this, this._toDispose);
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
index 78644e0eded..466456f5bc3 100644
--- a/src/vs/workbench/api/node/extHost.api.impl.ts
+++ b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -57,6 +57,7 @@ import { ExtensionActivatedByAPI } from 'vs/workbench/api/node/extHostExtensionA
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 import { OverviewRulerLane } from 'vs/editor/common/model';
 import { ExtHostLogService } from 'vs/workbench/api/node/extHostLogService';
+import { ExtHostWebviews } from 'vs/workbench/api/node/extHostWebview';
 
 export interface IExtensionApiFactory {
 	(extension: IExtensionDescription): typeof vscode;
@@ -99,7 +100,7 @@ export function createApiFactory(
 	const extHostDocumentsAndEditors = rpcProtocol.set(ExtHostContext.ExtHostDocumentsAndEditors, new ExtHostDocumentsAndEditors(rpcProtocol));
 	const extHostDocuments = rpcProtocol.set(ExtHostContext.ExtHostDocuments, new ExtHostDocuments(rpcProtocol, extHostDocumentsAndEditors));
 	const extHostDocumentContentProviders = rpcProtocol.set(ExtHostContext.ExtHostDocumentContentProviders, new ExtHostDocumentContentProvider(rpcProtocol, extHostDocumentsAndEditors));
-	const extHostDocumentSaveParticipant = rpcProtocol.set(ExtHostContext.ExtHostDocumentSaveParticipant, new ExtHostDocumentSaveParticipant(extHostLogService, extHostDocuments, rpcProtocol.getProxy(MainContext.MainThreadEditors)));
+	const extHostDocumentSaveParticipant = rpcProtocol.set(ExtHostContext.ExtHostDocumentSaveParticipant, new ExtHostDocumentSaveParticipant(extHostLogService, extHostDocuments, rpcProtocol.getProxy(MainContext.MainThreadTextEditors)));
 	const extHostEditors = rpcProtocol.set(ExtHostContext.ExtHostEditors, new ExtHostEditors(rpcProtocol, extHostDocumentsAndEditors));
 	const extHostCommands = rpcProtocol.set(ExtHostContext.ExtHostCommands, new ExtHostCommands(rpcProtocol, extHostHeapService, extHostLogService));
 	const extHostTreeViews = rpcProtocol.set(ExtHostContext.ExtHostTreeViews, new ExtHostTreeViews(rpcProtocol.getProxy(MainContext.MainThreadTreeViews), extHostCommands));
@@ -116,6 +117,7 @@ export function createApiFactory(
 	const extHostTask = rpcProtocol.set(ExtHostContext.ExtHostTask, new ExtHostTask(rpcProtocol, extHostWorkspace));
 	const extHostWindow = rpcProtocol.set(ExtHostContext.ExtHostWindow, new ExtHostWindow(rpcProtocol));
 	rpcProtocol.set(ExtHostContext.ExtHostExtensionService, extensionService);
+	const extHostWebviews = rpcProtocol.set(ExtHostContext.ExtHostWebviews, new ExtHostWebviews(rpcProtocol));
 
 	// Check that no named customers are missing
 	const expected: ProxyIdentifier<any>[] = Object.keys(ExtHostContext).map((key) => ExtHostContext[key]);
@@ -396,6 +398,9 @@ export function createApiFactory(
 			}),
 			registerDecorationProvider: proposedApiFunction(extension, (provider: vscode.DecorationProvider) => {
 				return extHostDecorations.registerDecorationProvider(provider, extension.id);
+			}),
+			createWebview: proposedApiFunction(extension, (name: string, column: vscode.ViewColumn, options: vscode.WebviewOptions) => {
+				return extHostWebviews.createWebview(name, column, options);
 			})
 		};
 
@@ -533,21 +538,21 @@ export function createApiFactory(
 			onDidReceiveDebugSessionCustomEvent(listener, thisArg?, disposables?) {
 				return extHostDebugService.onDidReceiveDebugSessionCustomEvent(listener, thisArg, disposables);
 			},
-			onDidChangeBreakpoints: proposedApiFunction(extension, (listener, thisArgs?, disposables?) => {
+			onDidChangeBreakpoints(listener, thisArgs?, disposables?) {
 				return extHostDebugService.onDidChangeBreakpoints(listener, thisArgs, disposables);
-			}),
-			startDebugging(folder: vscode.WorkspaceFolder | undefined, nameOrConfig: string | vscode.DebugConfiguration) {
-				return extHostDebugService.startDebugging(folder, nameOrConfig);
 			},
 			registerDebugConfigurationProvider(debugType: string, provider: vscode.DebugConfigurationProvider) {
 				return extHostDebugService.registerDebugConfigurationProvider(debugType, provider);
 			},
-			addBreakpoints: proposedApiFunction(extension, (breakpoints: vscode.Breakpoint[]) => {
+			startDebugging(folder: vscode.WorkspaceFolder | undefined, nameOrConfig: string | vscode.DebugConfiguration) {
+				return extHostDebugService.startDebugging(folder, nameOrConfig);
+			},
+			addBreakpoints(breakpoints: vscode.Breakpoint[]) {
 				return extHostDebugService.addBreakpoints(breakpoints);
-			}),
-			removeBreakpoints: proposedApiFunction(extension, (breakpoints: vscode.Breakpoint[]) => {
+			},
+			removeBreakpoints(breakpoints: vscode.Breakpoint[]) {
 				return extHostDebugService.removeBreakpoints(breakpoints);
-			})
+			}
 		};
 
 
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 07a6fc237ad..b4715e17ff2 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -83,7 +83,7 @@ export interface IInitData {
 }
 
 export interface IConfigurationInitData extends IConfigurationData {
-	configurationScopes: ConfigurationScope[];
+	configurationScopes: { [key: string]: ConfigurationScope };
 }
 
 export interface IWorkspaceConfigurationChangeEventData {
@@ -196,7 +196,7 @@ export interface ITextDocumentShowOptions {
 	selection?: IRange;
 }
 
-export interface MainThreadEditorsShape extends IDisposable {
+export interface MainThreadTextEditorsShape extends IDisposable {
 	$tryShowTextDocument(resource: UriComponents, options: ITextDocumentShowOptions): TPromise<string>;
 	$registerTextEditorDecorationType(key: string, options: editorCommon.IDecorationRenderOptions): void;
 	$removeTextEditorDecorationType(key: string): void;
@@ -345,6 +345,21 @@ export interface MainThreadTelemetryShape extends IDisposable {
 	$publicLog(eventName: string, data?: any): void;
 }
 
+export interface MainThreadWebviewShape extends IDisposable {
+	$createWebview(handle: number): void;
+	$disposeWebview(handle: number): void;
+	$show(handle: number, column: EditorPosition): void;
+	$setTitle(handle: number, value: string): void;
+	$setHtml(handle: number, value: string): void;
+	$setOptions(handle: number, value: vscode.WebviewOptions): void;
+	$sendMessage(handle: number, value: any): Thenable<boolean>;
+}
+export interface ExtHostWebviewsShape {
+	$onMessage(handle: number, message: any): void;
+	$onBecameActive(handle: number): void;
+	$onBecameInactive(handle: number): void;
+}
+
 export interface MainThreadWorkspaceShape extends IDisposable {
 	$startSearch(includePattern: string, includeFolder: string, excludePatternOrDisregardExcludes: string | false, maxResults: number, requestId: number): Thenable<UriComponents[]>;
 	$cancelSearch(requestId: number): Thenable<boolean>;
@@ -783,7 +798,7 @@ export const MainContext = {
 	MainThreadDialogs: createMainId<MainThreadDiaglogsShape>('MainThreadDiaglogs'),
 	MainThreadDocuments: createMainId<MainThreadDocumentsShape>('MainThreadDocuments'),
 	MainThreadDocumentContentProviders: createMainId<MainThreadDocumentContentProvidersShape>('MainThreadDocumentContentProviders'),
-	MainThreadEditors: createMainId<MainThreadEditorsShape>('MainThreadEditors'),
+	MainThreadTextEditors: createMainId<MainThreadTextEditorsShape>('MainThreadTextEditors'),
 	MainThreadErrors: createMainId<MainThreadErrorsShape>('MainThreadErrors'),
 	MainThreadTreeViews: createMainId<MainThreadTreeViewsShape>('MainThreadTreeViews'),
 	MainThreadLanguageFeatures: createMainId<MainThreadLanguageFeaturesShape>('MainThreadLanguageFeatures'),
@@ -796,6 +811,7 @@ export const MainContext = {
 	MainThreadStorage: createMainId<MainThreadStorageShape>('MainThreadStorage'),
 	MainThreadTelemetry: createMainId<MainThreadTelemetryShape>('MainThreadTelemetry'),
 	MainThreadTerminalService: createMainId<MainThreadTerminalServiceShape>('MainThreadTerminalService'),
+	MainThreadWebview: createMainId<MainThreadWebviewShape>('MainThreadWebview'),
 	MainThreadWorkspace: createMainId<MainThreadWorkspaceShape>('MainThreadWorkspace'),
 	MainThreadFileSystem: createMainId<MainThreadFileSystemShape>('MainThreadFileSystem'),
 	MainThreadExtensionService: createMainId<MainThreadExtensionServiceShape>('MainThreadExtensionService'),
@@ -828,4 +844,5 @@ export const ExtHostContext = {
 	ExtHostTask: createExtId<ExtHostTaskShape>('ExtHostTask'),
 	ExtHostWorkspace: createExtId<ExtHostWorkspaceShape>('ExtHostWorkspace'),
 	ExtHostWindow: createExtId<ExtHostWindowShape>('ExtHostWindow'),
+	ExtHostWebviews: createExtId<ExtHostWebviewsShape>('ExtHostWebviews')
 };
diff --git a/src/vs/workbench/api/node/extHostConfiguration.ts b/src/vs/workbench/api/node/extHostConfiguration.ts
index db1ab8b650f..e89decf0b5b 100644
--- a/src/vs/workbench/api/node/extHostConfiguration.ts
+++ b/src/vs/workbench/api/node/extHostConfiguration.ts
@@ -41,14 +41,14 @@ export class ExtHostConfiguration implements ExtHostConfigurationShape {
 	private readonly _onDidChangeConfiguration = new Emitter<vscode.ConfigurationChangeEvent>();
 	private readonly _proxy: MainThreadConfigurationShape;
 	private readonly _extHostWorkspace: ExtHostWorkspace;
-	private _configurationScopes: Map<string, ConfigurationScope>;
+	private _configurationScopes: { [key: string]: ConfigurationScope };
 	private _configuration: Configuration;
 
 	constructor(proxy: MainThreadConfigurationShape, extHostWorkspace: ExtHostWorkspace, data: IConfigurationInitData) {
 		this._proxy = proxy;
 		this._extHostWorkspace = extHostWorkspace;
 		this._configuration = Configuration.parse(data);
-		this._readConfigurationScopes(data.configurationScopes);
+		this._configurationScopes = data.configurationScopes;
 	}
 
 	get onDidChangeConfiguration(): Event<vscode.ConfigurationChangeEvent> {
@@ -129,7 +129,7 @@ export class ExtHostConfiguration implements ExtHostConfigurationShape {
 	}
 
 	private _validateConfigurationAccess(key: string, resource: URI, extensionId: string): void {
-		const scope = this._configurationScopes.get(key);
+		const scope = this._configurationScopes[key];
 		const extensionIdText = extensionId ? `[${extensionId}] ` : '';
 		if (ConfigurationScope.RESOURCE === scope) {
 			if (resource === void 0) {
@@ -145,18 +145,6 @@ export class ExtHostConfiguration implements ExtHostConfigurationShape {
 		}
 	}
 
-	private _readConfigurationScopes(scopes: ConfigurationScope[]): void {
-		this._configurationScopes = new Map<string, ConfigurationScope>();
-		if (scopes.length) {
-			const defaultKeys = this._configuration.keys(this._extHostWorkspace.workspace).default;
-			if (defaultKeys.length === scopes.length) {
-				for (let i = 0; i < defaultKeys.length; i++) {
-					this._configurationScopes.set(defaultKeys[i], scopes[i]);
-				}
-			}
-		}
-	}
-
 	private _toConfigurationChangeEvent(data: IWorkspaceConfigurationChangeEventData): vscode.ConfigurationChangeEvent {
 		const changedConfiguration = new ConfigurationModel(data.changedConfiguration.contents, data.changedConfiguration.keys, data.changedConfiguration.overrides);
 		const changedConfigurationByResource: StrictResourceMap<ConfigurationModel> = new StrictResourceMap<ConfigurationModel>();
diff --git a/src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts b/src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts
index d6edc95eb20..77458388e0b 100644
--- a/src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts
+++ b/src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts
@@ -8,7 +8,7 @@ import Event from 'vs/base/common/event';
 import URI, { UriComponents } from 'vs/base/common/uri';
 import { sequence, always } from 'vs/base/common/async';
 import { illegalState } from 'vs/base/common/errors';
-import { ExtHostDocumentSaveParticipantShape, MainThreadEditorsShape, ResourceTextEditDto } from 'vs/workbench/api/node/extHost.protocol';
+import { ExtHostDocumentSaveParticipantShape, MainThreadTextEditorsShape, ResourceTextEditDto } from 'vs/workbench/api/node/extHost.protocol';
 import { TextEdit } from 'vs/workbench/api/node/extHostTypes';
 import { fromRange, TextDocumentSaveReason, EndOfLine } from 'vs/workbench/api/node/extHostTypeConverters';
 import { ExtHostDocuments } from 'vs/workbench/api/node/extHostDocuments';
@@ -28,7 +28,7 @@ export class ExtHostDocumentSaveParticipant implements ExtHostDocumentSavePartic
 	constructor(
 		private readonly _logService: ILogService,
 		private readonly _documents: ExtHostDocuments,
-		private readonly _mainThreadEditors: MainThreadEditorsShape,
+		private readonly _mainThreadEditors: MainThreadTextEditorsShape,
 		private readonly _thresholds: { timeout: number; errors: number; } = { timeout: 1500, errors: 3 }
 	) {
 		//
diff --git a/src/vs/workbench/api/node/extHostDocumentsAndEditors.ts b/src/vs/workbench/api/node/extHostDocumentsAndEditors.ts
index 16f3bda684c..65be19d03aa 100644
--- a/src/vs/workbench/api/node/extHostDocumentsAndEditors.ts
+++ b/src/vs/workbench/api/node/extHostDocumentsAndEditors.ts
@@ -85,7 +85,7 @@ export class ExtHostDocumentsAndEditors implements ExtHostDocumentsAndEditorsSha
 
 				const documentData = this._documents.get(resource.toString());
 				const editor = new ExtHostTextEditor(
-					this._mainContext.getProxy(MainContext.MainThreadEditors),
+					this._mainContext.getProxy(MainContext.MainThreadTextEditors),
 					data.id,
 					documentData,
 					data.selections.map(typeConverters.toSelection),
diff --git a/src/vs/workbench/api/node/extHostExtensionActivator.ts b/src/vs/workbench/api/node/extHostExtensionActivator.ts
index b0949051e4f..94a280f689d 100644
--- a/src/vs/workbench/api/node/extHostExtensionActivator.ts
+++ b/src/vs/workbench/api/node/extHostExtensionActivator.ts
@@ -242,7 +242,7 @@ export class ExtensionsActivator {
 
 			if (!depDesc) {
 				// Error condition 1: unknown dependency
-				this._host.showMessage(Severity.Error, nls.localize('unknownDep', "Extension `{1}` failed to activate. Reason: unknown dependency `{0}`.", depId, currentExtension.id));
+				this._host.showMessage(Severity.Error, nls.localize('unknownDep', "Extension '{1}' failed to activate. Reason: unknown dependency '{0}'.", depId, currentExtension.id));
 				this._activatedExtensions[currentExtension.id] = new FailedExtension(ExtensionActivationTimes.NONE);
 				return;
 			}
@@ -251,7 +251,7 @@ export class ExtensionsActivator {
 				let dep = this._activatedExtensions[depId];
 				if (dep.activationFailed) {
 					// Error condition 2: a dependency has already failed activation
-					this._host.showMessage(Severity.Error, nls.localize('failedDep1', "Extension `{1}` failed to activate. Reason: dependency `{0}` failed to activate.", depId, currentExtension.id));
+					this._host.showMessage(Severity.Error, nls.localize('failedDep1', "Extension '{1}' failed to activate. Reason: dependency '{0}' failed to activate.", depId, currentExtension.id));
 					this._activatedExtensions[currentExtension.id] = new FailedExtension(ExtensionActivationTimes.NONE);
 					return;
 				}
@@ -284,7 +284,7 @@ export class ExtensionsActivator {
 			// More than 10 dependencies deep => most likely a dependency loop
 			for (let i = 0, len = extensionDescriptions.length; i < len; i++) {
 				// Error condition 3: dependency loop
-				this._host.showMessage(Severity.Error, nls.localize('failedDep2', "Extension `{0}` failed to activate. Reason: more than 10 levels of dependencies (most likely a dependency loop).", extensionDescriptions[i].id));
+				this._host.showMessage(Severity.Error, nls.localize('failedDep2', "Extension '{0}' failed to activate. Reason: more than 10 levels of dependencies (most likely a dependency loop).", extensionDescriptions[i].id));
 				this._activatedExtensions[extensionDescriptions[i].id] = new FailedExtension(ExtensionActivationTimes.NONE);
 			}
 			return TPromise.as(void 0);
@@ -329,7 +329,7 @@ export class ExtensionsActivator {
 		}
 
 		this._activatingExtensions[extensionDescription.id] = this._host.actualActivateExtension(extensionDescription, reason).then(null, (err) => {
-			this._host.showMessage(Severity.Error, nls.localize('activationError', "Activating extension `{0}` failed: {1}.", extensionDescription.id, err.message));
+			this._host.showMessage(Severity.Error, nls.localize('activationError', "Activating extension '{0}' failed: {1}.", extensionDescription.id, err.message));
 			console.error('Activating extension `' + extensionDescription.id + '` failed: ', err.message);
 			console.log('Here is the error stack: ', err.stack);
 			// Treat the extension as being empty
diff --git a/src/vs/workbench/api/node/extHostTextEditor.ts b/src/vs/workbench/api/node/extHostTextEditor.ts
index 435f64983de..6ebf86fad18 100644
--- a/src/vs/workbench/api/node/extHostTextEditor.ts
+++ b/src/vs/workbench/api/node/extHostTextEditor.ts
@@ -13,7 +13,7 @@ import { ExtHostDocumentData } from 'vs/workbench/api/node/extHostDocumentData';
 import { Selection, Range, Position, EndOfLine, TextEditorRevealType, TextEditorLineNumbersStyle, SnippetString } from './extHostTypes';
 import { ISingleEditOperation } from 'vs/editor/common/model';
 import * as TypeConverters from './extHostTypeConverters';
-import { MainThreadEditorsShape, IResolvedTextEditorConfiguration, ITextEditorConfigurationUpdate } from './extHost.protocol';
+import { MainThreadTextEditorsShape, IResolvedTextEditorConfiguration, ITextEditorConfigurationUpdate } from './extHost.protocol';
 import * as vscode from 'vscode';
 import { TextEditorCursorStyle } from 'vs/editor/common/config/editorOptions';
 import { IRange } from 'vs/editor/common/core/range';
@@ -22,10 +22,10 @@ export class TextEditorDecorationType implements vscode.TextEditorDecorationType
 
 	private static readonly _Keys = new IdGenerator('TextEditorDecorationType');
 
-	private _proxy: MainThreadEditorsShape;
+	private _proxy: MainThreadTextEditorsShape;
 	public key: string;
 
-	constructor(proxy: MainThreadEditorsShape, options: vscode.DecorationRenderOptions) {
+	constructor(proxy: MainThreadTextEditorsShape, options: vscode.DecorationRenderOptions) {
 		this.key = TextEditorDecorationType._Keys.nextId();
 		this._proxy = proxy;
 		this._proxy.$registerTextEditorDecorationType(this.key, <any>/* URI vs Uri */ options);
@@ -141,7 +141,7 @@ function deprecated(name: string, message: string = 'Refer to the documentation
 
 export class ExtHostTextEditorOptions implements vscode.TextEditorOptions {
 
-	private _proxy: MainThreadEditorsShape;
+	private _proxy: MainThreadTextEditorsShape;
 	private _id: string;
 
 	private _tabSize: number;
@@ -149,7 +149,7 @@ export class ExtHostTextEditorOptions implements vscode.TextEditorOptions {
 	private _cursorStyle: TextEditorCursorStyle;
 	private _lineNumbers: TextEditorLineNumbersStyle;
 
-	constructor(proxy: MainThreadEditorsShape, id: string, source: IResolvedTextEditorConfiguration) {
+	constructor(proxy: MainThreadTextEditorsShape, id: string, source: IResolvedTextEditorConfiguration) {
 		this._proxy = proxy;
 		this._id = id;
 		this._accept(source);
@@ -313,7 +313,9 @@ export class ExtHostTextEditorOptions implements vscode.TextEditorOptions {
 
 export class ExtHostTextEditor implements vscode.TextEditor {
 
-	private readonly _proxy: MainThreadEditorsShape;
+	public readonly type = 'texteditor';
+
+	private readonly _proxy: MainThreadTextEditorsShape;
 	private readonly _id: string;
 	private readonly _documentData: ExtHostDocumentData;
 
@@ -324,7 +326,7 @@ export class ExtHostTextEditor implements vscode.TextEditor {
 
 	get id(): string { return this._id; }
 
-	constructor(proxy: MainThreadEditorsShape, id: string, document: ExtHostDocumentData, selections: Selection[], options: IResolvedTextEditorConfiguration, viewColumn: vscode.ViewColumn) {
+	constructor(proxy: MainThreadTextEditorsShape, id: string, document: ExtHostDocumentData, selections: Selection[], options: IResolvedTextEditorConfiguration, viewColumn: vscode.ViewColumn) {
 		this._proxy = proxy;
 		this._id = id;
 		this._documentData = document;
diff --git a/src/vs/workbench/api/node/extHostTextEditors.ts b/src/vs/workbench/api/node/extHostTextEditors.ts
index c64f6c085f1..2415ce3d0b1 100644
--- a/src/vs/workbench/api/node/extHostTextEditors.ts
+++ b/src/vs/workbench/api/node/extHostTextEditors.ts
@@ -12,7 +12,7 @@ import * as TypeConverters from './extHostTypeConverters';
 import { TextEditorDecorationType, ExtHostTextEditor } from './extHostTextEditor';
 import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors';
 import { Position as EditorPosition } from 'vs/platform/editor/common/editor';
-import { MainContext, MainThreadEditorsShape, ExtHostEditorsShape, ITextDocumentShowOptions, ITextEditorPositionData, IResolvedTextEditorConfiguration, ISelectionChangeEvent, IMainContext, WorkspaceEditDto } from './extHost.protocol';
+import { MainContext, MainThreadTextEditorsShape, ExtHostEditorsShape, ITextDocumentShowOptions, ITextEditorPositionData, IResolvedTextEditorConfiguration, ISelectionChangeEvent, IMainContext, WorkspaceEditDto } from './extHost.protocol';
 import * as vscode from 'vscode';
 
 export class ExtHostEditors implements ExtHostEditorsShape {
@@ -30,14 +30,14 @@ export class ExtHostEditors implements ExtHostEditorsShape {
 	readonly onDidChangeVisibleTextEditors: Event<vscode.TextEditor[]> = this._onDidChangeVisibleTextEditors.event;
 
 
-	private _proxy: MainThreadEditorsShape;
+	private _proxy: MainThreadTextEditorsShape;
 	private _extHostDocumentsAndEditors: ExtHostDocumentsAndEditors;
 
 	constructor(
 		mainContext: IMainContext,
 		extHostDocumentsAndEditors: ExtHostDocumentsAndEditors,
 	) {
-		this._proxy = mainContext.getProxy(MainContext.MainThreadEditors);
+		this._proxy = mainContext.getProxy(MainContext.MainThreadTextEditors);
 		this._extHostDocumentsAndEditors = extHostDocumentsAndEditors;
 
 		this._extHostDocumentsAndEditors.onDidChangeVisibleTextEditors(e => this._onDidChangeVisibleTextEditors.fire(e));
diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts
index cbf0e1a75f1..0ab16383768 100644
--- a/src/vs/workbench/api/node/extHostTreeViews.ts
+++ b/src/vs/workbench/api/node/extHostTreeViews.ts
@@ -16,6 +16,8 @@ import { ITreeItem, TreeViewItemHandleArg } from 'vs/workbench/common/views';
 import { ExtHostCommands, CommandsConverter } from 'vs/workbench/api/node/extHostCommands';
 import { asWinJsPromise } from 'vs/base/common/async';
 import { coalesce } from 'vs/base/common/arrays';
+import { TreeItemCollapsibleState } from 'vs/workbench/api/node/extHostTypes';
+import { isUndefinedOrNull } from 'vs/base/common/types';
 
 type TreeItemHandle = string;
 
@@ -183,11 +185,12 @@ class ExtHostTreeView<T> extends Disposable {
 			parentHandle,
 			label: extensionTreeItem.label,
 			resourceUri: extensionTreeItem.resourceUri,
+			tooltip: typeof extensionTreeItem.tooltip === 'string' ? extensionTreeItem.tooltip : void 0,
 			command: extensionTreeItem.command ? this.commands.toInternal(extensionTreeItem.command) : void 0,
 			contextValue: extensionTreeItem.contextValue,
 			icon,
 			iconDark: this.getDarkIconPath(extensionTreeItem) || icon,
-			collapsibleState: extensionTreeItem.collapsibleState
+			collapsibleState: isUndefinedOrNull(extensionTreeItem.collapsibleState) ? TreeItemCollapsibleState.None : extensionTreeItem.collapsibleState
 		};
 	}
 
@@ -197,7 +200,7 @@ class ExtHostTreeView<T> extends Disposable {
 		}
 
 		const prefix = parentHandle ? parentHandle : ExtHostTreeView.LABEL_HANDLE_PREFIX;
-		let elementId = label ? label : basename(resourceUri.path);
+		let elementId = label ? label : resourceUri ? basename(resourceUri.path) : '';
 		elementId = elementId.indexOf('/') !== -1 ? elementId.replace('/', '//') : elementId;
 		const existingHandle = this.nodes.has(element) ? this.nodes.get(element).handle : void 0;
 
diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts
index 3c5942a4c45..2cac1f11910 100644
--- a/src/vs/workbench/api/node/extHostTypes.ts
+++ b/src/vs/workbench/api/node/extHostTypes.ts
@@ -1524,6 +1524,7 @@ export class TreeItem {
 	iconPath?: string | URI | { light: string | URI; dark: string | URI };
 	command?: vscode.Command;
 	contextValue?: string;
+	tooltip?: string;
 
 	constructor(label: string, collapsibleState?: vscode.TreeItemCollapsibleState)
 	constructor(resourceUri: URI, collapsibleState?: vscode.TreeItemCollapsibleState)
diff --git a/src/vs/workbench/api/node/extHostWebview.ts b/src/vs/workbench/api/node/extHostWebview.ts
new file mode 100644
index 00000000000..97117f0b4d2
--- /dev/null
+++ b/src/vs/workbench/api/node/extHostWebview.ts
@@ -0,0 +1,126 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { MainContext, MainThreadWebviewShape, IMainContext, ExtHostWebviewsShape } from './extHost.protocol';
+import * as vscode from 'vscode';
+import { Emitter } from 'vs/base/common/event';
+import * as typeConverters from 'vs/workbench/api/node/extHostTypeConverters';
+
+class ExtHostWebview implements vscode.Webview {
+	private _title: string;
+	private _html: string;
+	private _options: vscode.WebviewOptions;
+	private _isDisposed: boolean = false;
+	private _viewColumn: vscode.ViewColumn;
+
+
+	public readonly onMessageEmitter = new Emitter<any>();
+	public readonly onMessage = this.onMessageEmitter.event;
+
+	public readonly onBecameActiveEmitter = new Emitter<void>();
+	public readonly onBecameActive = this.onBecameActiveEmitter.event;
+
+	public readonly onBecameInactiveEmitter = new Emitter<void>();
+	public readonly onBecameInactive = this.onBecameInactiveEmitter.event;
+
+	constructor(
+		private readonly _proxy: MainThreadWebviewShape,
+		private readonly _handle: number,
+		viewColumn: vscode.ViewColumn
+	) {
+		this._viewColumn = viewColumn;
+	}
+
+	public dispose() {
+		if (this._isDisposed) {
+			return;
+		}
+		this._isDisposed = true;
+		this._proxy.$disposeWebview(this._handle);
+	}
+
+	get title(): string {
+		return this._title;
+	}
+
+	set title(value: string) {
+		if (this._title !== value) {
+			this._title = value;
+			this._proxy.$setTitle(this._handle, value);
+		}
+	}
+
+	get html(): string {
+		return this._html;
+	}
+
+	set html(value: string) {
+		if (this._html !== value) {
+			this._html = value;
+			this._proxy.$setHtml(this._handle, value);
+		}
+	}
+
+	get options(): vscode.WebviewOptions {
+		return this._options;
+	}
+
+	set options(value: vscode.WebviewOptions) {
+		this._proxy.$setOptions(this._handle, value);
+	}
+
+	get viewColumn(): vscode.ViewColumn {
+		return this._viewColumn;
+	}
+
+	public postMessage(message: any): Thenable<any> {
+		return this._proxy.$sendMessage(this._handle, message);
+	}
+}
+
+export class ExtHostWebviews implements ExtHostWebviewsShape {
+	private static _handlePool = 0;
+
+	private readonly _proxy: MainThreadWebviewShape;
+
+	private readonly _webviews = new Map<number, ExtHostWebview>();
+
+	constructor(
+		mainContext: IMainContext
+	) {
+		this._proxy = mainContext.getProxy(MainContext.MainThreadWebview);
+	}
+
+	createWebview(
+		title: string,
+		viewColumn: vscode.ViewColumn,
+		options: vscode.WebviewOptions
+	): vscode.Webview {
+		const handle = ExtHostWebviews._handlePool++;
+		this._proxy.$createWebview(handle);
+
+		const webview = new ExtHostWebview(this._proxy, handle, viewColumn);
+		this._webviews.set(handle, webview);
+		webview.title = title;
+		webview.options = options;
+		this._proxy.$show(handle, typeConverters.fromViewColumn(viewColumn));
+		return webview;
+	}
+
+	$onMessage(handle: number, message: any): void {
+		const webview = this._webviews.get(handle);
+		webview.onMessageEmitter.fire(message);
+	}
+
+	$onBecameActive(handle: number): void {
+		const webview = this._webviews.get(handle);
+		webview.onBecameActiveEmitter.fire();
+	}
+
+	$onBecameInactive(handle: number): void {
+		const webview = this._webviews.get(handle);
+		webview.onBecameInactiveEmitter.fire();
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/api/node/extHostWorkspace.ts b/src/vs/workbench/api/node/extHostWorkspace.ts
index 585cc1af9bf..8db57ae791e 100644
--- a/src/vs/workbench/api/node/extHostWorkspace.ts
+++ b/src/vs/workbench/api/node/extHostWorkspace.ts
@@ -16,9 +16,9 @@ import { compare } from 'vs/base/common/strings';
 import { TernarySearchTree } from 'vs/base/common/map';
 import { basenameOrAuthority, isEqual } from 'vs/base/common/resources';
 import { isLinux } from 'vs/base/common/platform';
-import { Severity } from 'vs/platform/message/common/message';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { localize } from 'vs/nls';
+import { Severity } from 'vs/platform/notification/common/notification';
 
 function isFolderEqual(folderA: URI, folderB: URI): boolean {
 	return isEqual(folderA, folderB, !isLinux);
diff --git a/src/vs/workbench/browser/actions/toggleCenteredLayout.ts b/src/vs/workbench/browser/actions/toggleCenteredLayout.ts
new file mode 100644
index 00000000000..669820dc5ef
--- /dev/null
+++ b/src/vs/workbench/browser/actions/toggleCenteredLayout.ts
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { TPromise } from 'vs/base/common/winjs.base';
+import nls = require('vs/nls');
+import { Action } from 'vs/base/common/actions';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
+import { IPartService } from 'vs/workbench/services/part/common/partService';
+
+class ToggleCenteredLayout extends Action {
+
+	public static readonly ID = 'workbench.action.toggleCenteredLayout';
+	public static readonly LABEL = nls.localize('toggleCenteredLayout', "Toggle Centered Layout");
+
+	constructor(
+		id: string,
+		label: string,
+		@IPartService private partService: IPartService
+	) {
+		super(id, label);
+		this.enabled = !!this.partService;
+	}
+
+	public run(): TPromise<any> {
+		this.partService.toggleCenteredEditorLayout();
+
+		return TPromise.as(null);
+	}
+}
+
+const registry = Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions);
+registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleCenteredLayout, ToggleCenteredLayout.ID, ToggleCenteredLayout.LABEL), 'View: Toggle Centered Layout', nls.localize('view', "View"));
\ No newline at end of file
diff --git a/src/vs/workbench/browser/composite.ts b/src/vs/workbench/browser/composite.ts
index c7f752077e0..a8ae09dfc71 100644
--- a/src/vs/workbench/browser/composite.ts
+++ b/src/vs/workbench/browser/composite.ts
@@ -85,6 +85,10 @@ export abstract class Composite extends Component implements IComposite {
 		return this.parent;
 	}
 
+	public getFocusContainer(): Builder {
+		return this.getContainer();
+	}
+
 	/**
 	 * Note: Clients should not call this method, the workbench calls this
 	 * method. Calling it otherwise may result in unexpected behavior.
diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index 371db68f7da..5724d744de1 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -20,6 +20,8 @@ import { IEditorGroupService } from 'vs/workbench/services/group/common/groupSer
 import { getZoomFactor } from 'vs/base/browser/browser';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { memoize } from 'vs/base/common/decorators';
+import { NotificationsCenter } from 'vs/workbench/browser/parts/notifications/notificationsCenter';
+import { NotificationsToasts } from 'vs/workbench/browser/parts/notifications/notificationsToasts';
 
 const MIN_SIDEBAR_PART_WIDTH = 170;
 const MIN_EDITOR_PART_HEIGHT = 70;
@@ -63,6 +65,8 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 	private panel: Part;
 	private statusbar: Part;
 	private quickopen: QuickOpenController;
+	private notificationsCenter: NotificationsCenter;
+	private notificationsToasts: NotificationsToasts;
 	private toUnbind: IDisposable[];
 	private workbenchSize: Dimension;
 	private sashXOne: Sash;
@@ -91,6 +95,8 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 			statusbar: Part
 		},
 		quickopen: QuickOpenController,
+		notificationsCenter: NotificationsCenter,
+		notificationsToasts: NotificationsToasts,
 		@IStorageService private storageService: IStorageService,
 		@IContextViewService private contextViewService: IContextViewService,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
@@ -108,6 +114,8 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 		this.panel = parts.panel;
 		this.statusbar = parts.statusbar;
 		this.quickopen = quickopen;
+		this.notificationsCenter = notificationsCenter;
+		this.notificationsToasts = notificationsToasts;
 		this.toUnbind = [];
 		this.panelSizeBeforeMaximized = this.storageService.getInteger(WorkbenchLayout.panelSizeBeforeMaximizedKey, StorageScope.GLOBAL, 0);
 		this.panelMaximized = false;
@@ -641,6 +649,10 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 		// Quick open
 		this.quickopen.layout(this.workbenchSize);
 
+		// Notifications
+		this.notificationsCenter.layout(this.workbenchSize);
+		this.notificationsToasts.layout(this.workbenchSize);
+
 		// Sashes
 		this.sashXOne.layout();
 		if (panelPosition === Position.BOTTOM) {
diff --git a/src/vs/workbench/browser/parts/compositePart.ts b/src/vs/workbench/browser/parts/compositePart.ts
index 2ca7e098b95..8b738ccedec 100644
--- a/src/vs/workbench/browser/parts/compositePart.ts
+++ b/src/vs/workbench/browser/parts/compositePart.ts
@@ -31,12 +31,12 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { attachProgressBarStyler } from 'vs/platform/theme/common/styler';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export interface ICompositeTitleLabel {
 
@@ -69,7 +69,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 	protected _onDidCompositeClose = new Emitter<IComposite>();
 
 	constructor(
-		private messageService: IMessageService,
+		private notificationService: INotificationService,
 		private storageService: IStorageService,
 		private telemetryService: ITelemetryService,
 		protected contextMenuService: IContextMenuService,
@@ -283,7 +283,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 
 				// Check for Error
 				if (e.error && !errors.isPromiseCanceledError(e.error)) {
-					this.messageService.show(Severity.Error, e.error);
+					this.notificationService.error(e.error);
 				}
 
 				// Log in telemetry
@@ -496,7 +496,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 	}
 
 	private onError(error: any): void {
-		this.messageService.show(Severity.Error, types.isString(error) ? new Error(error) : error);
+		this.notificationService.error(types.isString(error) ? new Error(error) : error);
 	}
 
 	public getProgressIndicator(id: string): IProgressService {
diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
index 71ddec696bf..1f25b18bdce 100644
--- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts
+++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
@@ -209,7 +209,7 @@ Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactor
 
 // Register Editor Status
 const statusBar = Registry.as<IStatusbarRegistry>(StatusExtensions.Statusbar);
-statusBar.registerStatusbarItem(new StatusbarItemDescriptor(EditorStatus, StatusbarAlignment.RIGHT, 100 /* High Priority */));
+statusBar.registerStatusbarItem(new StatusbarItemDescriptor(EditorStatus, StatusbarAlignment.RIGHT, 100 /* towards the left of the right hand side */));
 
 // Register Status Actions
 const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
index 0c500492a5c..4f1ce6ea88c 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
@@ -25,6 +25,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IExtensionService } from 'vs/platform/extensions/common/extensions';
+import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { TabsTitleControl } from 'vs/workbench/browser/parts/editor/tabsTitleControl';
 import { ITitleAreaControl } from 'vs/workbench/browser/parts/editor/titleControl';
 import { NoTabsTitleControl } from 'vs/workbench/browser/parts/editor/noTabsTitleControl';
@@ -37,6 +38,8 @@ import { attachProgressBarStyler } from 'vs/platform/theme/common/styler';
 import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
 import { ResourcesDropHandler, LocalSelectionTransfer, DraggedEditorIdentifier } from 'vs/workbench/browser/dnd';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IPartService } from 'vs/workbench/services/part/common/partService';
+import { TextDiffEditor } from 'vs/workbench/browser/parts/editor/textDiffEditor';
 
 export enum Rochade {
 	NONE,
@@ -87,20 +90,30 @@ export interface IEditorGroupsControl {
 	dispose(): void;
 }
 
+interface CenteredEditorLayoutData {
+	leftMarginRatio: number;
+	size: number;
+}
+
 /**
  * Helper class to manage multiple side by side editors for the editor part.
  */
 export class EditorGroupsControl extends Themable implements IEditorGroupsControl, IVerticalSashLayoutProvider, IHorizontalSashLayoutProvider {
 
+	private static readonly CENTERED_EDITOR_LAYOUT_DATA_STORAGE_KEY = 'workbench.centerededitorlayout.layoutData';
+
 	private static readonly TITLE_AREA_CONTROL_KEY = '__titleAreaControl';
 	private static readonly PROGRESS_BAR_CONTROL_KEY = '__progressBar';
 	private static readonly INSTANTIATION_SERVICE_KEY = '__instantiationService';
 
+	private static readonly GOLDEN_RATIO = 0.61;
 	private static readonly MIN_EDITOR_WIDTH = 170;
 	private static readonly MIN_EDITOR_HEIGHT = 70;
 
 	private static readonly EDITOR_TITLE_HEIGHT = 35;
 
+	private static readonly CENTERED_EDITOR_MIN_MARGIN = 10;
+
 	private static readonly SNAP_TO_MINIMIZED_THRESHOLD_WIDTH = 50;
 	private static readonly SNAP_TO_MINIMIZED_THRESHOLD_HEIGHT = 20;
 
@@ -125,6 +138,22 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 	private sashTwo: Sash;
 	private startSiloThreeSize: number;
 
+	// if the centered editor layout is activated, the editor inside of silo ONE is centered
+	// the silo will then contain:
+	// [left margin]|[editor]|[right margin]
+	// - The size of the editor is defined by centeredEditorSize
+	// - The position is defined by the ratio centeredEditorLeftMarginRatio = left-margin/(left-margin + editor + right-margin).
+	// - The two sashes can be used to control the size and position of the editor inside of the silo.
+	// - In order to seperate the two sashes from the sashes that control the size of bordering widgets
+	//   CENTERED_EDITOR_MIN_MARGIN is forced as a minimum size for the two margins.
+	private centeredEditorActive: boolean;
+	private centeredEditorSashLeft: Sash;
+	private centeredEditorSashRight: Sash;
+	private centeredEditorPreferedSize: number;
+	private centeredEditorLeftMarginRatio: number;
+	private centeredEditorDragStartPosition: number;
+	private centeredEditorDragStartSize: number;
+
 	private visibleEditors: BaseEditor[];
 
 	private lastActiveEditor: BaseEditor;
@@ -144,6 +173,8 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		groupOrientation: GroupOrientation,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
 		@IEditorGroupService private editorGroupService: IEditorGroupService,
+		@IPartService private partService: IPartService,
+		@IStorageService private storageServise: IStorageService,
 		@IContextKeyService private contextKeyService: IContextKeyService,
 		@IExtensionService private extensionService: IExtensionService,
 		@IInstantiationService private instantiationService: IInstantiationService,
@@ -424,7 +455,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		}
 
 		// Track focus on editor container
-		const focusTracker = DOM.trackFocus(editor.getContainer().getHTMLElement());
+		const focusTracker = DOM.trackFocus(editor.getFocusContainer().getHTMLElement());
 		const listenerDispose = focusTracker.onDidFocus(() => {
 			this.onFocusGained(editor);
 		});
@@ -971,41 +1002,73 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 
 		// For each position
 		POSITIONS.forEach(position => {
-			const silo = this.silos[position];
-
-			// Containers (they contain everything and can move between silos)
-			const container = $(silo).div({ 'class': 'container' });
-
-			// InstantiationServices
-			const instantiationService = this.instantiationService.createChild(new ServiceCollection(
-				[IContextKeyService, this.contextKeyService.createScoped(container.getHTMLElement())]
-			));
-			container.setProperty(EditorGroupsControl.INSTANTIATION_SERVICE_KEY, instantiationService); // associate with container
-
-			// Title containers
-			const titleContainer = $(container).div({ 'class': 'title' });
-			if (this.tabOptions.showTabs) {
-				titleContainer.addClass('tabs');
-			}
-			if (this.tabOptions.showIcons) {
-				titleContainer.addClass('show-file-icons');
-			}
-			this.hookTitleDragListener(titleContainer);
-
-			// Title Control
-			this.createTitleControl(this.stacks.groupAt(position), silo, titleContainer, instantiationService);
-
-			// Progress Bar
-			const progressBar = new ProgressBar($(container));
-			this.toUnbind.push(attachProgressBarStyler(progressBar, this.themeService));
-			progressBar.getContainer().hide();
-			container.setProperty(EditorGroupsControl.PROGRESS_BAR_CONTROL_KEY, progressBar); // associate with container
+			this.createSilo(position);
 		});
 
 		// Update Styles
 		this.updateStyles();
 	}
 
+	private createSilo(position: Position): void {
+		const silo = this.silos[position];
+
+		// Containers (they contain everything and can move between silos)
+		const container = $(silo).div({ 'class': 'container' });
+
+		// InstantiationServices
+		const instantiationService = this.instantiationService.createChild(new ServiceCollection(
+			[IContextKeyService, this.contextKeyService.createScoped(container.getHTMLElement())]
+		));
+		container.setProperty(EditorGroupsControl.INSTANTIATION_SERVICE_KEY, instantiationService); // associate with container
+
+		// Title containers
+		const titleContainer = $(container).div({ 'class': 'title' });
+		if (this.tabOptions.showTabs) {
+			titleContainer.addClass('tabs');
+		}
+		if (this.tabOptions.showIcons) {
+			titleContainer.addClass('show-file-icons');
+		}
+		this.hookTitleDragListener(titleContainer);
+
+		// Title Control
+		this.createTitleControl(this.stacks.groupAt(position), silo, titleContainer, instantiationService);
+
+		// Progress Bar
+		const progressBar = new ProgressBar($(container));
+		this.toUnbind.push(attachProgressBarStyler(progressBar, this.themeService));
+		progressBar.getContainer().hide();
+		container.setProperty(EditorGroupsControl.PROGRESS_BAR_CONTROL_KEY, progressBar); // associate with container
+
+		// Sash for first position to support centered editor layout
+		if (position === Position.ONE) {
+
+			// Center Layout stuff
+			const registerSashListeners = (sash: Sash) => {
+				this.toUnbind.push(sash.onDidStart(() => this.onCenterSashDragStart()));
+				this.toUnbind.push(sash.onDidChange((e: ISashEvent) => this.onCenterSashDrag(sash, e)));
+				this.toUnbind.push(sash.onDidEnd(() => this.storeCenteredLayoutData()));
+				this.toUnbind.push(sash.onDidReset(() => this.resetCenteredEditor()));
+			};
+			this.centeredEditorSashLeft = new Sash(container.getHTMLElement(), this, { baseSize: 5, orientation: Orientation.VERTICAL });
+			this.centeredEditorSashRight = new Sash(container.getHTMLElement(), this, { baseSize: 5, orientation: Orientation.VERTICAL });
+			registerSashListeners(this.centeredEditorSashLeft);
+			registerSashListeners(this.centeredEditorSashRight);
+
+			this.centeredEditorActive = false;
+			this.centeredEditorLeftMarginRatio = 0.5;
+			this.centeredEditorPreferedSize = -1; // set this later if we know the container size
+
+			// Restore centered layout position and size
+			const centeredLayoutDataString = this.storageServise.get(EditorGroupsControl.CENTERED_EDITOR_LAYOUT_DATA_STORAGE_KEY, StorageScope.GLOBAL);
+			if (centeredLayoutDataString) {
+				const centeredLayout = <CenteredEditorLayoutData>JSON.parse(centeredLayoutDataString);
+				this.centeredEditorLeftMarginRatio = centeredLayout.leftMarginRatio;
+				this.centeredEditorPreferedSize = centeredLayout.size;
+			}
+		}
+	}
+
 	protected updateStyles(): void {
 		super.updateStyles();
 
@@ -1858,12 +1921,68 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		this.sashTwo.layout();
 	}
 
+	private get centeredEditorAvailableSize(): number {
+		return this.silosSize[Position.ONE] - EditorGroupsControl.CENTERED_EDITOR_MIN_MARGIN * 2;
+	}
+
+	private get centeredEditorSize(): number {
+		return Math.min(this.centeredEditorAvailableSize, this.centeredEditorPreferedSize);
+	}
+
+	private get centeredEditorPosition(): number {
+		return EditorGroupsControl.CENTERED_EDITOR_MIN_MARGIN + this.centeredEditorLeftMarginRatio * (this.centeredEditorAvailableSize - this.centeredEditorSize);
+	}
+
+	private onCenterSashDragStart(): void {
+		this.centeredEditorDragStartPosition = this.centeredEditorPosition;
+		this.centeredEditorDragStartSize = this.centeredEditorSize;
+	}
+
+	private onCenterSashDrag(sash: Sash, e: ISashEvent): void {
+		const sashesCoupled = !e.altKey;
+		const delta = sash === this.centeredEditorSashLeft ? e.startX - e.currentX : e.currentX - e.startX;
+		const size = this.centeredEditorDragStartSize + (sashesCoupled ? 2 * delta : delta);
+		let position = this.centeredEditorDragStartPosition;
+		if (sash === this.centeredEditorSashLeft || sashesCoupled) {
+			position -= delta;
+		}
+
+		if (size > 3 * this.minSize) {
+			this.centeredEditorPreferedSize = size;
+			position -= EditorGroupsControl.CENTERED_EDITOR_MIN_MARGIN;
+			position = Math.min(position, this.centeredEditorAvailableSize - this.centeredEditorSize);
+			position = Math.max(0, position);
+			this.centeredEditorLeftMarginRatio = position / (this.centeredEditorAvailableSize - this.centeredEditorSize);
+
+			this.layoutContainers();
+		}
+	}
+
+	private storeCenteredLayoutData(): void {
+		const data: CenteredEditorLayoutData = {
+			leftMarginRatio: this.centeredEditorLeftMarginRatio,
+			size: this.centeredEditorSize
+		};
+		this.storageServise.store(EditorGroupsControl.CENTERED_EDITOR_LAYOUT_DATA_STORAGE_KEY, JSON.stringify(data), StorageScope.GLOBAL);
+	}
+
 	public getVerticalSashTop(sash: Sash): number {
 		return 0;
 	}
 
 	public getVerticalSashLeft(sash: Sash): number {
-		return sash === this.sashOne ? this.silosSize[Position.ONE] : this.silosSize[Position.TWO] + this.silosSize[Position.ONE];
+		switch (sash) {
+			case this.sashOne:
+				return this.silosSize[Position.ONE];
+			case this.sashTwo:
+				return this.silosSize[Position.TWO] + this.silosSize[Position.ONE];
+			case this.centeredEditorSashLeft:
+				return this.centeredEditorPosition;
+			case this.centeredEditorSashRight:
+				return this.centeredEditorPosition + this.centeredEditorSize;
+			default:
+				return 0;
+		}
 	}
 
 	public getVerticalSashHeight(sash: Sash): number {
@@ -2013,6 +2132,28 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 			}
 		});
 
+		// Layout centered Editor (only in vertical layout when one group is opened)
+		const doCentering = this.layoutVertically && this.stacks.groups.length === 1 && this.partService.isEditorLayoutCentered() && !(this.visibleEditors[Position.ONE] instanceof TextDiffEditor);
+		if (doCentering && !this.centeredEditorActive) {
+			this.centeredEditorSashLeft.show();
+			this.centeredEditorSashRight.show();
+
+			// no size set yet. Calculate a default value
+			if (this.centeredEditorPreferedSize === -1) {
+				this.resetCenteredEditor(false);
+			}
+		} else if (!doCentering && this.centeredEditorActive) {
+			this.centeredEditorSashLeft.hide();
+			this.centeredEditorSashRight.hide();
+		}
+		this.centeredEditorActive = doCentering;
+		this.silos[Position.ONE].setClass('centered', doCentering);
+
+		if (this.centeredEditorActive) {
+			this.centeredEditorSashLeft.layout();
+			this.centeredEditorSashRight.layout();
+		}
+
 		// Layout visible editors
 		POSITIONS.forEach(position => {
 			this.layoutEditor(position);
@@ -2031,10 +2172,17 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 
 	private layoutEditor(position: Position): void {
 		const editorSize = this.silosSize[position];
-		if (editorSize && this.visibleEditors[position]) {
+		const editor = this.visibleEditors[position];
+		if (editorSize && editor) {
 			let editorWidth = this.layoutVertically ? editorSize : this.dimension.width;
 			let editorHeight = (this.layoutVertically ? this.dimension.height : this.silosSize[position]) - EditorGroupsControl.EDITOR_TITLE_HEIGHT;
 
+			let editorPosition = 0;
+			if (this.centeredEditorActive) {
+				editorWidth = this.centeredEditorSize;
+				editorPosition = this.centeredEditorPosition;
+			}
+
 			if (position !== Position.ONE) {
 				if (this.layoutVertically) {
 					editorWidth--; // accomodate for 1px left-border in containers TWO, THREE when laying out vertically
@@ -2043,10 +2191,23 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 				}
 			}
 
-			this.visibleEditors[position].layout(new Dimension(editorWidth, editorHeight));
+			const editorContainer = editor.getContainer();
+			editorContainer.style('margin-left', this.centeredEditorActive ? `${editorPosition}px` : null);
+			editorContainer.style('width', this.centeredEditorActive ? `${editorWidth}px` : null);
+			editorContainer.style('border-color', this.centeredEditorActive ? this.getColor(EDITOR_GROUP_BORDER) || this.getColor(contrastBorder) : null);
+			editor.layout(new Dimension(editorWidth, editorHeight));
 		}
 	}
 
+	private resetCenteredEditor(layout: boolean = true) {
+		this.centeredEditorLeftMarginRatio = 0.5;
+		this.centeredEditorPreferedSize = Math.floor(this.dimension.width * EditorGroupsControl.GOLDEN_RATIO);
+		if (layout) {
+			this.layoutContainers();
+		}
+		this.storageServise.remove(EditorGroupsControl.CENTERED_EDITOR_LAYOUT_DATA_STORAGE_KEY, StorageScope.GLOBAL);
+	}
+
 	public getInstantiationService(position: Position): IInstantiationService {
 		return this.getFromContainer(position, EditorGroupsControl.INSTANTIATION_SERVICE_KEY);
 	}
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index 085f10d2e41..61f14c9e7cb 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -32,7 +32,6 @@ import { Position, POSITIONS, Direction, IEditor } from 'vs/platform/editor/comm
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IMessageService, IMessageWithAction, Severity } from 'vs/platform/message/common/message';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { EditorStacksModel, EditorGroup, EditorIdentifier, EditorCloseEvent } from 'vs/workbench/common/editor/editorStacksModel';
@@ -48,6 +47,8 @@ import { IEditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } fr
 import { ThrottledEmitter } from 'vs/base/common/async';
 import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { isUndefinedOrNull } from 'vs/base/common/types';
+import { INotificationService, Severity, INotificationActions } from 'vs/platform/notification/common/notification';
+import { isErrorWithActions } from 'vs/base/common/errors';
 
 class ProgressMonitor {
 
@@ -126,7 +127,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 	constructor(
 		id: string,
 		restoreFromStorage: boolean,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IStorageService private storageService: IStorageService,
 		@IPartService private partService: IPartService,
@@ -540,24 +541,24 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 		});
 	}
 
-	private doHandleSetInputError(e: Error | IMessageWithAction, group: EditorGroup, editor: BaseEditor, input: EditorInput, options: EditorOptions, monitor: ProgressMonitor): void {
+	private doHandleSetInputError(error: Error, group: EditorGroup, editor: BaseEditor, input: EditorInput, options: EditorOptions, monitor: ProgressMonitor): void {
 		const position = this.stacks.positionOfGroup(group);
 
 		// Stop loading promise if any
 		monitor.cancel();
 
 		// Report error only if this was not us restoring previous error state
-		if (this.partService.isCreated() && !errors.isPromiseCanceledError(e)) {
-			const errorMessage = nls.localize('editorOpenError', "Unable to open '{0}': {1}.", input.getName(), toErrorMessage(e));
-
-			let error: any;
-			if (e && (<IMessageWithAction>e).actions && (<IMessageWithAction>e).actions.length) {
-				error = errors.create(errorMessage, { actions: (<IMessageWithAction>e).actions }); // Support error actions from thrower
-			} else {
-				error = errorMessage;
+		if (this.partService.isCreated() && !errors.isPromiseCanceledError(error)) {
+			const actions: INotificationActions = { primary: [] };
+			if (isErrorWithActions(error)) {
+				actions.primary = error.actions;
 			}
 
-			this.messageService.show(Severity.Error, types.isString(error) ? new Error(error) : error);
+			this.notificationService.notify({
+				severity: Severity.Error,
+				message: nls.localize('editorOpenError', "Unable to open '{0}': {1}.", input.getName(), toErrorMessage(error)),
+				actions
+			});
 		}
 
 		this.editorGroupsControl.updateProgress(position, ProgressState.DONE);
@@ -961,7 +962,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 				// It could be that the editor saved meanwhile, so we check again
 				// to see if anything needs to happen before closing for good.
 				// This can happen for example if autoSave: onFocusChange is configured
-				// so that the save happens when the dialog opens. 
+				// so that the save happens when the dialog opens.
 				if (!editor.isDirty()) {
 					return res === ConfirmResult.CANCEL ? true : false;
 				}
diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index 94103617f9b..a3038c60db1 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -50,16 +50,17 @@ import { IConfigurationChangedEvent, IEditorOptions } from 'vs/editor/common/con
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { attachStylerCallback } from 'vs/platform/theme/common/styler';
+import { attachStylerCallback, attachButtonStyler } from 'vs/platform/theme/common/styler';
 import { widgetShadow, editorWidgetBackground } from 'vs/platform/theme/common/colorRegistry';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { deepClone } from 'vs/base/common/objects';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { Button } from 'vs/base/browser/ui/button/button';
+import { Schemas } from 'vs/base/common/network';
 
 // TODO@Sandeep layer breaker
 // tslint:disable-next-line:import-patterns
 import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
-import { Schemas } from 'vs/base/common/network';
 
 function toEditorWithEncodingSupport(input: IEditorInput): IEncodingSupport {
 	if (input instanceof SideBySideEditorInput) {
@@ -1276,19 +1277,24 @@ class ScreenReaderDetectedExplanation {
 		const question = $('p.question', {}, nls.localize('screenReaderDetectedExplanation.question', "Are you using a screen reader to operate VS Code?"));
 		domNode.appendChild(question);
 
-		const yesBtn = $('div.button', {}, nls.localize('screenReaderDetectedExplanation.answerYes', "Yes"));
-		this._toDispose.push(addDisposableListener(yesBtn, 'click', () => {
+		const buttonContainer = $('div.buttons');
+		domNode.appendChild(buttonContainer);
+
+		const yesBtn = new Button(buttonContainer);
+		yesBtn.label = nls.localize('screenReaderDetectedExplanation.answerYes', "Yes");
+		this._toDispose.push(attachButtonStyler(yesBtn, this.themeService));
+		this._toDispose.push(yesBtn.onDidClick(e => {
 			this.configurationService.updateValue('editor.accessibilitySupport', 'on', ConfigurationTarget.USER);
 			this.contextViewService.hideContextView();
 		}));
-		domNode.appendChild(yesBtn);
 
-		const noBtn = $('div.button', {}, nls.localize('screenReaderDetectedExplanation.answerNo', "No"));
-		this._toDispose.push(addDisposableListener(noBtn, 'click', () => {
+		const noBtn = new Button(buttonContainer);
+		noBtn.label = nls.localize('screenReaderDetectedExplanation.answerNo', "No");
+		this._toDispose.push(attachButtonStyler(noBtn, this.themeService));
+		this._toDispose.push(noBtn.onDidClick(e => {
 			this.configurationService.updateValue('editor.accessibilitySupport', 'off', ConfigurationTarget.USER);
 			this.contextViewService.hideContextView();
 		}));
-		domNode.appendChild(noBtn);
 
 		const clear = $('div');
 		clear.style.clear = 'both';
@@ -1311,7 +1317,7 @@ class ScreenReaderDetectedExplanation {
 		this._toDispose.push(attachStylerCallback(this.themeService, { widgetShadow, editorWidgetBackground }, colors => {
 			domNode.style.backgroundColor = colors.editorWidgetBackground;
 			if (colors.widgetShadow) {
-				domNode.style.boxShadow = `0 2px 8px ${colors.widgetShadow}`;
+				domNode.style.boxShadow = `0 5px 8px ${colors.widgetShadow}`;
 			}
 		}));
 
diff --git a/src/vs/workbench/browser/parts/editor/media/editorGroupsControl.css b/src/vs/workbench/browser/parts/editor/media/editorGroupsControl.css
index de949651215..f1f07ec9b79 100644
--- a/src/vs/workbench/browser/parts/editor/media/editorGroupsControl.css
+++ b/src/vs/workbench/browser/parts/editor/media/editorGroupsControl.css
@@ -7,6 +7,11 @@
 	display: none; /* hide sashes while dragging editors around */
 }
 
+.monaco-workbench > .editor .one-editor-silo.centered .editor-container {
+	border-style: none solid;
+	border-width: 0px 1px;
+}
+
 #monaco-workbench-editor-move-overlay,
 #monaco-workbench-editor-drop-overlay {
 	position: absolute;
@@ -84,4 +89,4 @@
 
 .monaco-workbench > .editor > .content > .one-editor-silo > .container > .editor-container {
 	height: calc(100% - 35px); /* Editor is below editor title */
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/browser/parts/editor/media/editorstatus.css b/src/vs/workbench/browser/parts/editor/media/editorstatus.css
index 9029f71eac7..31eb63c93e7 100644
--- a/src/vs/workbench/browser/parts/editor/media/editorstatus.css
+++ b/src/vs/workbench/browser/parts/editor/media/editorstatus.css
@@ -35,7 +35,6 @@
 	position: absolute;
 	top: 0;
 	right: 0;
-	margin: .5em 0 0;
 	padding: .5em;
 	width: 22px;
 	height: 22px;
@@ -56,20 +55,18 @@
 
 .monaco-shell .screen-reader-detected-explanation p.question {
 	font-size: 1.4em;
-	font-weight: bold;
 }
 
-.monaco-shell .screen-reader-detected-explanation .button {
-	color: white;
-	border: none;
-	cursor: pointer;
-	background-color: #007ACC;
+.monaco-shell .screen-reader-detected-explanation .buttons {
+	display: flex;
+}
+
+.monaco-shell .screen-reader-detected-explanation .buttons a {
+	font-size: 13px;
 	padding-left: 12px;
 	padding-right: 12px;
-	border: 4px solid #007ACC;
-	border-radius: 4px;
-	float: left;
 	margin-right: 5px;
+	max-width: fit-content;
 }
 
 .monaco-shell.vs .screen-reader-detected-explanation .cancel {
diff --git a/src/vs/workbench/browser/parts/editor/media/resourceviewer.css b/src/vs/workbench/browser/parts/editor/media/resourceviewer.css
index 54dac885b18..6f4e21c6ef5 100644
--- a/src/vs/workbench/browser/parts/editor/media/resourceviewer.css
+++ b/src/vs/workbench/browser/parts/editor/media/resourceviewer.css
@@ -13,7 +13,7 @@
 }
 
 .monaco-resource-viewer.image {
-	padding: 10px 10px 0 10px;
+	padding: 0;
 	background-position: 0 0, 8px 8px;
 	background-size: 16px 16px;
 	display: flex;
@@ -37,8 +37,8 @@
 }
 
 .monaco-resource-viewer img.scale-to-fit {
-	max-width: 100%;
-	max-height: 100%;
+	max-width: calc(100% - 20px);
+	max-height: calc(100% - 20px);
 	object-fit: contain;
 }
 
diff --git a/src/vs/workbench/browser/parts/editor/resourceViewer.ts b/src/vs/workbench/browser/parts/editor/resourceViewer.ts
index 363eccbb995..8daf9d05d72 100644
--- a/src/vs/workbench/browser/parts/editor/resourceViewer.ts
+++ b/src/vs/workbench/browser/parts/editor/resourceViewer.ts
@@ -322,7 +322,7 @@ class ZoomStatusbarItem extends Themable implements IStatusbarItem {
 }
 
 Registry.as<IStatusbarRegistry>(Extensions.Statusbar).registerStatusbarItem(
-	new StatusbarItemDescriptor(ZoomStatusbarItem, StatusbarAlignment.RIGHT, 101)
+	new StatusbarItemDescriptor(ZoomStatusbarItem, StatusbarAlignment.RIGHT, 101 /* to the left of editor status (100) */)
 );
 
 interface ImageState {
diff --git a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
index c0099581a82..fd414145054 100644
--- a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
@@ -21,7 +21,7 @@ import { IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/br
 
 export class SideBySideEditor extends BaseEditor {
 
-	public static ID: string = 'workbench.editor.sidebysideEditor';
+	public static readonly ID: string = 'workbench.editor.sidebysideEditor';
 
 	private dimension: Dimension;
 
diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
index 035c3f8d04c..225716404db 100644
--- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
@@ -23,7 +23,6 @@ import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IWorkbenchEditorService, DelegatingWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
@@ -43,6 +42,7 @@ import { Dimension } from 'vs/base/browser/builder';
 import { scheduleAtNextAnimationFrame } from 'vs/base/browser/dom';
 import { ResourcesDropHandler, fillResourceDataTransfers, LocalSelectionTransfer, DraggedEditorIdentifier } from 'vs/workbench/browser/dnd';
 import { Color } from 'vs/base/common/color';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 interface IEditorInputLabel {
 	name: string;
@@ -73,12 +73,12 @@ export class TabsTitleControl extends TitleControl {
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IKeybindingService keybindingService: IKeybindingService,
 		@ITelemetryService telemetryService: ITelemetryService,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@IMenuService menuService: IMenuService,
 		@IQuickOpenService quickOpenService: IQuickOpenService,
 		@IThemeService themeService: IThemeService
 	) {
-		super(contextMenuService, instantiationService, editorService, editorGroupService, contextKeyService, keybindingService, telemetryService, messageService, menuService, quickOpenService, themeService);
+		super(contextMenuService, instantiationService, editorService, editorGroupService, contextKeyService, keybindingService, telemetryService, notificationService, menuService, quickOpenService, themeService);
 
 		this.tabDisposeables = [];
 		this.editorLabels = [];
diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts
index 179956d9c07..13827bc1503 100644
--- a/src/vs/workbench/browser/parts/editor/textEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textEditor.ts
@@ -50,11 +50,11 @@ export abstract class BaseTextEditor extends BaseEditor {
 	constructor(
 		id: string,
 		@ITelemetryService telemetryService: ITelemetryService,
-		@IInstantiationService private _instantiationService: IInstantiationService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IStorageService private storageService: IStorageService,
-		@ITextResourceConfigurationService private _configurationService: ITextResourceConfigurationService,
+		@ITextResourceConfigurationService private readonly _configurationService: ITextResourceConfigurationService,
 		@IThemeService protected themeService: IThemeService,
-		@ITextFileService private _textFileService: ITextFileService,
+		@ITextFileService private readonly _textFileService: ITextFileService,
 		@IEditorGroupService protected editorGroupService: IEditorGroupService
 	) {
 		super(id, telemetryService, themeService);
diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts
index 2f2028aa133..e393a66d667 100644
--- a/src/vs/workbench/browser/parts/editor/titleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/titleControl.ts
@@ -21,7 +21,6 @@ import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -38,6 +37,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { Themable } from 'vs/workbench/common/theme';
 import { isDiffEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { Dimension } from 'vs/base/browser/builder';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export interface IToolbarActions {
 	primary: IAction[];
@@ -91,7 +91,7 @@ export abstract class TitleControl extends Themable implements ITitleAreaControl
 		@IContextKeyService protected contextKeyService: IContextKeyService,
 		@IKeybindingService protected keybindingService: IKeybindingService,
 		@ITelemetryService protected telemetryService: ITelemetryService,
-		@IMessageService protected messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IMenuService protected menuService: IMenuService,
 		@IQuickOpenService protected quickOpenService: IQuickOpenService,
 		@IThemeService protected themeService: IThemeService
@@ -224,7 +224,7 @@ export abstract class TitleControl extends Themable implements ITitleAreaControl
 
 			// Check for Error
 			if (e.error && !errors.isPromiseCanceledError(e.error)) {
-				this.messageService.show(Severity.Error, e.error);
+				this.notificationService.error(e.error);
 			}
 
 			// Log in telemetry
@@ -258,7 +258,7 @@ export abstract class TitleControl extends Themable implements ITitleAreaControl
 
 		// Check extensions
 		if (!actionItem) {
-			actionItem = createActionItem(action, this.keybindingService, this.messageService, this.contextMenuService);
+			actionItem = createActionItem(action, this.keybindingService, this.notificationService, this.contextMenuService);
 		}
 
 		return actionItem;
diff --git a/src/vs/workbench/browser/parts/notifications/media/close-inverse.svg b/src/vs/workbench/browser/parts/notifications/media/close-inverse.svg
new file mode 100644
index 00000000000..751e89b3b02
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/media/close-inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="3 3 16 16" enable-background="new 3 3 16 16"><polygon fill="#e8e8e8" points="12.597,11.042 15.4,13.845 13.844,15.4 11.042,12.598 8.239,15.4 6.683,13.845 9.485,11.042 6.683,8.239 8.238,6.683 11.042,9.486 13.845,6.683 15.4,8.239"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/media/close.svg b/src/vs/workbench/browser/parts/notifications/media/close.svg
new file mode 100644
index 00000000000..fde34404d4e
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/media/close.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="3 3 16 16" enable-background="new 3 3 16 16"><polygon fill="#424242" points="12.597,11.042 15.4,13.845 13.844,15.4 11.042,12.598 8.239,15.4 6.683,13.845 9.485,11.042 6.683,8.239 8.238,6.683 11.042,9.486 13.845,6.683 15.4,8.239"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/media/configure-inverse.svg b/src/vs/workbench/browser/parts/notifications/media/configure-inverse.svg
new file mode 100644
index 00000000000..61baaea2b8b
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/media/configure-inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#C5C5C5"><path d="M12.714 9.603c-.07.207-.15.407-.246.601l1.017 2.139c-.335.424-.718.807-1.142 1.143l-2.14-1.018c-.193.097-.394.176-.601.247l-.795 2.235c-.265.03-.534.05-.807.05-.272 0-.541-.02-.806-.05l-.795-2.235c-.207-.071-.408-.15-.602-.247l-2.14 1.017c-.424-.336-.807-.719-1.143-1.143l1.017-2.139c-.094-.193-.175-.393-.245-.6l-2.236-.796c-.03-.265-.05-.534-.05-.807s.02-.542.05-.807l2.236-.795c.07-.207.15-.407.246-.601l-1.016-2.139c.336-.423.719-.807 1.143-1.142l2.14 1.017c.193-.096.394-.176.602-.247l.793-2.236c.265-.03.534-.05.806-.05.273 0 .542.02.808.05l.795 2.236c.207.07.407.15.601.246l2.14-1.017c.424.335.807.719 1.142 1.142l-1.017 2.139c.096.194.176.394.246.601l2.236.795c.029.266.049.535.049.808s-.02.542-.05.807l-2.236.796zm-4.714-4.603c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3z"/><circle cx="8" cy="8" r="1.5"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/media/configure.svg b/src/vs/workbench/browser/parts/notifications/media/configure.svg
new file mode 100644
index 00000000000..3dec2ba50fd
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/media/configure.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#424242"><path d="M12.714 9.603c-.07.207-.15.407-.246.601l1.017 2.139c-.335.424-.718.807-1.142 1.143l-2.14-1.018c-.193.097-.394.176-.601.247l-.795 2.235c-.265.03-.534.05-.807.05-.272 0-.541-.02-.806-.05l-.795-2.235c-.207-.071-.408-.15-.602-.247l-2.14 1.017c-.424-.336-.807-.719-1.143-1.143l1.017-2.139c-.094-.193-.175-.393-.245-.6l-2.236-.796c-.03-.265-.05-.534-.05-.807s.02-.542.05-.807l2.236-.795c.07-.207.15-.407.246-.601l-1.016-2.139c.336-.423.719-.807 1.143-1.142l2.14 1.017c.193-.096.394-.176.602-.247l.793-2.236c.265-.03.534-.05.806-.05.273 0 .542.02.808.05l.795 2.236c.207.07.407.15.601.246l2.14-1.017c.424.335.807.719 1.142 1.142l-1.017 2.139c.096.194.176.394.246.601l2.236.795c.029.266.049.535.049.808s-.02.542-.05.807l-2.236.796zm-4.714-4.603c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3z"/><circle cx="8" cy="8" r="1.5"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/media/down-inverse.svg b/src/vs/workbench/browser/parts/notifications/media/down-inverse.svg
new file mode 100755
index 00000000000..f914c8bff14
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/media/down-inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#2d2d30;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#c5c5c5;}</style></defs><title>CollapseChevronDown_md_16x</title><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/><path class="icon-vs-out" d="M15.444,6.061,8,13.5.556,6.061,3.03,3.586,8,8.556l4.97-4.97Z" style="display: none;"/><path class="icon-vs-bg" d="M14.03,6.061,8,12.091,1.97,6.061,3.03,5,8,9.97,12.97,5Z"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/media/down.svg b/src/vs/workbench/browser/parts/notifications/media/down.svg
new file mode 100755
index 00000000000..dc21a6633d1
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/media/down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#424242;}</style></defs><title>CollapseChevronDown_md_16x</title><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/><path class="icon-vs-out" d="M15.444,6.061,8,13.5.556,6.061,3.03,3.586,8,8.556l4.97-4.97Z" style="display: none;"/><path class="icon-vs-bg" d="M14.03,6.061,8,12.091,1.97,6.061,3.03,5,8,9.97,12.97,5Z"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/media/error-inverse.svg b/src/vs/workbench/browser/parts/notifications/media/error-inverse.svg
new file mode 100644
index 00000000000..3c852a7ffde
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/media/error-inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" height="16" width="16"><circle cx="8" cy="8" r="6" fill="#1E1E1E"/><path d="M8 3C5.238 3 3 5.238 3 8s2.238 5 5 5 5-2.238 5-5-2.238-5-5-5zm3 7l-1 1-2-2-2 2-1-1 2-2.027L5 6l1-1 2 2 2-2 1 1-2 1.973L11 10z" fill="#F48771"/><path fill="#252526" d="M11 6l-1-1-2 2-2-2-1 1 2 1.973L5 10l1 1 2-2 2 2 1-1-2-2.027z"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/media/error.svg b/src/vs/workbench/browser/parts/notifications/media/error.svg
new file mode 100644
index 00000000000..fa7d2277ffd
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/media/error.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" height="16" width="16"><circle cx="8" cy="8" r="6" fill="#F6F6F6"/><path d="M8 3C5.238 3 3 5.238 3 8s2.238 5 5 5 5-2.238 5-5-2.238-5-5-5zm3 7l-1 1-2-2-2 2-1-1 2-2.027L5 6l1-1 2 2 2-2 1 1-2 1.973L11 10z" fill="#E51400"/><path fill="#fff" d="M11 6l-1-1-2 2-2-2-1 1 2 1.973L5 10l1 1 2-2 2 2 1-1-2-2.027z"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/media/info-inverse.svg b/src/vs/workbench/browser/parts/notifications/media/info-inverse.svg
new file mode 100644
index 00000000000..d38c363e0e4
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/media/info-inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16" height="16" width="16"><circle cx="8.5" cy="7.5" r="5.5" fill="#1E1E1E"/><path d="M8.5 3C6.015 3 4 5.015 4 7.5S6.015 12 8.5 12 13 9.985 13 7.5 10.985 3 8.5 3zm.5 8H8V6h1v5zm0-6H8V4h1v1z" fill="#1BA1E2"/><path d="M8 6h1v5H8V6zm0-2v1h1V4H8z" fill="#252526"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/media/info.svg b/src/vs/workbench/browser/parts/notifications/media/info.svg
new file mode 100644
index 00000000000..6e2e22f67bc
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/media/info.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16" height="16" width="16"><circle cx="8.5" cy="7.5" r="5.5" fill="#F6F6F6"/><path d="M8.5 3C6.015 3 4 5.015 4 7.5S6.015 12 8.5 12 13 9.985 13 7.5 10.985 3 8.5 3zm.5 8H8V6h1v5zm0-6H8V4h1v1z" fill="#1BA1E2"/><path d="M8 6h1v5H8V6zm0-2v1h1V4H8z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/media/notificationsActions.css b/src/vs/workbench/browser/parts/notifications/media/notificationsActions.css
new file mode 100644
index 00000000000..33415792819
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/media/notificationsActions.css
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.vs .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .clear-notification-action {
+	background-image: url('close.svg');
+}
+
+.vs-dark .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .clear-notification-action,
+.hc-black .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .clear-notification-action {
+	background-image: url('close-inverse.svg');
+}
+
+.vs .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .expand-notification-action {
+	background-image: url('down.svg');
+}
+
+.vs-dark .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .expand-notification-action,
+.hc-black .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .expand-notification-action {
+	background-image: url('down-inverse.svg');
+}
+
+.vs .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .collapse-notification-action {
+	background-image: url('up.svg');
+}
+
+.vs-dark .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .collapse-notification-action,
+.hc-black .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .collapse-notification-action {
+	background-image: url('up-inverse.svg');
+}
+
+.vs .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .configure-notification-action {
+	background-image: url('configure.svg');
+}
+
+.vs-dark .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .configure-notification-action,
+.hc-black .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .configure-notification-action {
+	background-image: url('configure-inverse.svg');
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css b/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css
new file mode 100644
index 00000000000..066804bea77
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css
@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-workbench > .notifications-center {
+	position: absolute;
+	z-index: 1000;
+	right: 8px;
+	bottom: 30px; /* above status bar */
+	display: none;
+	overflow: hidden;
+}
+
+.monaco-workbench.nostatusbar > .notifications-center {
+	right: 12px;
+	bottom: 12px;
+}
+
+.monaco-workbench > .notifications-center.visible {
+	display: block;
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/media/notificationsList.css b/src/vs/workbench/browser/parts/notifications/media/notificationsList.css
new file mode 100644
index 00000000000..fd017ca60e6
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/media/notificationsList.css
@@ -0,0 +1,139 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/** Notification: Container */
+
+.monaco-workbench .notifications-list-container .notification-list-item {
+	display: flex;
+	flex-direction: column;
+	flex-direction: column-reverse; /* the details row appears first in order for better keyboard access to notification buttons */
+	padding: 10px 5px;
+	height: 100%;
+	box-sizing: border-box;
+}
+
+/** Notification: Main Row */
+
+.monaco-workbench .notifications-list-container .notification-list-item > .notification-list-item-main-row {
+	display: flex;
+	flex-grow: 1;
+}
+
+/** Notification: Icon */
+
+.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon {
+	flex: 0 0 16px;
+	height: 22px;
+	margin-right: 4px;
+	margin-left: 4px;
+	background-position: center;
+	background-repeat: no-repeat;
+	background-size: cover;
+}
+
+.vs .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon.icon-info {
+	background-image: url('info.svg');
+}
+
+.vs .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon.icon-warning {
+	background-image: url('warning.svg');
+}
+
+.vs .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon.icon-error {
+	background-image: url('error.svg');
+}
+
+.vs-dark .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon.icon-info,
+.hc-black .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon.icon-info {
+	background-image: url('info-inverse.svg');
+}
+
+.vs-dark .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon.icon-warning,
+.hc-black .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon.icon-warning {
+	background-image: url('warning-inverse.svg');
+}
+
+.vs-dark .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon.icon-error,
+.hc-black .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon.icon-error {
+	background-image: url('error-inverse.svg');
+}
+
+/** Notification: Message */
+
+.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-message {
+	line-height: 22px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	flex: 1; /* let the message always grow */
+}
+
+.monaco-workbench .notifications-list-container .notification-list-item.expanded .notification-list-item-message {
+	white-space: normal;
+}
+
+/** Notification: Toolbar Container */
+
+.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container {
+	display: none;
+}
+
+.monaco-workbench .notifications-list-container .notification-list-item:hover .notification-list-item-toolbar-container,
+.monaco-workbench .notifications-list-container .monaco-list-row.focused .notification-list-item .notification-list-item-toolbar-container,
+.monaco-workbench .notifications-list-container .notification-list-item.expanded .notification-list-item-toolbar-container {
+	display: block;
+}
+
+.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .action-label {
+	flex: 0 0 16px;
+	display: block;
+	width: 16px;
+	height: 22px;
+	margin-right: 4px;
+	margin-left: 4px;
+	background-position: center;
+	background-repeat: no-repeat;
+}
+
+/** Notification: Details Row */
+
+.monaco-workbench .notifications-list-container .notification-list-item > .notification-list-item-details-row {
+	display: none;
+	align-items: center;
+	padding: 0 5px;
+	overflow: hidden; /* details row should never overflow */
+}
+
+.monaco-workbench .notifications-list-container .notification-list-item.expanded > .notification-list-item-details-row {
+	display: flex;
+}
+
+/** Notification: Source */
+
+.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-source {
+	opacity: 0.7;
+	flex: 1;
+	font-size: 12px;
+	overflow: hidden; /* always give away space to buttons container */
+	text-overflow: ellipsis;
+}
+
+/** Notification: Buttons */
+
+.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container .monaco-button {
+	max-width: fit-content;
+	padding: 5px 10px;
+	font-size: 12px;
+}
+
+.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container .monaco-button {
+	margin-left: 10px;
+}
+
+/** Notification: Progress */
+
+.monaco-workbench .notifications-list-container .progress-bit {
+	height: 2px;
+	bottom: 0;
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css b/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css
new file mode 100644
index 00000000000..80cb61d0eb4
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-workbench > .notifications-toasts {
+	position: absolute;
+	z-index: 1000;
+	right: 3px;
+	bottom: 28px; /* above status bar */
+	display: none;
+	overflow: hidden;
+}
+
+.monaco-workbench.nostatusbar > .notifications-toasts {
+	right: 12px;
+	bottom: 12px;
+}
+
+.monaco-workbench > .notifications-toasts.visible {
+	display: flex;
+	flex-direction: column-reverse;
+}
+
+.monaco-workbench > .notifications-toasts .notification-toast {
+	margin: 5px; /* enables separation and drop shadows around toasts */
+	position: relative;
+
+	-webkit-transition:	left 300ms ease-in;
+	-ms-transition:		left 300ms ease-in;
+	-moz-transition:	left 300ms ease-in;
+	-khtml-transition:	left 300ms ease-in;
+	-o-transition:		left 300ms ease-in;
+	transition:			left 300ms ease-in;
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/media/up-inverse.svg b/src/vs/workbench/browser/parts/notifications/media/up-inverse.svg
new file mode 100755
index 00000000000..bf7107e6785
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/media/up-inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#2d2d30;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#c5c5c5;}</style></defs><title>CollapseChevronUp_md_16x</title><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/><path class="icon-vs-out" d="M15.444,9.939,12.97,12.414,8,7.444l-4.97,4.97L.556,9.939,8,2.5Z" style="display: none;"/><path class="icon-vs-bg" d="M14.03,9.939,12.97,11,8,6.03,3.03,11,1.97,9.939,8,3.909Z"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/media/up.svg b/src/vs/workbench/browser/parts/notifications/media/up.svg
new file mode 100755
index 00000000000..5311bb787ac
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/media/up.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#424242;}</style></defs><title>CollapseChevronUp_md_16x</title><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/><path class="icon-vs-out" d="M15.444,9.939,12.97,12.414,8,7.444l-4.97,4.97L.556,9.939,8,2.5Z" style="display: none;"/><path class="icon-vs-bg" d="M14.03,9.939,12.97,11,8,6.03,3.03,11,1.97,9.939,8,3.909Z"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/media/warning-inverse.svg b/src/vs/workbench/browser/parts/notifications/media/warning-inverse.svg
new file mode 100644
index 00000000000..df44e61b326
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/media/warning-inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" height="16" width="16"><path fill="#1E1E1E" d="M7.5 2L2 12l2 2h9l2-2L9.5 2z"/><path d="M9 3H8l-4.5 9 1 1h8l1-1L9 3zm0 9H8v-1h1v1zm0-2H8V6h1v4z" fill="#fc0"/><path d="M9 10H8V6h1v4zm0 1H8v1h1v-1z"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/media/warning.svg b/src/vs/workbench/browser/parts/notifications/media/warning.svg
new file mode 100644
index 00000000000..f4e2a84b0af
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/media/warning.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16" height="16" width="16"><path fill="#F6F6F6" d="M7.5 2L2 12l2 2h9l2-2L9.5 2z"/><path d="M9 3H8l-4.5 9 1 1h8l1-1L9 3zm0 9H8v-1h1v1zm0-2H8V6h1v4z" fill="#fc0"/><path d="M9 10H8V6h1v4zm0 1H8v1h1v-1z"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsActions.ts b/src/vs/workbench/browser/parts/notifications/notificationsActions.ts
new file mode 100644
index 00000000000..49e6331ab52
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/notificationsActions.ts
@@ -0,0 +1,120 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import 'vs/css!./media/notificationsActions';
+import { INotificationViewItem } from 'vs/workbench/common/notifications';
+import { localize } from 'vs/nls';
+import { Action, IAction, ActionRunner } from 'vs/base/common/actions';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { CLEAR_NOTIFICATION, EXPAND_NOTIFICATION, COLLAPSE_NOTIFICATION } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+
+export class ClearNotificationAction extends Action {
+
+	public static readonly ID = CLEAR_NOTIFICATION;
+	public static readonly LABEL = localize('closeNotification', "Close Notification");
+
+	constructor(
+		id: string,
+		label: string,
+		@ICommandService private commandService: ICommandService
+	) {
+		super(id, label, 'clear-notification-action');
+	}
+
+	public run(notification: INotificationViewItem): TPromise<any> {
+		this.commandService.executeCommand(CLEAR_NOTIFICATION, notification);
+
+		return TPromise.as(void 0);
+	}
+}
+
+export class ExpandNotificationAction extends Action {
+
+	public static readonly ID = EXPAND_NOTIFICATION;
+	public static readonly LABEL = localize('expandNotification', "Expand Notification");
+
+	constructor(
+		id: string,
+		label: string,
+		@ICommandService private commandService: ICommandService
+	) {
+		super(id, label, 'expand-notification-action');
+	}
+
+	public run(notification: INotificationViewItem): TPromise<any> {
+		this.commandService.executeCommand(EXPAND_NOTIFICATION, notification);
+
+		return TPromise.as(void 0);
+	}
+}
+
+export class CollapseNotificationAction extends Action {
+
+	public static readonly ID = COLLAPSE_NOTIFICATION;
+	public static readonly LABEL = localize('collapseNotification', "Collapse Notification");
+
+	constructor(
+		id: string,
+		label: string,
+		@ICommandService private commandService: ICommandService
+	) {
+		super(id, label, 'collapse-notification-action');
+	}
+
+	public run(notification: INotificationViewItem): TPromise<any> {
+		this.commandService.executeCommand(COLLAPSE_NOTIFICATION, notification);
+
+		return TPromise.as(void 0);
+	}
+}
+
+export class ConfigureNotificationAction extends Action {
+
+	public static readonly ID = 'workbench.action.configureNotification';
+	public static readonly LABEL = localize('configureNotification', "Configure Notification");
+
+	constructor(
+		id: string,
+		label: string,
+		private _configurationActions: IAction[]
+	) {
+		super(id, label, 'configure-notification-action');
+	}
+
+	public get configurationActions(): IAction[] {
+		return this._configurationActions;
+	}
+}
+
+export class NotificationActionRunner extends ActionRunner {
+
+	constructor(
+		@ITelemetryService private telemetryService: ITelemetryService,
+		@INotificationService private notificationService: INotificationService
+	) {
+		super();
+	}
+
+	protected runAction(action: IAction, context: INotificationViewItem): TPromise<any> {
+
+		/* __GDPR__
+			"workbenchActionExecuted" : {
+				"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
+		this.telemetryService.publicLog('workbenchActionExecuted', { id: action.id, from: 'message' });
+
+		// Run and make sure to notify on any error again
+		super.runAction(action, context).done(null, error => this.notificationService.error(error));
+
+		return TPromise.as(void 0);
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsAlerts.ts b/src/vs/workbench/browser/parts/notifications/notificationsAlerts.ts
new file mode 100644
index 00000000000..39dc686ff6f
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/notificationsAlerts.ts
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { alert } from 'vs/base/browser/ui/aria/aria';
+import { localize } from 'vs/nls';
+import { INotificationViewItem, INotificationsModel, NotificationChangeType, INotificationChangeEvent } from 'vs/workbench/common/notifications';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { toErrorMessage } from 'vs/base/common/errorMessage';
+import { Severity } from 'vs/platform/notification/common/notification';
+
+export class NotificationsAlerts {
+	private toDispose: IDisposable[];
+
+	constructor(private model: INotificationsModel) {
+		this.toDispose = [];
+
+		// Alert initial notifications if any
+		model.notifications.forEach(n => this.ariaAlert(n));
+
+		this.registerListeners();
+	}
+
+	private registerListeners(): void {
+		this.toDispose.push(this.model.onDidNotificationChange(e => this.onDidNotificationChange(e)));
+	}
+
+	private onDidNotificationChange(e: INotificationChangeEvent): void {
+		if (e.kind === NotificationChangeType.ADD) {
+
+			// ARIA alert for screen readers
+			this.ariaAlert(e.item);
+
+			// Always log errors to console with full details
+			if (e.item.severity === Severity.Error) {
+				console.error(toErrorMessage(e.item.message.value, true));
+			}
+		}
+	}
+
+	private ariaAlert(notifiation: INotificationViewItem): void {
+		let alertText: string;
+		if (notifiation.severity === Severity.Error) {
+			alertText = localize('alertErrorMessage', "Error: {0}", notifiation.message.value);
+		} else if (notifiation.severity === Severity.Warning) {
+			alertText = localize('alertWarningMessage', "Warning: {0}", notifiation.message.value);
+		} else {
+			alertText = localize('alertInfoMessage', "Info: {0}", notifiation.message.value);
+		}
+
+		alert(alertText);
+	}
+
+	public dispose(): void {
+		this.toDispose = dispose(this.toDispose);
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
new file mode 100644
index 00000000000..428f1158a71
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
@@ -0,0 +1,224 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import 'vs/css!./media/notificationsCenter';
+import { Themable, NOTIFICATIONS_BORDER } from 'vs/workbench/common/theme';
+import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
+import { INotificationsModel, INotificationChangeEvent, NotificationChangeType } from 'vs/workbench/common/notifications';
+import { Dimension } from 'vs/base/browser/builder';
+import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
+import Event, { Emitter } from 'vs/base/common/event';
+import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { NotificationsCenterVisibleContext } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
+import { NotificationsList } from 'vs/workbench/browser/parts/notifications/notificationsList';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { addClass, removeClass, isAncestor } from 'vs/base/browser/dom';
+import { widgetShadow } from 'vs/platform/theme/common/colorRegistry';
+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { localize } from 'vs/nls';
+
+export class NotificationsCenter extends Themable {
+
+	private static MAX_DIMENSIONS = new Dimension(600, 400);
+
+	private notificationsCenterContainer: HTMLElement;
+	private notificationsList: NotificationsList;
+	private _isVisible: boolean;
+	private workbenchDimensions: Dimension;
+	private _onDidChangeVisibility: Emitter<void>;
+	private notificationsCenterVisibleContextKey: IContextKey<boolean>;
+
+	constructor(
+		private container: HTMLElement,
+		private model: INotificationsModel,
+		@IThemeService themeService: IThemeService,
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IPartService private partService: IPartService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IWorkbenchEditorService private editorService: IWorkbenchEditorService
+	) {
+		super(themeService);
+
+		this._onDidChangeVisibility = new Emitter<void>();
+		this.toUnbind.push(this._onDidChangeVisibility);
+
+		this.notificationsCenterVisibleContextKey = NotificationsCenterVisibleContext.bindTo(contextKeyService);
+
+		this.registerListeners();
+	}
+
+	private registerListeners(): void {
+		this.toUnbind.push(this.model.onDidNotificationChange(e => this.onDidNotificationChange(e)));
+	}
+
+	public get onDidChangeVisibility(): Event<void> {
+		return this._onDidChangeVisibility.event;
+	}
+
+	public get isVisible(): boolean {
+		return this._isVisible;
+	}
+
+	public show(): void {
+		if (this._isVisible) {
+			this.notificationsList.show(true /* focus */);
+
+			return; // already visible
+		}
+
+		// Lazily create if showing for the first time
+		if (!this.notificationsCenterContainer) {
+			this.notificationsCenterContainer = document.createElement('div');
+			addClass(this.notificationsCenterContainer, 'notifications-center');
+
+			this.notificationsList = this.instantiationService.createInstance(NotificationsList, this.notificationsCenterContainer, { ariaLabel: localize('notificationsList', "Notifications List") });
+
+			this.container.appendChild(this.notificationsCenterContainer);
+		}
+
+		// Make visible
+		this._isVisible = true;
+		addClass(this.notificationsCenterContainer, 'visible');
+		this.notificationsList.show(true /* focus */);
+
+		// Layout
+		this.layout(this.workbenchDimensions);
+
+		// Show all notifications that are present now
+		this.notificationsList.updateNotificationsList(0, 0, this.model.notifications);
+
+		// Theming
+		this.updateStyles();
+
+		// Context Key
+		this.notificationsCenterVisibleContextKey.set(true);
+
+		// Event
+		this._onDidChangeVisibility.fire();
+	}
+
+	private onDidNotificationChange(e: INotificationChangeEvent): void {
+		if (!this._isVisible) {
+			return; // only if visible
+		}
+
+		let focusEditor = false;
+
+		// Update notifications list based on event
+		switch (e.kind) {
+			case NotificationChangeType.ADD:
+				this.notificationsList.updateNotificationsList(e.index, 0, [e.item]);
+				break;
+			case NotificationChangeType.CHANGE:
+				this.notificationsList.updateNotificationsList(e.index, 1, [e.item]);
+				break;
+			case NotificationChangeType.REMOVE:
+				focusEditor = isAncestor(document.activeElement, this.notificationsCenterContainer);
+				this.notificationsList.updateNotificationsList(e.index, 1);
+				break;
+		}
+
+		// Hide if no more notifications to show
+		if (this.model.notifications.length === 0) {
+			this.hide();
+
+			// Restore focus to editor if we had focus
+			if (focusEditor) {
+				this.focusEditor();
+			}
+		}
+	}
+
+	private focusEditor(): void {
+		const editor = this.editorService.getActiveEditor();
+		if (editor) {
+			editor.focus();
+		}
+	}
+
+	public hide(): void {
+		if (!this._isVisible || !this.notificationsCenterContainer) {
+			return; // already hidden
+		}
+
+		const focusEditor = isAncestor(document.activeElement, this.notificationsCenterContainer);
+
+		// Hide
+		this._isVisible = false;
+		removeClass(this.notificationsCenterContainer, 'visible');
+		this.notificationsList.hide();
+
+		// Context Key
+		this.notificationsCenterVisibleContextKey.set(false);
+
+		// Event
+		this._onDidChangeVisibility.fire();
+
+		if (focusEditor) {
+			this.focusEditor();
+		}
+	}
+
+	protected updateStyles(): void {
+		if (this.notificationsCenterContainer) {
+			const widgetShadowColor = this.getColor(widgetShadow);
+			this.notificationsCenterContainer.style.boxShadow = widgetShadowColor ? `0 5px 8px ${widgetShadowColor}` : null;
+		}
+	}
+
+	public layout(dimension: Dimension): void {
+		this.workbenchDimensions = dimension;
+
+		if (this._isVisible && this.notificationsCenterContainer) {
+			let maxWidth = NotificationsCenter.MAX_DIMENSIONS.width;
+			let maxHeight = NotificationsCenter.MAX_DIMENSIONS.height;
+
+			let availableWidth = maxWidth;
+			let availableHeight = maxHeight;
+
+			if (this.workbenchDimensions) {
+
+				// Make sure notifications are not exceding available width
+				availableWidth = this.workbenchDimensions.width;
+				availableWidth -= (2 * 8); // adjust for paddings left and right
+
+				// Make sure notifications are not exceeding available height
+				availableHeight = this.workbenchDimensions.height;
+				if (this.partService.isVisible(Parts.STATUSBAR_PART)) {
+					availableHeight -= 22; // adjust for status bar
+				}
+
+				if (this.partService.isVisible(Parts.TITLEBAR_PART)) {
+					availableHeight -= 22; // adjust for title bar
+				}
+
+				availableHeight -= (2 * 12); // adjust for paddings top and bottom
+			}
+
+			// Apply to list
+			this.notificationsList.layout(Math.min(maxWidth, availableWidth), Math.min(maxHeight, availableHeight));
+		}
+	}
+
+	public clearAll(): void {
+
+		// Hide notifications center first
+		this.hide();
+
+		// Dispose all
+		while (this.model.notifications.length) {
+			this.model.notifications[0].dispose();
+		}
+	}
+}
+
+registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
+	const notificationBorderColor = theme.getColor(NOTIFICATIONS_BORDER);
+	if (notificationBorderColor) {
+		collector.addRule(`.monaco-workbench > .notifications-center .notifications-list-container .notification-list-item { border-bottom: 1px solid ${notificationBorderColor}; }`);
+	}
+});
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts b/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
new file mode 100644
index 00000000000..4fb1eff462d
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
@@ -0,0 +1,195 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+import { RawContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+import { INotificationViewItem, isNotificationViewItem } from 'vs/workbench/common/notifications';
+import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
+import { localize } from 'vs/nls';
+import { IListService, WorkbenchList } from 'vs/platform/list/browser/listService';
+
+// Center
+export const SHOW_NOTIFICATIONS_CENTER_COMMAND_ID = 'notifications.showList';
+export const HIDE_NOTIFICATIONS_CENTER_COMMAND_ID = 'notifications.hideList';
+export const TOGGLE_NOTIFICATIONS_CENTER_COMMAND_ID = 'notifications.toggleList';
+
+// Toasts
+export const HIDE_NOTIFICATION_TOAST = 'notification.hideToasts';
+export const FOCUS_NOTIFICATION_TOAST = 'notification.focusToasts';
+export const NEXT_NOTIFICATION_TOAST = 'notification.focusNextToast';
+export const PREVIOUS_NOTIFICATION_TOAST = 'notification.focusPreviousToast';
+
+// Notification
+export const COLLAPSE_NOTIFICATION = 'notification.collapse';
+export const EXPAND_NOTIFICATION = 'notification.expand';
+export const TOGGLE_NOTIFICATION = 'notification.toggle';
+export const CLEAR_NOTIFICATION = 'notification.clear';
+export const CLEAR_ALL_NOTIFICATIONS = 'notifications.clearAll';
+
+const notificationFocusedId = 'notificationFocus';
+export const NotificationFocusedContext = new RawContextKey<boolean>(notificationFocusedId, true);
+
+const notificationsCenterVisibleId = 'notificationsCenterVisible';
+export const NotificationsCenterVisibleContext = new RawContextKey<boolean>(notificationsCenterVisibleId, false);
+
+const notificationsToastsVisibleId = 'notificationsToastsVisible';
+export const NotificationsToastsVisibleContext = new RawContextKey<boolean>(notificationsToastsVisibleId, false);
+
+export interface INotificationsCenterController {
+	readonly isVisible: boolean;
+
+	show(): void;
+	hide(): void;
+
+	clearAll(): void;
+}
+
+export interface INotificationsToastController {
+	focus(): void;
+	focusNext(): void;
+	focusPrevious(): void;
+
+	hide(): void;
+}
+
+export function registerNotificationCommands(center: INotificationsCenterController, toasts: INotificationsToastController): void {
+
+	function getNotificationFromContext(listService: IListService, context?: any): INotificationViewItem {
+		if (isNotificationViewItem(context)) {
+			return context;
+		}
+
+		const list = listService.lastFocusedList;
+		if (list instanceof WorkbenchList) {
+			const focusedElement = list.getFocusedElements()[0];
+			if (isNotificationViewItem(focusedElement)) {
+				return focusedElement;
+			}
+		}
+
+		return void 0;
+	}
+
+	// Show Notifications Cneter
+	CommandsRegistry.registerCommand(SHOW_NOTIFICATIONS_CENTER_COMMAND_ID, () => center.show());
+
+	// Hide Notifications Center
+	KeybindingsRegistry.registerCommandAndKeybindingRule({
+		id: HIDE_NOTIFICATIONS_CENTER_COMMAND_ID,
+		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
+		when: NotificationsCenterVisibleContext,
+		primary: KeyCode.Escape,
+		handler: accessor => center.hide()
+	});
+
+	// Toggle Notifications Center
+	CommandsRegistry.registerCommand(TOGGLE_NOTIFICATIONS_CENTER_COMMAND_ID, accessor => center.isVisible ? center.hide() : center.show());
+
+	// Clear Notification
+	KeybindingsRegistry.registerCommandAndKeybindingRule({
+		id: CLEAR_NOTIFICATION,
+		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		when: NotificationFocusedContext,
+		primary: KeyCode.Delete,
+		mac: {
+			primary: KeyMod.CtrlCmd | KeyCode.Backspace
+		},
+		handler: (accessor, args?: any) => {
+			const notification = getNotificationFromContext(accessor.get(IListService), args);
+			if (notification) {
+				notification.dispose();
+			}
+		}
+	});
+
+	// Expand Notification
+	KeybindingsRegistry.registerCommandAndKeybindingRule({
+		id: EXPAND_NOTIFICATION,
+		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		when: NotificationFocusedContext,
+		primary: KeyCode.RightArrow,
+		handler: (accessor, args?: any) => {
+			const notification = getNotificationFromContext(accessor.get(IListService), args);
+			if (notification) {
+				notification.expand();
+			}
+		}
+	});
+
+	// Collapse Notification
+	KeybindingsRegistry.registerCommandAndKeybindingRule({
+		id: COLLAPSE_NOTIFICATION,
+		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		when: NotificationFocusedContext,
+		primary: KeyCode.LeftArrow,
+		handler: (accessor, args?: any) => {
+			const notification = getNotificationFromContext(accessor.get(IListService), args);
+			if (notification) {
+				notification.collapse();
+			}
+		}
+	});
+
+	// Toggle Notification
+	KeybindingsRegistry.registerCommandAndKeybindingRule({
+		id: TOGGLE_NOTIFICATION,
+		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		when: NotificationFocusedContext,
+		primary: KeyCode.Space,
+		handler: accessor => {
+			const notification = getNotificationFromContext(accessor.get(IListService));
+			if (notification) {
+				notification.toggle();
+			}
+		}
+	});
+
+	// Hide Toasts
+	KeybindingsRegistry.registerCommandAndKeybindingRule({
+		id: HIDE_NOTIFICATION_TOAST,
+		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
+		when: NotificationsToastsVisibleContext,
+		primary: KeyCode.Escape,
+		handler: accessor => toasts.hide()
+	});
+
+	// Focus Toasts
+	CommandsRegistry.registerCommand(FOCUS_NOTIFICATION_TOAST, () => toasts.focus());
+
+	// Next Toast
+	KeybindingsRegistry.registerCommandAndKeybindingRule({
+		id: NEXT_NOTIFICATION_TOAST,
+		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		when: ContextKeyExpr.and(NotificationFocusedContext, NotificationsToastsVisibleContext),
+		primary: KeyCode.DownArrow,
+		handler: (accessor) => {
+			toasts.focusNext();
+		}
+	});
+
+	// Previous Toast
+	KeybindingsRegistry.registerCommandAndKeybindingRule({
+		id: PREVIOUS_NOTIFICATION_TOAST,
+		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+		when: ContextKeyExpr.and(NotificationFocusedContext, NotificationsToastsVisibleContext),
+		primary: KeyCode.UpArrow,
+		handler: (accessor) => {
+			toasts.focusPrevious();
+		}
+	});
+
+	/// Clear All Notifications
+	CommandsRegistry.registerCommand(CLEAR_ALL_NOTIFICATIONS, () => center.clearAll());
+
+	// Commands for Command Palette
+	const category = localize('notifications', "Notifications");
+	MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: SHOW_NOTIFICATIONS_CENTER_COMMAND_ID, title: localize('showNotifications', "Show Notifications"), category }, when: NotificationsCenterVisibleContext.toNegated() });
+	MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: HIDE_NOTIFICATIONS_CENTER_COMMAND_ID, title: localize('hideNotifications', "Hide Notifications"), category }, when: NotificationsCenterVisibleContext });
+	MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLEAR_ALL_NOTIFICATIONS, title: localize('clearAllNotifications', "Clear All Notifications"), category } });
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsList.ts b/src/vs/workbench/browser/parts/notifications/notificationsList.ts
new file mode 100644
index 00000000000..fe162dd8c57
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/notificationsList.ts
@@ -0,0 +1,224 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import 'vs/css!./media/notificationsList';
+import { addClass, isAncestor, trackFocus } from 'vs/base/browser/dom';
+import { WorkbenchList } from 'vs/platform/list/browser/listService';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IListOptions } from 'vs/base/browser/ui/list/listWidget';
+import { Themable, NOTIFICATIONS_LINKS, NOTIFICATIONS_BACKGROUND, NOTIFICATIONS_FOREGROUND } from 'vs/workbench/common/theme';
+import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
+import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
+import { INotificationViewItem } from 'vs/workbench/common/notifications';
+import { NotificationsListDelegate, NotificationRenderer } from 'vs/workbench/browser/parts/notifications/notificationsViewer';
+import { NotificationActionRunner } from 'vs/workbench/browser/parts/notifications/notificationsActions';
+import { NotificationFocusedContext } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
+
+export interface INotificationsListOptions {
+	ariaLabel: string;
+}
+
+export class NotificationsList extends Themable {
+	private listContainer: HTMLElement;
+	private list: WorkbenchList<INotificationViewItem>;
+	private viewModel: INotificationViewItem[];
+	private isVisible: boolean;
+
+	constructor(
+		private container: HTMLElement,
+		private options: INotificationsListOptions,
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IThemeService themeService: IThemeService
+	) {
+		super(themeService);
+
+		this.viewModel = [];
+	}
+
+	public show(focus?: boolean): void {
+		if (this.isVisible) {
+			if (focus) {
+				this.list.domFocus();
+			}
+
+			return; // already visible
+		}
+
+		// Lazily create if showing for the first time
+		if (!this.list) {
+			this.createNotificationsList();
+		}
+
+		// Make visible
+		this.isVisible = true;
+
+		// Focus
+		if (focus) {
+			this.list.domFocus();
+		}
+	}
+
+	private createNotificationsList(): void {
+
+		// List Container
+		this.listContainer = document.createElement('div');
+		addClass(this.listContainer, 'notifications-list-container');
+
+		// Notification Renderer
+		const renderer = this.instantiationService.createInstance(NotificationRenderer, this.instantiationService.createInstance(NotificationActionRunner));
+
+		// List
+		this.list = this.instantiationService.createInstance(
+			WorkbenchList,
+			this.listContainer,
+			new NotificationsListDelegate(this.listContainer),
+			[renderer],
+			{
+				ariaLabel: this.options.ariaLabel
+			} as IListOptions<INotificationViewItem>
+		);
+		this.toUnbind.push(this.list);
+
+		// Toggle on double click
+		this.toUnbind.push(this.list.onMouseDblClick(event => (event.element as INotificationViewItem).toggle()));
+
+		// Clear focus when DOM focus moves out
+		const listFocusTracker = trackFocus(this.list.getHTMLElement());
+		listFocusTracker.onDidBlur(() => {
+			this.list.setFocus([]);
+		});
+		this.toUnbind.push(listFocusTracker);
+
+		// Context key
+		NotificationFocusedContext.bindTo(this.list.contextKeyService);
+
+		// Only allow for focus in notifications, as the
+		// selection is too strong over the contents of
+		// the notification
+		this.toUnbind.push(this.list.onSelectionChange(e => {
+			if (e.indexes.length > 0) {
+				this.list.setSelection([]);
+			}
+		}));
+
+		this.container.appendChild(this.listContainer);
+
+		this.updateStyles();
+	}
+
+	public updateNotificationsList(start: number, deleteCount: number, items: INotificationViewItem[] = []) {
+		const listHasDOMFocus = isAncestor(document.activeElement, this.listContainer);
+
+		// Remember focus
+		const focusedIndex = this.list.getFocus()[0];
+		const focusedItem = this.viewModel[focusedIndex];
+
+		// Update view model
+		this.viewModel.splice(start, deleteCount, ...items);
+
+		// Update list
+		this.list.splice(start, deleteCount, items);
+		this.list.layout();
+
+		// Hide if no more notifications to show
+		if (this.viewModel.length === 0) {
+			this.hide();
+		}
+
+		// Otherwise restore focus if we had
+		else if (typeof focusedIndex === 'number') {
+			let indexToFocus = 0;
+			if (focusedItem) {
+				let indexToFocusCandidate = this.viewModel.indexOf(focusedItem);
+				if (indexToFocusCandidate === -1) {
+					indexToFocusCandidate = focusedIndex - 1; // item could have been removed
+				}
+
+				if (indexToFocusCandidate < this.viewModel.length && indexToFocusCandidate >= 0) {
+					indexToFocus = indexToFocusCandidate;
+				}
+			}
+
+			this.list.setFocus([indexToFocus]);
+		}
+
+		// Restore DOM focus if we had focus before
+		if (listHasDOMFocus) {
+			this.list.domFocus();
+		}
+	}
+
+	public hide(): void {
+		if (!this.isVisible || !this.list) {
+			return; // already hidden
+		}
+
+		// Hide
+		this.isVisible = false;
+
+		// Clear list
+		this.list.splice(0, this.viewModel.length);
+
+		// Clear view model
+		this.viewModel = [];
+	}
+
+	public focusFirst(): void {
+		if (!this.isVisible || !this.list) {
+			return; // hidden
+		}
+
+		this.list.focusFirst();
+		this.list.domFocus();
+	}
+
+	public hasFocus(): boolean {
+		if (!this.isVisible || !this.list) {
+			return false; // hidden
+		}
+
+		return this.list.isDOMFocused();
+	}
+
+	protected updateStyles(): void {
+		if (this.listContainer) {
+			const foreground = this.getColor(NOTIFICATIONS_FOREGROUND);
+			this.listContainer.style.color = foreground ? foreground.toString() : null;
+
+			const background = this.getColor(NOTIFICATIONS_BACKGROUND);
+			this.listContainer.style.background = background ? background.toString() : null;
+
+			const outlineColor = this.getColor(contrastBorder);
+			this.listContainer.style.outlineColor = outlineColor ? outlineColor.toString() : null;
+		}
+	}
+
+	public layout(width: number, maxHeight?: number): void {
+		if (this.list) {
+			this.listContainer.style.width = `${width}px`;
+
+			if (typeof maxHeight === 'number') {
+				this.list.getHTMLElement().style.maxHeight = `${maxHeight}px`;
+			}
+
+			this.list.layout();
+		}
+	}
+
+	public dispose(): void {
+		this.hide();
+
+		super.dispose();
+	}
+}
+
+registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
+	const linkColor = theme.getColor(NOTIFICATIONS_LINKS);
+	if (linkColor) {
+		collector.addRule(`.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-message a { color: ${linkColor}; }`);
+	}
+});
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsStatus.ts b/src/vs/workbench/browser/parts/notifications/notificationsStatus.ts
new file mode 100644
index 00000000000..c9215fa253c
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/notificationsStatus.ts
@@ -0,0 +1,106 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { INotificationsModel, INotificationChangeEvent, NotificationChangeType } from 'vs/workbench/common/notifications';
+import { IStatusbarService, StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { HIDE_NOTIFICATIONS_CENTER_COMMAND_ID, SHOW_NOTIFICATIONS_CENTER_COMMAND_ID } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
+import { localize } from 'vs/nls';
+
+export class NotificationsStatus {
+	private counter: number;
+	private statusItem: IDisposable;
+	private toDispose: IDisposable[];
+	private isNotificationsCenterVisible: boolean;
+
+	constructor(
+		private model: INotificationsModel,
+		@IStatusbarService private statusbarService: IStatusbarService
+	) {
+		this.toDispose = [];
+		this.counter = 0;
+
+		this.updateNotificationsStatusItem();
+
+		this.registerListeners();
+	}
+
+	public update(isCenterVisible: boolean): void {
+		if (this.isNotificationsCenterVisible !== isCenterVisible) {
+			this.isNotificationsCenterVisible = isCenterVisible;
+
+			// Showing the notification center resets the counter to 0
+			this.counter = 0;
+			this.updateNotificationsStatusItem();
+		}
+	}
+
+	private registerListeners(): void {
+		this.toDispose.push(this.model.onDidNotificationChange(e => this.onDidNotificationChange(e)));
+	}
+
+	private onDidNotificationChange(e: INotificationChangeEvent): void {
+		if (e.kind === NotificationChangeType.CHANGE) {
+			return; // only interested in add or remove
+		}
+
+		if (this.isNotificationsCenterVisible) {
+			return; // no change if notification center is visible
+		}
+
+		if (e.kind === NotificationChangeType.ADD) {
+			this.counter++;
+		} else {
+			this.counter = Math.max(this.counter - 1, 0);
+		}
+
+		this.updateNotificationsStatusItem();
+	}
+
+	private updateNotificationsStatusItem(): void {
+
+		// Dispose old first
+		if (this.statusItem) {
+			this.statusItem.dispose();
+		}
+
+		// Create new
+		this.statusItem = this.statusbarService.addEntry({
+			text: this.counter === 0 ? '$(megaphone)' : `$(megaphone) ${this.counter}`,
+			command: this.isNotificationsCenterVisible ? HIDE_NOTIFICATIONS_CENTER_COMMAND_ID : this.model.notifications.length > 0 ? SHOW_NOTIFICATIONS_CENTER_COMMAND_ID : void 0,
+			tooltip: this.getTooltip()
+		}, StatusbarAlignment.RIGHT, -1000 /* towards the far end of the right hand side */);
+	}
+
+	private getTooltip(): string {
+		if (this.isNotificationsCenterVisible) {
+			return localize('hideNotifications', "Hide Notifications");
+		}
+
+		if (this.counter === 0) {
+			return localize('noNotifications', "No New Notifications");
+		}
+
+		if (this.model.notifications.length === 0) {
+			return localize('zeroNotifications', "No Notifications");
+		}
+
+		if (this.counter === 1) {
+			return localize('oneNotification', "1 new notification");
+		}
+
+		return localize('notifications', "{0} new notifications", this.counter);
+	}
+
+	public dispose() {
+		this.toDispose = dispose(this.toDispose);
+
+		if (this.statusItem) {
+			this.statusItem.dispose();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
new file mode 100644
index 00000000000..dfa261b4128
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
@@ -0,0 +1,373 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import 'vs/css!./media/notificationsToasts';
+import { INotificationsModel, NotificationChangeType, INotificationChangeEvent, INotificationViewItem, NotificationViewItemLabelKind } from 'vs/workbench/common/notifications';
+import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
+import { addClass, removeClass, isAncestor } from 'vs/base/browser/dom';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { NotificationsList } from 'vs/workbench/browser/parts/notifications/notificationsList';
+import { Dimension } from 'vs/base/browser/builder';
+import { once } from 'vs/base/common/event';
+import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
+import { Themable } from 'vs/workbench/common/theme';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { widgetShadow } from 'vs/platform/theme/common/colorRegistry';
+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { NotificationsToastsVisibleContext } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
+import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { localize } from 'vs/nls';
+import { Severity } from 'vs/platform/notification/common/notification';
+
+interface INotificationToast {
+	list: NotificationsList;
+	container: HTMLElement;
+	disposeables: IDisposable[];
+}
+
+export class NotificationsToasts extends Themable {
+
+	private static MAX_DIMENSIONS = new Dimension(450, 300);
+
+	private static PURGE_TIMEOUT: { [severity: number]: number } = (() => {
+		const intervals = Object.create(null);
+		intervals[Severity.Info] = 8000;
+		intervals[Severity.Warning] = 12000;
+		intervals[Severity.Error] = 15000;
+
+		return intervals;
+	})();
+
+	private notificationsToastsContainer: HTMLElement;
+	private workbenchDimensions: Dimension;
+	private isNotificationsCenterVisible: boolean;
+	private mapNotificationToToast: Map<INotificationViewItem, INotificationToast>;
+	private notificationsToastsVisibleContextKey: IContextKey<boolean>;
+
+	constructor(
+		private container: HTMLElement,
+		private model: INotificationsModel,
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IPartService private partService: IPartService,
+		@IThemeService themeService: IThemeService,
+		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
+		@IContextKeyService contextKeyService: IContextKeyService
+	) {
+		super(themeService);
+
+		this.mapNotificationToToast = new Map<INotificationViewItem, INotificationToast>();
+		this.notificationsToastsVisibleContextKey = NotificationsToastsVisibleContext.bindTo(contextKeyService);
+
+		// Show toast for initial notifications if any
+		model.notifications.forEach(notification => this.addToast(notification));
+
+		this.registerListeners();
+	}
+
+	private registerListeners(): void {
+		this.toUnbind.push(this.model.onDidNotificationChange(e => this.onDidNotificationChange(e)));
+	}
+
+	private onDidNotificationChange(e: INotificationChangeEvent): void {
+		switch (e.kind) {
+			case NotificationChangeType.ADD:
+				return this.addToast(e.item);
+			case NotificationChangeType.REMOVE:
+				return this.removeToast(e.item);
+		}
+	}
+
+	private addToast(item: INotificationViewItem): void {
+		if (this.isNotificationsCenterVisible) {
+			return; // do not show toasts while notification center is visibles
+		}
+
+		// Lazily create toasts containers
+		if (!this.notificationsToastsContainer) {
+			this.notificationsToastsContainer = document.createElement('div');
+			addClass(this.notificationsToastsContainer, 'notifications-toasts');
+
+			this.container.appendChild(this.notificationsToastsContainer);
+		}
+
+		// Make Visible
+		addClass(this.notificationsToastsContainer, 'visible');
+
+		const itemDisposeables: IDisposable[] = [];
+
+		// Container
+		const notificationToastContainer = document.createElement('div');
+		addClass(notificationToastContainer, 'notification-toast');
+		this.notificationsToastsContainer.appendChild(notificationToastContainer);
+		itemDisposeables.push(toDisposable(() => this.notificationsToastsContainer.removeChild(notificationToastContainer)));
+
+		// Create toast with item and show
+		const notificationList = this.instantiationService.createInstance(NotificationsList, notificationToastContainer, { ariaLabel: localize('notificationsToast', "Notification Toast") });
+		itemDisposeables.push(notificationList);
+		this.mapNotificationToToast.set(item, { list: notificationList, container: notificationToastContainer, disposeables: itemDisposeables });
+
+		// Make visible
+		notificationList.show();
+
+		// Layout lists
+		const maxDimensions = this.computeMaxDimensions();
+		this.layoutLists(maxDimensions.width);
+
+		// Show notification
+		notificationList.updateNotificationsList(0, 0, [item]);
+
+		// Layout container: only after we show the notification to ensure that
+		// the height computation takes the content of it into account!
+		this.layoutContainer(maxDimensions.height);
+
+		// Update when item height changes due to expansion
+		itemDisposeables.push(item.onDidExpansionChange(() => {
+			notificationList.updateNotificationsList(0, 1, [item]);
+		}));
+
+		// Update when item height potentially changes due to label changes
+		itemDisposeables.push(item.onDidLabelChange(e => {
+			if (e.kind === NotificationViewItemLabelKind.ACTIONS || e.kind === NotificationViewItemLabelKind.MESSAGE) {
+				notificationList.updateNotificationsList(0, 1, [item]);
+			}
+		}));
+
+		// Remove when item gets disposed
+		once(item.onDidDispose)(() => {
+			this.removeToast(item);
+		});
+
+		// Automatically hide collapsed notifications
+		if (!item.expanded) {
+			let timeoutHandle: number;
+			const hideAfterTimeout = () => {
+				timeoutHandle = setTimeout(() => {
+					if (!notificationList.hasFocus() && !item.expanded) {
+						this.removeToast(item);
+					} else {
+						hideAfterTimeout(); // push out disposal if item has focus or is expanded
+					}
+				}, NotificationsToasts.PURGE_TIMEOUT[item.severity]);
+			};
+
+			hideAfterTimeout();
+
+			itemDisposeables.push(toDisposable(() => clearTimeout(timeoutHandle)));
+		}
+
+		// Theming
+		this.updateStyles();
+
+		// Context Key
+		this.notificationsToastsVisibleContextKey.set(true);
+
+		// Animate In
+		notificationToastContainer.style.left = `${NotificationsToasts.MAX_DIMENSIONS.width}px`;
+		const animationHandle = setTimeout(() => {
+			notificationToastContainer.style.left = '0px';
+		});
+		itemDisposeables.push(toDisposable(() => clearTimeout(animationHandle)));
+	}
+
+	private removeToast(item: INotificationViewItem): void {
+		const notificationToast = this.mapNotificationToToast.get(item);
+		let focusEditor = false;
+		if (notificationToast) {
+			const toastHasDOMFocus = isAncestor(document.activeElement, notificationToast.container);
+			if (toastHasDOMFocus) {
+				focusEditor = !(this.focusNext() || this.focusPrevious()); // focus next if any, otherwise focus editor
+			}
+
+			// Listeners
+			dispose(notificationToast.disposeables);
+
+			// Remove from Map
+			this.mapNotificationToToast.delete(item);
+		}
+
+		// Layout if we still have toasts
+		if (this.mapNotificationToToast.size > 0) {
+			this.layout(this.workbenchDimensions);
+		}
+
+		// Otherwise hide if no more toasts to show
+		else {
+			this.doHide();
+
+			// Move focus to editor as needed
+			if (focusEditor) {
+				this.focusEditor();
+			}
+		}
+	}
+
+	private focusEditor(): void {
+		const editor = this.editorService.getActiveEditor();
+		if (editor) {
+			editor.focus();
+		}
+	}
+
+	private removeToasts(): void {
+		this.mapNotificationToToast.forEach(toast => dispose(toast.disposeables));
+		this.mapNotificationToToast.clear();
+
+		this.doHide();
+	}
+
+	private doHide(): void {
+		removeClass(this.notificationsToastsContainer, 'visible');
+
+		// Context Key
+		this.notificationsToastsVisibleContextKey.set(false);
+	}
+
+	public hide(): void {
+		const focusEditor = isAncestor(document.activeElement, this.notificationsToastsContainer);
+
+		this.removeToasts();
+
+		if (focusEditor) {
+			this.focusEditor();
+		}
+	}
+
+	public focus(): boolean {
+		const toasts = this.getVisibleToasts();
+		if (toasts.length > 0) {
+			toasts[0].list.focusFirst();
+
+			return true;
+		}
+
+		return false;
+	}
+
+	public focusNext(): boolean {
+		const toasts = this.getVisibleToasts();
+		for (let i = 0; i < toasts.length; i++) {
+			const toast = toasts[i];
+			if (toast.list.hasFocus()) {
+				const nextToast = toasts[i + 1];
+				if (nextToast) {
+					nextToast.list.focusFirst();
+
+					return true;
+				}
+
+				break;
+			}
+		}
+
+		return false;
+	}
+
+	public focusPrevious(): boolean {
+		const toasts = this.getVisibleToasts();
+		for (let i = 0; i < toasts.length; i++) {
+			const toast = toasts[i];
+			if (toast.list.hasFocus()) {
+				const previousToast = toasts[i - 1];
+				if (previousToast) {
+					previousToast.list.focusFirst();
+
+					return true;
+				}
+
+				break;
+			}
+		}
+
+		return false;
+	}
+
+	public update(isCenterVisible: boolean): void {
+		if (this.isNotificationsCenterVisible !== isCenterVisible) {
+			this.isNotificationsCenterVisible = isCenterVisible;
+
+			// Hide all toasts when the notificationcenter gets visible
+			if (this.isNotificationsCenterVisible) {
+				this.removeToasts();
+			}
+		}
+	}
+
+	protected updateStyles(): void {
+		this.mapNotificationToToast.forEach(toast => {
+			const widgetShadowColor = this.getColor(widgetShadow);
+			toast.container.style.boxShadow = widgetShadowColor ? `0 2px 8px ${widgetShadowColor}` : null;
+		});
+	}
+
+	private getVisibleToasts(): INotificationToast[] {
+		let notificationToasts: INotificationToast[] = [];
+		this.mapNotificationToToast.forEach(toast => notificationToasts.push(toast));
+		notificationToasts = notificationToasts.reverse(); // from newest to oldest
+
+		return notificationToasts;
+	}
+
+	public layout(dimension: Dimension): void {
+		this.workbenchDimensions = dimension;
+
+		const maxDimensions = this.computeMaxDimensions();
+
+		// Layout all lists of toasts
+		this.layoutLists(maxDimensions.width);
+
+		// Hide toasts that exceed height
+		this.layoutContainer(maxDimensions.height);
+	}
+
+	private computeMaxDimensions(): Dimension {
+		let maxWidth = NotificationsToasts.MAX_DIMENSIONS.width;
+		let maxHeight = NotificationsToasts.MAX_DIMENSIONS.height;
+
+		let availableWidth = maxWidth;
+		let availableHeight = maxHeight;
+
+		if (this.workbenchDimensions) {
+
+			// Make sure notifications are not exceding available width
+			availableWidth = this.workbenchDimensions.width;
+			availableWidth -= (2 * 8); // adjust for paddings left and right
+
+			// Make sure notifications are not exceeding available height
+			availableHeight = this.workbenchDimensions.height;
+			if (this.partService.isVisible(Parts.STATUSBAR_PART)) {
+				availableHeight -= 22; // adjust for status bar
+			}
+
+			if (this.partService.isVisible(Parts.TITLEBAR_PART)) {
+				availableHeight -= 22; // adjust for title bar
+			}
+
+			availableHeight -= (2 * 12); // adjust for paddings top and bottom
+		}
+
+		return new Dimension(Math.min(maxWidth, availableWidth), Math.min(maxHeight, availableHeight));
+	}
+
+	private layoutLists(width: number): void {
+		this.mapNotificationToToast.forEach(toast => toast.list.layout(width));
+	}
+
+	private layoutContainer(heightToGive: number): void {
+		this.getVisibleToasts().forEach(toast => {
+
+			// In order to measure the client height, the element cannot have display: none
+			toast.container.style.opacity = '0';
+			toast.container.style.display = 'block';
+
+			heightToGive -= toast.container.clientHeight;
+
+			// Hide or show toast based on available height
+			toast.container.style.display = heightToGive >= 0 ? 'block' : 'none';
+			toast.container.style.opacity = null;
+		});
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
new file mode 100644
index 00000000000..4bdc59a5789
--- /dev/null
+++ b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
@@ -0,0 +1,475 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { IDelegate, IRenderer } from 'vs/base/browser/ui/list/list';
+import { renderMarkdown, IContentActionHandler } from 'vs/base/browser/htmlContentRenderer';
+import { clearNode, addClass, removeClass, toggleClass } from 'vs/base/browser/dom';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import URI from 'vs/base/common/uri';
+import { onUnexpectedError } from 'vs/base/common/errors';
+import { localize } from 'vs/nls';
+import { Button } from 'vs/base/browser/ui/button/button';
+import { attachButtonStyler, attachProgressBarStyler } from 'vs/platform/theme/common/styler';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { IMarkdownString } from 'vs/base/common/htmlContent';
+import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
+import { IAction, IActionRunner } from 'vs/base/common/actions';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { DropdownMenuActionItem } from 'vs/base/browser/ui/dropdown/dropdown';
+import { INotificationViewItem, NotificationViewItem, NotificationViewItemLabelKind } from 'vs/workbench/common/notifications';
+import { ClearNotificationAction, ExpandNotificationAction, CollapseNotificationAction, ConfigureNotificationAction } from 'vs/workbench/browser/parts/notifications/notificationsActions';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { MarkedOptions } from 'vs/base/common/marked/marked';
+import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
+import { Severity } from 'vs/platform/notification/common/notification';
+
+export class NotificationsListDelegate implements IDelegate<INotificationViewItem> {
+
+	private static readonly ROW_HEIGHT = 42;
+	private static readonly LINE_HEIGHT = 22;
+
+	private offsetHelper: HTMLElement;
+
+	constructor(container: HTMLElement) {
+		this.offsetHelper = this.createOffsetHelper(container);
+	}
+
+	private createOffsetHelper(container: HTMLElement): HTMLElement {
+		const offsetHelper = document.createElement('div');
+		offsetHelper.style.opacity = '0';
+		offsetHelper.style.position = 'absolute'; // do not mess with the visual layout
+		offsetHelper.style.width = '100%'; // ensure to fill contauner to measure true width
+		offsetHelper.style.overflow = 'hidden'; // do not overflow
+		offsetHelper.style.whiteSpace = 'nowrap'; // do not wrap to measure true width
+
+		container.appendChild(offsetHelper);
+
+		return offsetHelper;
+	}
+
+	public getHeight(notification: INotificationViewItem): number {
+
+		// First row: message and actions
+		let expandedHeight = NotificationsListDelegate.ROW_HEIGHT;
+
+		if (!notification.expanded) {
+			return expandedHeight; // return early if there are no more rows to show
+		}
+
+		// Dynamic height: if message overflows
+		const preferredMessageHeight = this.computePreferredRows(notification) * NotificationsListDelegate.LINE_HEIGHT;
+		const messageOverflows = NotificationsListDelegate.LINE_HEIGHT < preferredMessageHeight;
+		if (messageOverflows) {
+			const overflow = preferredMessageHeight - NotificationsListDelegate.LINE_HEIGHT;
+			expandedHeight += overflow;
+		}
+
+		// Last row: source and buttons if we have any
+		if (notification.source || notification.actions.primary.length > 0) {
+			expandedHeight += NotificationsListDelegate.ROW_HEIGHT;
+		}
+
+		return expandedHeight;
+	}
+
+	private computePreferredRows(notification: INotificationViewItem): number {
+
+		// Render message markdown into offset helper
+		const renderedMessage = NotificationMessageMarkdownRenderer.render(notification.message);
+		this.offsetHelper.appendChild(renderedMessage);
+
+		// Compute message width taking overflow into account
+		const messageWidth = Math.max(renderedMessage.scrollWidth, renderedMessage.offsetWidth);
+
+		// One row per exceeding the total width of the container
+		const availableWidth = this.offsetHelper.offsetWidth - (20 /* paddings */ + 22 /* severity */ + (24 * 3) /* toolbar */);
+		const preferredRows = Math.ceil(messageWidth / availableWidth);
+
+		// Always clear offset helper after use
+		clearNode(this.offsetHelper);
+
+		return preferredRows;
+	}
+
+	public getTemplateId(element: INotificationViewItem): string {
+		if (element instanceof NotificationViewItem) {
+			return NotificationRenderer.TEMPLATE_ID;
+		}
+
+		return void 0;
+	}
+}
+
+export interface INotificationTemplateData {
+	container: HTMLElement;
+	toDispose: IDisposable[];
+
+	mainRow: HTMLElement;
+	icon: HTMLElement;
+	message: HTMLElement;
+	toolbar: ActionBar;
+
+	detailsRow: HTMLElement;
+	source: HTMLElement;
+	buttonsContainer: HTMLElement;
+	progress: ProgressBar;
+
+	renderer: NotificationTemplateRenderer;
+}
+
+class NotificationMessageMarkdownRenderer {
+
+	private static readonly MARKED_NOOP = (text?: string) => text || '';
+	private static readonly MARKED_NOOP_TARGETS = [
+		'blockquote', 'br', 'code', 'codespan', 'del', 'em', 'heading', 'hr', 'html',
+		'image', 'list', 'listitem', 'paragraph', 'strong', 'table', 'tablecell',
+		'tablerow'
+	];
+
+	public static render(markdown: IMarkdownString, actionHandler?: IContentActionHandler): HTMLElement {
+		return renderMarkdown(markdown, {
+			inline: true,
+			joinRendererConfiguration: renderer => {
+
+				// Overwrite markdown render functions as no-ops
+				NotificationMessageMarkdownRenderer.MARKED_NOOP_TARGETS.forEach(fn => renderer[fn] = NotificationMessageMarkdownRenderer.MARKED_NOOP);
+
+				return {
+					gfm: false, // disable GitHub style markdown,
+					smartypants: false // disable some text transformations
+				} as MarkedOptions;
+			},
+			actionHandler
+		});
+	}
+}
+
+export class NotificationRenderer implements IRenderer<INotificationViewItem, INotificationTemplateData> {
+
+	public static readonly TEMPLATE_ID = 'notification';
+
+	constructor(
+		private actionRunner: IActionRunner,
+		@IThemeService private themeService: IThemeService,
+		@IContextMenuService private contextMenuService: IContextMenuService,
+		@IInstantiationService private instantiationService: IInstantiationService
+	) {
+	}
+
+	public get templateId() {
+		return NotificationRenderer.TEMPLATE_ID;
+	}
+
+	public renderTemplate(container: HTMLElement): INotificationTemplateData {
+		const data: INotificationTemplateData = Object.create(null);
+		data.toDispose = [];
+
+		// Container
+		data.container = document.createElement('div');
+		addClass(data.container, 'notification-list-item');
+
+		// Main Row
+		data.mainRow = document.createElement('div');
+		addClass(data.mainRow, 'notification-list-item-main-row');
+
+		// Icon
+		data.icon = document.createElement('div');
+		addClass(data.icon, 'notification-list-item-icon');
+
+		// Message
+		data.message = document.createElement('div');
+		addClass(data.message, 'notification-list-item-message');
+
+		// Toolbar
+		const toolbarContainer = document.createElement('div');
+		addClass(toolbarContainer, 'notification-list-item-toolbar-container');
+		data.toolbar = new ActionBar(
+			toolbarContainer,
+			{
+				ariaLabel: localize('notificationActions', "Notification Actions"),
+				actionItemProvider: action => {
+					if (action instanceof ConfigureNotificationAction) {
+						const item = new DropdownMenuActionItem(action, action.configurationActions, this.contextMenuService, null, this.actionRunner, null, action.class);
+						data.toDispose.push(item);
+
+						return item;
+					}
+
+					return null;
+				},
+				actionRunner: this.actionRunner
+			}
+		);
+		data.toDispose.push(data.toolbar);
+
+		// Details Row
+		data.detailsRow = document.createElement('div');
+		addClass(data.detailsRow, 'notification-list-item-details-row');
+
+		// Source
+		data.source = document.createElement('div');
+		addClass(data.source, 'notification-list-item-source');
+
+		// Buttons Container
+		data.buttonsContainer = document.createElement('div');
+		addClass(data.buttonsContainer, 'notification-list-item-buttons-container');
+
+		container.appendChild(data.container);
+
+		// the details row appears first in order for better keyboard access to notification buttons
+		data.container.appendChild(data.detailsRow);
+		data.detailsRow.appendChild(data.source);
+		data.detailsRow.appendChild(data.buttonsContainer);
+
+		// main row
+		data.container.appendChild(data.mainRow);
+		data.mainRow.appendChild(data.icon);
+		data.mainRow.appendChild(data.message);
+		data.mainRow.appendChild(toolbarContainer);
+
+		// Progress: below the rows to span the entire width of the item
+		data.progress = new ProgressBar(container);
+		data.toDispose.push(attachProgressBarStyler(data.progress, this.themeService));
+		data.toDispose.push(data.progress);
+
+		// Renderer
+		data.renderer = this.instantiationService.createInstance(NotificationTemplateRenderer, data, this.actionRunner);
+		data.toDispose.push(data.renderer);
+
+		return data;
+	}
+
+	public renderElement(notification: INotificationViewItem, index: number, data: INotificationTemplateData): void {
+		data.renderer.setInput(notification);
+	}
+
+	public disposeTemplate(templateData: INotificationTemplateData): void {
+		templateData.toDispose = dispose(templateData.toDispose);
+	}
+}
+
+export class NotificationTemplateRenderer {
+
+	private static closeNotificationAction: ClearNotificationAction;
+	private static expandNotificationAction: ExpandNotificationAction;
+	private static collapseNotificationAction: CollapseNotificationAction;
+
+	private static readonly SEVERITIES: ('info' | 'warning' | 'error')[] = ['info', 'warning', 'error'];
+
+	private inputDisposeables: IDisposable[];
+
+	constructor(
+		private template: INotificationTemplateData,
+		private actionRunner: IActionRunner,
+		@IOpenerService private openerService: IOpenerService,
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IThemeService private themeService: IThemeService,
+		@IKeybindingService private keybindingService: IKeybindingService
+	) {
+		this.inputDisposeables = [];
+
+		if (!NotificationTemplateRenderer.closeNotificationAction) {
+			NotificationTemplateRenderer.closeNotificationAction = instantiationService.createInstance(ClearNotificationAction, ClearNotificationAction.ID, ClearNotificationAction.LABEL);
+			NotificationTemplateRenderer.expandNotificationAction = instantiationService.createInstance(ExpandNotificationAction, ExpandNotificationAction.ID, ExpandNotificationAction.LABEL);
+			NotificationTemplateRenderer.collapseNotificationAction = instantiationService.createInstance(CollapseNotificationAction, CollapseNotificationAction.ID, CollapseNotificationAction.LABEL);
+		}
+	}
+
+	public setInput(notification: INotificationViewItem): void {
+		this.inputDisposeables = dispose(this.inputDisposeables);
+
+		this.render(notification);
+	}
+
+	private render(notification: INotificationViewItem): void {
+
+		// Container
+		toggleClass(this.template.container, 'expanded', notification.expanded);
+
+		// Severity Icon
+		this.renderSeverity(notification);
+
+		// Message
+		const messageOverflows = this.renderMessage(notification);
+
+		// Secondary Actions
+		this.renderSecondaryActions(notification, messageOverflows);
+
+		// Source
+		this.renderSource(notification);
+
+		// Buttons
+		this.renderButtons(notification);
+
+		// Progress
+		this.renderProgress(notification);
+
+		// Label Change Events
+		this.inputDisposeables.push(notification.onDidLabelChange(event => {
+			switch (event.kind) {
+				case NotificationViewItemLabelKind.SEVERITY:
+					this.renderSeverity(notification);
+					break;
+				case NotificationViewItemLabelKind.PROGRESS:
+					this.renderProgress(notification);
+					break;
+			}
+		}));
+	}
+
+	private renderSeverity(notification: INotificationViewItem): void {
+		NotificationTemplateRenderer.SEVERITIES.forEach(severity => {
+			const domAction = notification.severity === this.toSeverity(severity) ? addClass : removeClass;
+			domAction(this.template.icon, `icon-${severity}`);
+		});
+	}
+
+	private renderMessage(notification: INotificationViewItem): boolean {
+		clearNode(this.template.message);
+		this.template.message.appendChild(NotificationMessageMarkdownRenderer.render(notification.message, {
+			callback: (content: string) => this.openerService.open(URI.parse(content)).then(void 0, onUnexpectedError),
+			disposeables: this.inputDisposeables
+		}));
+
+		const messageOverflows = notification.canCollapse && !notification.expanded && this.template.message.scrollWidth > this.template.message.clientWidth;
+		if (messageOverflows) {
+			this.template.message.title = this.template.message.textContent;
+		} else {
+			this.template.message.removeAttribute('title');
+		}
+
+		const links = this.template.message.querySelectorAll('a');
+		for (let i = 0; i < links.length; i++) {
+			links.item(i).tabIndex = -1; // prevent keyboard navigation to links to allow for better keyboard support within a message
+		}
+
+		return messageOverflows;
+	}
+
+	private renderSecondaryActions(notification: INotificationViewItem, messageOverflows: boolean): void {
+		const actions: IAction[] = [];
+
+		// Secondary Actions
+		if (notification.actions.secondary.length > 0) {
+			const configureNotificationAction = this.instantiationService.createInstance(ConfigureNotificationAction, ConfigureNotificationAction.ID, ConfigureNotificationAction.LABEL, notification.actions.secondary);
+			actions.push(configureNotificationAction);
+			this.inputDisposeables.push(configureNotificationAction);
+		}
+
+		// Expand / Collapse
+		let showExpandCollapseAction = false;
+		if (notification.canCollapse) {
+			if (notification.expanded) {
+				showExpandCollapseAction = true; // allow to collapse an expanded message
+			} else if (notification.source) {
+				showExpandCollapseAction = true; // allow to expand to details row
+			} else if (messageOverflows) {
+				showExpandCollapseAction = true; // allow to expand if message overflows
+			}
+		}
+
+		if (showExpandCollapseAction) {
+			actions.push(notification.expanded ? NotificationTemplateRenderer.collapseNotificationAction : NotificationTemplateRenderer.expandNotificationAction);
+		}
+
+		// Close
+		actions.push(NotificationTemplateRenderer.closeNotificationAction);
+
+		this.template.toolbar.clear();
+		this.template.toolbar.context = notification;
+		actions.forEach(action => this.template.toolbar.push(action, { icon: true, label: false, keybinding: this.getKeybindingLabel(action) }));
+	}
+
+	private renderSource(notification): void {
+		if (notification.expanded && notification.source) {
+			this.template.source.innerText = localize('notificationSource', "Source: {0}", notification.source);
+		} else {
+			this.template.source.innerText = '';
+		}
+	}
+
+	private renderButtons(notification: INotificationViewItem): void {
+		clearNode(this.template.buttonsContainer);
+
+		if (notification.expanded) {
+			notification.actions.primary.forEach(action => this.createButton(notification, action));
+		}
+	}
+
+	private renderProgress(notification: INotificationViewItem): void {
+
+		// Return early if the item has no progress
+		if (!notification.hasProgress()) {
+			this.template.progress.stop().getContainer().hide();
+
+			return;
+		}
+
+		// Infinite
+		const state = notification.progress.state;
+		if (state.infinite) {
+			this.template.progress.infinite().getContainer().show();
+		}
+
+		// Total / Worked
+		else if (state.total || state.worked) {
+			if (state.total) {
+				this.template.progress.total(state.total);
+			}
+
+			if (state.worked) {
+				this.template.progress.worked(state.worked).getContainer().show();
+			}
+		}
+
+		// Done
+		else {
+			this.template.progress.done().getContainer().hide();
+		}
+	}
+
+	private toSeverity(severity: 'info' | 'warning' | 'error'): Severity {
+		switch (severity) {
+			case 'info':
+				return Severity.Info;
+			case 'warning':
+				return Severity.Warning;
+			case 'error':
+				return Severity.Error;
+		}
+	}
+
+	private getKeybindingLabel(action: IAction): string {
+		const keybinding = this.keybindingService.lookupKeybinding(action.id);
+
+		return keybinding ? keybinding.getLabel() : void 0;
+	}
+
+	private createButton(notification: INotificationViewItem, action: IAction): Button {
+		const button = new Button(this.template.buttonsContainer);
+		button.label = action.label;
+		this.inputDisposeables.push(button.onDidClick(() => {
+
+			// Run action
+			this.actionRunner.run(action, notification);
+
+			// Hide notification
+			notification.dispose();
+		}));
+
+		this.inputDisposeables.push(attachButtonStyler(button, this.themeService));
+		this.inputDisposeables.push(button);
+
+		return button;
+	}
+
+	public dispose(): void {
+		this.inputDisposeables = dispose(this.inputDisposeables);
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts
index 1162557713b..daf7329b430 100644
--- a/src/vs/workbench/browser/parts/panel/panelPart.ts
+++ b/src/vs/workbench/browser/parts/panel/panelPart.ts
@@ -17,7 +17,6 @@ import { IPanelService, IPanelIdentifier } from 'vs/workbench/services/panel/com
 import { IPartService, Parts, Position } from 'vs/workbench/services/part/common/partService';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -30,6 +29,7 @@ import { ToggleCompositePinnedAction } from 'vs/workbench/browser/parts/composit
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { IBadge } from 'vs/workbench/services/activity/common/activity';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class PanelPart extends CompositePart<Panel> implements IPanelService {
 
@@ -46,7 +46,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 
 	constructor(
 		id: string,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@IStorageService storageService: IStorageService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IContextMenuService contextMenuService: IContextMenuService,
@@ -56,7 +56,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		@IThemeService themeService: IThemeService,
 	) {
 		super(
-			messageService,
+			notificationService,
 			storageService,
 			telemetryService,
 			contextMenuService,
diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
index 0ef84d14de7..1ad776c6891 100644
--- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
+++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
@@ -40,7 +40,6 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi
 import { IPickOpenEntry, IFilePickOpenEntry, IInputOptions, IQuickOpenService, IPickOptions, IShowOptions, IPickOpenItem } from 'vs/platform/quickOpen/common/quickOpen';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
@@ -57,6 +56,8 @@ import { WorkbenchTree } from 'vs/platform/list/browser/listService';
 import { matchesFuzzyOcticonAware, parseOcticons, IParsedOcticons } from 'vs/base/common/octicon';
 import { IMatch } from 'vs/base/common/filters';
 import { Schemas } from 'vs/base/common/network';
+import Severity from 'vs/base/common/severity';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 const HELP_PREFIX = '?';
 
@@ -104,7 +105,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 
 	constructor(
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IContextKeyService private contextKeyService: IContextKeyService,
 		@IConfigurationService private configurationService: IConfigurationService,
 		@IInstantiationService private instantiationService: IInstantiationService,
@@ -798,7 +799,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		}, (error: any) => {
 			resultPromiseDone = true;
 			errors.onUnexpectedError(error);
-			this.messageService.show(Severity.Error, types.isString(error) ? new Error(error) : error);
+			this.notificationService.error(types.isString(error) ? new Error(error) : error);
 		});
 	}
 
diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
index 35f15ee7ae2..6e9105368a2 100644
--- a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
+++ b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
@@ -18,7 +18,6 @@ import { IPartService, Parts, Position as SideBarPosition } from 'vs/workbench/s
 import { IViewlet } from 'vs/workbench/common/viewlet';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
@@ -29,6 +28,7 @@ import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { SIDE_BAR_TITLE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND, SIDE_BAR_BORDER } from 'vs/workbench/common/theme';
 import { ToggleSidebarVisibilityAction } from 'vs/workbench/browser/actions/toggleSidebarVisibility';
 import { Dimension } from 'vs/base/browser/builder';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class SidebarPart extends CompositePart<Viewlet> {
 
@@ -40,7 +40,7 @@ export class SidebarPart extends CompositePart<Viewlet> {
 
 	constructor(
 		id: string,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@IStorageService storageService: IStorageService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IContextMenuService contextMenuService: IContextMenuService,
@@ -50,7 +50,7 @@ export class SidebarPart extends CompositePart<Viewlet> {
 		@IThemeService themeService: IThemeService
 	) {
 		super(
-			messageService,
+			notificationService,
 			storageService,
 			telemetryService,
 			contextMenuService,
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index b694e1d7efe..60f6efe34df 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -6,7 +6,6 @@
 'use strict';
 
 import 'vs/css!./media/statusbarpart';
-import dom = require('vs/base/browser/dom');
 import nls = require('vs/nls');
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -20,7 +19,6 @@ import { Part } from 'vs/workbench/browser/part';
 import { StatusbarAlignment, IStatusbarRegistry, Extensions, IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { IStatusbarService, IStatusbarEntry } from 'vs/platform/statusbar/common/statusbar';
 import { getCodeEditor } from 'vs/editor/browser/services/codeEditorService';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
@@ -31,6 +29,8 @@ import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/
 import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { isThemeColor } from 'vs/editor/common/editorCommon';
 import { Color } from 'vs/base/common/color';
+import { addClass, EventHelper } from 'vs/base/browser/dom';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class StatusbarPart extends Part implements IStatusbarService {
 
@@ -151,12 +151,12 @@ export class StatusbarPart extends Part implements IStatusbarService {
 
 	private doCreateStatusItem(alignment: StatusbarAlignment, priority: number = 0): HTMLElement {
 		const el = document.createElement('div');
-		dom.addClass(el, 'statusbar-item');
+		addClass(el, 'statusbar-item');
 
 		if (alignment === StatusbarAlignment.RIGHT) {
-			dom.addClass(el, 'right');
+			addClass(el, 'right');
 		} else {
-			dom.addClass(el, 'left');
+			addClass(el, 'left');
 		}
 
 		$(el).setProperty(StatusbarPart.PRIORITY_PROP, priority);
@@ -206,13 +206,12 @@ export class StatusbarPart extends Part implements IStatusbarService {
 
 let manageExtensionAction: ManageExtensionAction;
 class StatusBarEntryItem implements IStatusbarItem {
-	private entry: IStatusbarEntry;
 
 	constructor(
-		entry: IStatusbarEntry,
+		private entry: IStatusbarEntry,
 		@ICommandService private commandService: ICommandService,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IContextMenuService private contextMenuService: IContextMenuService,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
@@ -227,7 +226,7 @@ class StatusBarEntryItem implements IStatusbarItem {
 
 	public render(el: HTMLElement): IDisposable {
 		let toDispose: IDisposable[] = [];
-		dom.addClass(el, 'statusbar-entry');
+		addClass(el, 'statusbar-entry');
 
 		// Text Container
 		let textContainer: HTMLElement;
@@ -264,7 +263,7 @@ class StatusBarEntryItem implements IStatusbarItem {
 		// Context Menu
 		if (this.entry.extensionId) {
 			$(textContainer).on('contextmenu', e => {
-				dom.EventHelper.stop(e, true);
+				EventHelper.stop(e, true);
 
 				this.contextMenuService.showContextMenu({
 					getAnchor: () => el,
@@ -300,7 +299,7 @@ class StatusBarEntryItem implements IStatusbarItem {
 			}
 		*/
 		this.telemetryService.publicLog('workbenchActionExecuted', { id, from: 'status bar' });
-		this.commandService.executeCommand(id, ...args).done(undefined, err => this.messageService.show(Severity.Error, toErrorMessage(err)));
+		this.commandService.executeCommand(id, ...args).done(undefined, err => this.notificationService.error(toErrorMessage(err)));
 	}
 }
 
diff --git a/src/vs/workbench/browser/parts/views/customView.ts b/src/vs/workbench/browser/parts/views/customView.ts
index f276597e0e2..5381405294e 100644
--- a/src/vs/workbench/browser/parts/views/customView.ts
+++ b/src/vs/workbench/browser/parts/views/customView.ts
@@ -6,7 +6,7 @@
 import 'vs/css!./media/views';
 import Event, { Emitter } from 'vs/base/common/event';
 import * as errors from 'vs/base/common/errors';
-import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
+import { IDisposable, Disposable, dispose } from 'vs/base/common/lifecycle';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as DOM from 'vs/base/browser/dom';
@@ -52,14 +52,6 @@ export class CustomViewsService extends Disposable implements ICustomViewsServic
 		return this.viewers.get(id);
 	}
 
-	registerTreeViewDataProvider(id: string, dataProvider: ITreeViewDataProvider): void {
-		const treeViewer = <CustomTreeViewer>this.getTreeViewer(id);
-		if (treeViewer) {
-			treeViewer.setDataProvider(dataProvider);
-			dataProvider.onDispose(() => treeViewer.setDataProvider(null));
-		}
-	}
-
 	private createViewers(viewDescriptors: IViewDescriptor[]): void {
 		for (const viewDescriptor of viewDescriptors) {
 			if ((<ICustomViewDescriptor>viewDescriptor).treeView) {
@@ -104,7 +96,7 @@ class CustomTreeViewer extends Disposable implements ITreeViewer {
 	private refreshing = 0;
 
 	private _dataProvider: ITreeViewDataProvider;
-	private dataProviderElementChangeListener: IDisposable;
+	private dataProviderDisposables: IDisposable[] = [];
 
 	constructor(
 		private id: string,
@@ -123,10 +115,8 @@ class CustomTreeViewer extends Disposable implements ITreeViewer {
 		return this._dataProvider;
 	}
 
-	setDataProvider(dataProvider: ITreeViewDataProvider) {
-		if (this.dataProviderElementChangeListener) {
-			this.dataProviderElementChangeListener.dispose();
-		}
+	set dataProvider(dataProvider: ITreeViewDataProvider) {
+		dispose(this.dataProviderDisposables);
 		if (dataProvider) {
 			const customTreeView: CustomTreeViewer = this;
 			this._dataProvider = new class implements ITreeViewDataProvider {
@@ -146,7 +136,8 @@ class CustomTreeViewer extends Disposable implements ITreeViewer {
 					});
 				}
 			};
-			this.dataProviderElementChangeListener = this._register(dataProvider.onDidChange(elements => this.refresh(elements)));
+			this._register(dataProvider.onDidChange(elements => this.refresh(elements), this, this.dataProviderDisposables));
+			this._register(dataProvider.onDispose(() => this.dataProvider = null, this, this.dataProviderDisposables));
 		} else {
 			this._dataProvider = null;
 		}
@@ -204,24 +195,24 @@ class CustomTreeViewer extends Disposable implements ITreeViewer {
 		}
 	}
 
-	render(container: HTMLElement): void {
-		this.treeContainer = DOM.append(container, DOM.$('.tree-explorer-viewlet-tree-view'));
+	show(container: HTMLElement): void {
+		if (!this.tree) {
+			this.createTree();
+		}
+		DOM.append(container, this.treeContainer);
+	}
 
+	private createTree() {
+		this.treeContainer = DOM.$('.tree-explorer-viewlet-tree-view');
 		const actionItemProvider = (action: IAction) => action instanceof MenuItemAction ? this.instantiationService.createInstance(ContextAwareMenuItemActionItem, action) : undefined;
 		const menus = this.instantiationService.createInstance(Menus, this.id);
 		const dataSource = this.instantiationService.createInstance(TreeDataSource, this);
 		const renderer = this.instantiationService.createInstance(TreeRenderer, this.id, this, menus, actionItemProvider);
 		const controller = this.instantiationService.createInstance(TreeController, this.id, menus);
-		this.tree = this.instantiationService.createInstance(FileIconThemableWorkbenchTree,
-			this.treeContainer,
-			{ dataSource, renderer, controller },
-			{}
-		);
-
+		this.tree = this.instantiationService.createInstance(FileIconThemableWorkbenchTree, this.treeContainer, { dataSource, renderer, controller }, {});
 		this.tree.contextKeyService.createKey<boolean>(this.id, true);
 		this._register(this.tree);
 		this._register(this.tree.onDidChangeSelection(e => this.onSelection(e)));
-
 		this.tree.setInput(this.root);
 	}
 
@@ -413,7 +404,7 @@ class TreeRenderer implements IRenderer {
 
 	public renderElement(tree: ITree, node: ITreeItem, templateId: string, templateData: ITreeExplorerTemplateData): void {
 		const resource = node.resourceUri ? URI.revive(node.resourceUri) : null;
-		const name = node.label || basename(resource.path);
+		const label = node.label ? node.label : resource ? basename(resource.path) : '';
 		const icon = this.themeService.getTheme().type === LIGHT ? node.icon : node.iconDark;
 
 		// reset
@@ -424,11 +415,12 @@ class TreeRenderer implements IRenderer {
 		DOM.removeClass(templateData.resourceLabel.element, 'custom-view-tree-node-item-resourceLabel');
 
 		if (resource && !icon) {
-			templateData.resourceLabel.setLabel({ name, resource }, { fileKind: node.collapsibleState === TreeItemCollapsibleState.Collapsed || node.collapsibleState === TreeItemCollapsibleState.Expanded ? FileKind.FOLDER : FileKind.FILE });
+			templateData.resourceLabel.setLabel({ name: label, resource }, { fileKind: node.collapsibleState === TreeItemCollapsibleState.Collapsed || node.collapsibleState === TreeItemCollapsibleState.Expanded ? FileKind.FOLDER : FileKind.FILE, title: node.tooltip });
 			DOM.addClass(templateData.resourceLabel.element, 'custom-view-tree-node-item-resourceLabel');
 		} else {
-			templateData.label.textContent = name;
+			templateData.label.textContent = label;
 			DOM.addClass(templateData.label, 'custom-view-tree-node-item-label');
+			templateData.label.title = typeof node.tooltip === 'string' ? node.tooltip : label;
 		}
 
 		templateData.icon.treeItem = node;
@@ -496,7 +488,7 @@ class TreeController extends WorkbenchTreeController {
 		private treeViewId: string,
 		private menus: Menus,
 		@IContextMenuService private contextMenuService: IContextMenuService,
-		@IKeybindingService private _keybindingService: IKeybindingService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@IConfigurationService configurationService: IConfigurationService
 	) {
 		super({}, configurationService);
diff --git a/src/vs/workbench/browser/parts/views/customViewPanel.ts b/src/vs/workbench/browser/parts/views/customViewPanel.ts
index 0b57e4b2db0..6a79f82249c 100644
--- a/src/vs/workbench/browser/parts/views/customViewPanel.ts
+++ b/src/vs/workbench/browser/parts/views/customViewPanel.ts
@@ -9,7 +9,6 @@ import { IDisposable, dispose, empty as EmptyDisposable, toDisposable } from 'vs
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IAction, IActionItem } from 'vs/base/common/actions';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
@@ -18,6 +17,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ICustomViewsService, ITreeViewer } from 'vs/workbench/common/views';
 import { IViewletViewOptions, IViewOptions, ViewsViewletPanel } from 'vs/workbench/browser/parts/views/viewsViewlet';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class CustomTreeViewPanel extends ViewsViewletPanel {
 
@@ -26,7 +26,7 @@ export class CustomTreeViewPanel extends ViewsViewletPanel {
 
 	constructor(
 		options: IViewletViewOptions,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IInstantiationService private instantiationService: IInstantiationService,
@@ -35,6 +35,7 @@ export class CustomTreeViewPanel extends ViewsViewletPanel {
 	) {
 		super({ ...(options as IViewOptions), ariaHeaderLabel: options.name }, keybindingService, contextMenuService, configurationService);
 		this.treeViewer = customViewsService.getTreeViewer(this.id);
+		this.disposables.push(toDisposable(() => this.treeViewer.setVisibility(false)));
 		this.menus = this.instantiationService.createInstance(Menus, this.id);
 		this.menus.onDidChangeTitle(() => this.updateActions(), this, this.disposables);
 		this.updateTreeVisibility();
@@ -50,7 +51,7 @@ export class CustomTreeViewPanel extends ViewsViewletPanel {
 	}
 
 	renderBody(container: HTMLElement): void {
-		this.treeViewer.render(container);
+		this.treeViewer.show(container);
 	}
 
 	setExpanded(expanded: boolean): void {
@@ -71,7 +72,7 @@ export class CustomTreeViewPanel extends ViewsViewletPanel {
 	}
 
 	getActionItem(action: IAction): IActionItem {
-		return action instanceof MenuItemAction ? new ContextAwareMenuItemActionItem(action, this.keybindingService, this.messageService, this.contextMenuService) : undefined;
+		return action instanceof MenuItemAction ? new ContextAwareMenuItemActionItem(action, this.keybindingService, this.notificationService, this.contextMenuService) : undefined;
 	}
 
 	getOptimalWidth(): number {
diff --git a/src/vs/workbench/browser/parts/views/panelViewlet.ts b/src/vs/workbench/browser/parts/views/panelViewlet.ts
index 928ad422b63..22c581580ec 100644
--- a/src/vs/workbench/browser/parts/views/panelViewlet.ts
+++ b/src/vs/workbench/browser/parts/views/panelViewlet.ts
@@ -49,7 +49,7 @@ export interface IViewletPanelOptions extends IPanelOptions {
 
 export abstract class ViewletPanel extends Panel {
 
-	private static AlwaysShowActionsConfig = 'workbench.panel.alwaysShowActions';
+	private static AlwaysShowActionsConfig = 'workbench.view.alwaysShowHeaderActions';
 
 	private _onDidFocus = new Emitter<void>();
 	readonly onDidFocus: Event<void> = this._onDidFocus.event;
@@ -114,7 +114,7 @@ export abstract class ViewletPanel extends Panel {
 	}
 
 	protected updateActionsVisibility(): void {
-		const shouldAlwaysShowActions = this.configurationService.getValue<boolean>('workbench.panel.alwaysShowActions');
+		const shouldAlwaysShowActions = this.configurationService.getValue<boolean>('workbench.view.alwaysShowHeaderActions');
 		toggleClass(this.headerContainer, 'actions-always-visible', shouldAlwaysShowActions);
 	}
 
diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts
index de06ac9d0ec..4ecac43df70 100644
--- a/src/vs/workbench/browser/parts/views/viewsViewlet.ts
+++ b/src/vs/workbench/browser/parts/views/viewsViewlet.ts
@@ -360,6 +360,7 @@ export class ViewsViewlet extends PanelViewlet implements IViewsViewlet {
 					let view = this.getView(viewDescriptor.id);
 					this.removePanel(view);
 					this.viewsViewletPanels.splice(this.viewsViewletPanels.indexOf(view), 1);
+					view.dispose();
 				}
 			}
 
diff --git a/src/vs/workbench/common/actions.ts b/src/vs/workbench/common/actions.ts
index 70cf7c390c5..0e0f7adf806 100644
--- a/src/vs/workbench/common/actions.ts
+++ b/src/vs/workbench/common/actions.ts
@@ -9,11 +9,10 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { ICommandHandler, CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import Severity from 'vs/base/common/severity';
 import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export const Extensions = {
 	WorkbenchActions: 'workbench.contributions.actions'
@@ -86,12 +85,12 @@ Registry.add(Extensions.WorkbenchActions, new class implements IWorkbenchActionR
 
 	private _createCommandHandler(descriptor: SyncActionDescriptor): ICommandHandler {
 		return (accessor, args) => {
-			const messageService = accessor.get(IMessageService);
+			const notificationService = accessor.get(INotificationService);
 			const instantiationService = accessor.get(IInstantiationService);
 			const lifecycleService = accessor.get(ILifecycleService);
 
-			TPromise.as(this._triggerAndDisposeAction(instantiationService, lifecycleService, descriptor, args)).then(null, (err) => {
-				messageService.show(Severity.Error, err);
+			TPromise.as(this._triggerAndDisposeAction(instantiationService, lifecycleService, descriptor, args)).then(null, err => {
+				notificationService.error(err);
 			});
 		};
 	}
diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
index e3fca67780a..dfbef8288f3 100644
--- a/src/vs/workbench/common/editor.ts
+++ b/src/vs/workbench/common/editor.ts
@@ -355,7 +355,7 @@ export interface IFileEditorInput extends IEditorInput, IEncodingSupport {
  */
 export class SideBySideEditorInput extends EditorInput {
 
-	public static ID: string = 'workbench.editorinputs.sidebysideEditorInput';
+	public static readonly ID: string = 'workbench.editorinputs.sidebysideEditorInput';
 
 	private _toUnbind: IDisposable[];
 
diff --git a/src/vs/workbench/common/editor/dataUriEditorInput.ts b/src/vs/workbench/common/editor/dataUriEditorInput.ts
index 8088ecda424..c1d785bd73b 100644
--- a/src/vs/workbench/common/editor/dataUriEditorInput.ts
+++ b/src/vs/workbench/common/editor/dataUriEditorInput.ts
@@ -18,7 +18,7 @@ import { DataUri } from 'vs/workbench/common/resources';
  */
 export class DataUriEditorInput extends EditorInput {
 
-	static ID: string = 'workbench.editors.dataUriEditorInput';
+	static readonly ID: string = 'workbench.editors.dataUriEditorInput';
 
 	private resource: URI;
 	private name: string;
diff --git a/src/vs/workbench/common/editor/resourceEditorInput.ts b/src/vs/workbench/common/editor/resourceEditorInput.ts
index 850154f02bc..0d19259d23a 100644
--- a/src/vs/workbench/common/editor/resourceEditorInput.ts
+++ b/src/vs/workbench/common/editor/resourceEditorInput.ts
@@ -19,7 +19,7 @@ import { IHashService } from 'vs/workbench/services/hash/common/hashService';
  */
 export class ResourceEditorInput extends EditorInput {
 
-	static ID: string = 'workbench.editors.resourceEditorInput';
+	static readonly ID: string = 'workbench.editors.resourceEditorInput';
 
 	private modelReference: TPromise<IReference<ITextEditorModel>>;
 	private resource: URI;
diff --git a/src/vs/workbench/common/editor/textEditorModel.ts b/src/vs/workbench/common/editor/textEditorModel.ts
index 63f9d2e6ba9..3d87656feb7 100644
--- a/src/vs/workbench/common/editor/textEditorModel.ts
+++ b/src/vs/workbench/common/editor/textEditorModel.ts
@@ -91,7 +91,7 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd
 		return this;
 	}
 
-	protected getFirstLineText(value: ITextBufferFactory | ITextSnapshot): string {
+	protected getFirstLineText(value: ITextBufferFactory | ITextModel): string {
 
 		// text buffer factory
 		const textBufferFactory = value as ITextBufferFactory;
@@ -99,21 +99,9 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd
 			return textBufferFactory.getFirstLineText(100);
 		}
 
-		// text snapshot
-		const textSnapshot = value as ITextSnapshot;
-		const firstLineText = textSnapshot.read().substr(0, 100);
-
-		let crIndex = firstLineText.indexOf('\r');
-		if (crIndex < 0) {
-			crIndex = firstLineText.length;
-		}
-
-		let lfIndex = firstLineText.indexOf('\n');
-		if (lfIndex < 0) {
-			lfIndex = firstLineText.length;
-		}
-
-		return firstLineText.substr(0, Math.min(crIndex, lfIndex));
+		// text model
+		const textSnapshot = value as ITextModel;
+		return textSnapshot.getLineContent(1).substr(0, 100);
 	}
 
 	/**
diff --git a/src/vs/workbench/common/editor/untitledEditorInput.ts b/src/vs/workbench/common/editor/untitledEditorInput.ts
index 78c322eb9fe..7583194d5ed 100644
--- a/src/vs/workbench/common/editor/untitledEditorInput.ts
+++ b/src/vs/workbench/common/editor/untitledEditorInput.ts
@@ -29,7 +29,7 @@ import { IHashService } from 'vs/workbench/services/hash/common/hashService';
  */
 export class UntitledEditorInput extends EditorInput implements IEncodingSupport {
 
-	public static ID: string = 'workbench.editors.untitledEditorInput';
+	public static readonly ID: string = 'workbench.editors.untitledEditorInput';
 
 	private _hasAssociatedFilePath: boolean;
 	private cachedModel: UntitledEditorModel;
diff --git a/src/vs/workbench/common/notifications.ts b/src/vs/workbench/common/notifications.ts
new file mode 100644
index 00000000000..dbc2e4b31df
--- /dev/null
+++ b/src/vs/workbench/common/notifications.ts
@@ -0,0 +1,543 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { IMarkdownString } from 'vs/base/common/htmlContent';
+import { INotification, INotificationHandle, INotificationActions, INotificationProgress, NoOpNotification, Severity, NotificationMessage } from 'vs/platform/notification/common/notification';
+import { toErrorMessage } from 'vs/base/common/errorMessage';
+import Event, { Emitter, once } from 'vs/base/common/event';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { isPromiseCanceledError, isErrorWithActions } from 'vs/base/common/errors';
+
+export interface INotificationsModel {
+
+	readonly notifications: INotificationViewItem[];
+	readonly onDidNotificationChange: Event<INotificationChangeEvent>;
+
+	notify(notification: INotification): INotificationHandle;
+}
+
+export enum NotificationChangeType {
+	ADD,
+	CHANGE,
+	REMOVE
+}
+
+export interface INotificationChangeEvent {
+	index: number;
+	item: INotificationViewItem;
+	kind: NotificationChangeType;
+}
+
+export class NotificationHandle implements INotificationHandle {
+	private _onDidDispose: Emitter<void> = new Emitter();
+
+	constructor(private item: INotificationViewItem, private disposeItem: (item: INotificationViewItem) => void) {
+		this.registerListeners();
+	}
+
+	private registerListeners(): void {
+		once(this.item.onDidDispose)(() => {
+			this._onDidDispose.fire();
+			this._onDidDispose.dispose();
+		});
+	}
+
+	public get onDidDispose(): Event<void> {
+		return this._onDidDispose.event;
+	}
+
+	public get progress(): INotificationProgress {
+		return this.item.progress;
+	}
+
+	public updateSeverity(severity: Severity): void {
+		this.item.updateSeverity(severity);
+	}
+
+	public updateMessage(message: NotificationMessage): void {
+		this.item.updateMessage(message);
+	}
+
+	public updateActions(actions?: INotificationActions): void {
+		this.item.updateActions(actions);
+	}
+
+	public dispose(): void {
+		this.disposeItem(this.item);
+		this._onDidDispose.dispose();
+	}
+}
+
+export class NotificationsModel implements INotificationsModel {
+
+	private static NO_OP_NOTIFICATION = new NoOpNotification();
+
+	private _notifications: INotificationViewItem[];
+
+	private _onDidNotificationChange: Emitter<INotificationChangeEvent>;
+	private toDispose: IDisposable[];
+
+	constructor() {
+		this._notifications = [];
+		this.toDispose = [];
+
+		this._onDidNotificationChange = new Emitter<INotificationChangeEvent>();
+		this.toDispose.push(this._onDidNotificationChange);
+	}
+
+	public get notifications(): INotificationViewItem[] {
+		return this._notifications;
+	}
+
+	public get onDidNotificationChange(): Event<INotificationChangeEvent> {
+		return this._onDidNotificationChange.event;
+	}
+
+	public notify(notification: INotification): INotificationHandle {
+		const item = this.createViewItem(notification);
+		if (!item) {
+			return NotificationsModel.NO_OP_NOTIFICATION; // return early if this is a no-op
+		}
+
+		// Deduplicate
+		const duplicate = this.findNotification(item);
+		if (duplicate) {
+			duplicate.dispose();
+		}
+
+		// Add to list as first entry
+		this._notifications.splice(0, 0, item);
+
+		// Events
+		this._onDidNotificationChange.fire({ item, index: 0, kind: NotificationChangeType.ADD });
+
+		// Wrap into handle
+		return new NotificationHandle(item, item => this.disposeItem(item));
+	}
+
+	private disposeItem(item: INotificationViewItem): void {
+		const liveItem = this.findNotification(item);
+		if (liveItem && liveItem !== item) {
+			liveItem.dispose(); // item could have been replaced with another one, make sure to dispose the live item
+		} else {
+			item.dispose(); // otherwise just dispose the item that was passed in
+		}
+	}
+
+	private findNotification(item: INotificationViewItem): INotificationViewItem {
+		for (let i = 0; i < this._notifications.length; i++) {
+			const notification = this._notifications[i];
+			if (notification.equals(item)) {
+				return notification;
+			}
+		}
+
+		return void 0;
+	}
+
+	private createViewItem(notification: INotification): INotificationViewItem {
+		const item = NotificationViewItem.create(notification);
+		if (!item) {
+			return null;
+		}
+
+		// Item Events
+		const onItemChangeEvent = () => {
+			const index = this._notifications.indexOf(item);
+			if (index >= 0) {
+				this._onDidNotificationChange.fire({ item, index, kind: NotificationChangeType.CHANGE });
+			}
+		};
+
+		const itemExpansionChangeListener = item.onDidExpansionChange(() => onItemChangeEvent());
+
+		const itemLabelChangeListener = item.onDidLabelChange(e => {
+			// a label change in the area of actions or the message is a change that potentially has an impact
+			// on the size of the notification and as such we emit a change event so that viewers can redraw
+			if (e.kind === NotificationViewItemLabelKind.ACTIONS || e.kind === NotificationViewItemLabelKind.MESSAGE) {
+				onItemChangeEvent();
+			}
+		});
+
+		once(item.onDidDispose)(() => {
+			itemExpansionChangeListener.dispose();
+			itemLabelChangeListener.dispose();
+
+			const index = this._notifications.indexOf(item);
+			if (index >= 0) {
+				this._notifications.splice(index, 1);
+				this._onDidNotificationChange.fire({ item, index, kind: NotificationChangeType.REMOVE });
+			}
+		});
+
+		return item;
+	}
+
+	public dispose(): void {
+		this.toDispose = dispose(this.toDispose);
+	}
+}
+
+export interface INotificationViewItem {
+	readonly severity: Severity;
+	readonly message: IMarkdownString;
+	readonly source: string;
+	readonly actions: INotificationActions;
+	readonly progress: INotificationViewItemProgress;
+
+	readonly expanded: boolean;
+	readonly canCollapse: boolean;
+
+	readonly onDidExpansionChange: Event<void>;
+	readonly onDidDispose: Event<void>;
+	readonly onDidLabelChange: Event<INotificationViewItemLabelChangeEvent>;
+
+	expand(): void;
+	collapse(): void;
+	toggle(): void;
+
+	hasProgress(): boolean;
+
+	updateSeverity(severity: Severity): void;
+	updateMessage(message: NotificationMessage): void;
+	updateActions(actions?: INotificationActions): void;
+
+	dispose(): void;
+
+	equals(item: INotificationViewItem);
+}
+
+export function isNotificationViewItem(obj: any): obj is INotificationViewItem {
+	return obj instanceof NotificationViewItem;
+}
+
+export enum NotificationViewItemLabelKind {
+	SEVERITY,
+	MESSAGE,
+	ACTIONS,
+	PROGRESS
+}
+
+export interface INotificationViewItemLabelChangeEvent {
+	kind: NotificationViewItemLabelKind;
+}
+
+export interface INotificationViewItemProgressState {
+	infinite?: boolean;
+	total?: number;
+	worked?: number;
+	done?: boolean;
+}
+
+export interface INotificationViewItemProgress extends INotificationProgress {
+	readonly state: INotificationViewItemProgressState;
+
+	dispose(): void;
+}
+
+export class NotificationViewItemProgress implements INotificationViewItemProgress {
+	private _state: INotificationViewItemProgressState;
+
+	private _onDidChange: Emitter<void>;
+	private toDispose: IDisposable[];
+
+	constructor() {
+		this.toDispose = [];
+		this._state = Object.create(null);
+
+		this._onDidChange = new Emitter<void>();
+		this.toDispose.push(this._onDidChange);
+	}
+
+	public get state(): INotificationViewItemProgressState {
+		return this._state;
+	}
+
+	public get onDidChange(): Event<void> {
+		return this._onDidChange.event;
+	}
+
+	public infinite(): void {
+		if (this._state.infinite) {
+			return;
+		}
+
+		this._state.infinite = true;
+
+		this._state.total = void 0;
+		this._state.worked = void 0;
+		this._state.done = void 0;
+
+		this._onDidChange.fire();
+	}
+
+	public done(): void {
+		if (this._state.done) {
+			return;
+		}
+
+		this._state.done = true;
+
+		this._state.infinite = void 0;
+		this._state.total = void 0;
+		this._state.worked = void 0;
+
+		this._onDidChange.fire();
+	}
+
+	public total(value: number): void {
+		if (this._state.total === value) {
+			return;
+		}
+
+		this._state.total = value;
+
+		this._state.infinite = void 0;
+		this._state.done = void 0;
+
+		this._onDidChange.fire();
+	}
+
+	public worked(value: number): void {
+		if (this._state.worked === value) {
+			return;
+		}
+
+		this._state.worked = value;
+
+		this._state.infinite = void 0;
+		this._state.done = void 0;
+
+		this._onDidChange.fire();
+	}
+
+	public dispose(): void {
+		this.toDispose = dispose(this.toDispose);
+	}
+}
+
+export class NotificationViewItem implements INotificationViewItem {
+
+	private static MAX_MESSAGE_LENGTH = 1000;
+
+	private _expanded: boolean;
+	private toDispose: IDisposable[];
+
+	private _actions: INotificationActions;
+	private _progress: NotificationViewItemProgress;
+
+	private _onDidExpansionChange: Emitter<void>;
+	private _onDidDispose: Emitter<void>;
+	private _onDidLabelChange: Emitter<INotificationViewItemLabelChangeEvent>;
+
+	public static create(notification: INotification): INotificationViewItem {
+		if (!notification || !notification.message || isPromiseCanceledError(notification.message)) {
+			return null; // we need a message to show
+		}
+
+		let severity: Severity;
+		if (typeof notification.severity === 'number') {
+			severity = notification.severity;
+		} else {
+			severity = Severity.Info;
+		}
+
+		const message = NotificationViewItem.toMarkdownString(notification.message);
+		if (!message) {
+			return null; // we need a message to show
+		}
+
+		if (message.value.length > NotificationViewItem.MAX_MESSAGE_LENGTH) {
+			message.value = `${message.value.substr(0, NotificationViewItem.MAX_MESSAGE_LENGTH)}...`;
+		}
+
+		let actions: INotificationActions;
+		if (notification.actions) {
+			actions = notification.actions;
+		} else if (isErrorWithActions(notification.message)) {
+			actions = { primary: notification.message.actions };
+		}
+
+		return new NotificationViewItem(severity, message, notification.source, actions);
+	}
+
+	private static toMarkdownString(input: NotificationMessage): IMarkdownString {
+		let message: IMarkdownString;
+
+		if (input instanceof Error) {
+			message = { value: toErrorMessage(input, false), isTrusted: false };
+		} else if (typeof input === 'string') {
+			message = { value: input, isTrusted: false };
+		} else if (input.value && typeof input.value === 'string') {
+			message = input;
+		}
+
+		return message;
+	}
+
+	private constructor(private _severity: Severity, private _message: IMarkdownString, private _source: string, actions?: INotificationActions) {
+		this.toDispose = [];
+
+		this.setActions(actions);
+
+		this._onDidExpansionChange = new Emitter<void>();
+		this.toDispose.push(this._onDidExpansionChange);
+
+		this._onDidLabelChange = new Emitter<INotificationViewItemLabelChangeEvent>();
+		this.toDispose.push(this._onDidLabelChange);
+
+		this._onDidDispose = new Emitter<void>();
+		this.toDispose.push(this._onDidDispose);
+	}
+
+	private setActions(actions: INotificationActions): void {
+		if (!actions) {
+			actions = { primary: [], secondary: [] };
+		}
+
+		if (!Array.isArray(actions.primary)) {
+			actions.primary = [];
+		}
+
+		if (!Array.isArray(actions.secondary)) {
+			actions.secondary = [];
+		}
+
+		this._actions = actions;
+		this._expanded = actions.primary.length > 0;
+
+		this.toDispose.push(...actions.primary);
+		this.toDispose.push(...actions.secondary);
+	}
+
+	public get onDidExpansionChange(): Event<void> {
+		return this._onDidExpansionChange.event;
+	}
+
+	public get onDidLabelChange(): Event<INotificationViewItemLabelChangeEvent> {
+		return this._onDidLabelChange.event;
+	}
+
+	public get onDidDispose(): Event<void> {
+		return this._onDidDispose.event;
+	}
+
+	public get canCollapse(): boolean {
+		return this._actions.primary.length === 0;
+	}
+
+	public get expanded(): boolean {
+		return this._expanded;
+	}
+
+	public get severity(): Severity {
+		return this._severity;
+	}
+
+	public hasProgress(): boolean {
+		return !!this._progress;
+	}
+
+	public get progress(): INotificationViewItemProgress {
+		if (!this._progress) {
+			this._progress = new NotificationViewItemProgress();
+			this.toDispose.push(this._progress);
+			this.toDispose.push(this._progress.onDidChange(() => this._onDidLabelChange.fire({ kind: NotificationViewItemLabelKind.PROGRESS })));
+		}
+
+		return this._progress;
+	}
+
+	public get message(): IMarkdownString {
+		return this._message;
+	}
+
+	public get source(): string {
+		return this._source;
+	}
+
+	public get actions(): INotificationActions {
+		return this._actions;
+	}
+
+	public updateSeverity(severity: Severity): void {
+		this._severity = severity;
+		this._onDidLabelChange.fire({ kind: NotificationViewItemLabelKind.SEVERITY });
+	}
+
+	public updateMessage(input: NotificationMessage): void {
+		const message = NotificationViewItem.toMarkdownString(input);
+		if (!message) {
+			return;
+		}
+
+		this._message = message;
+		this._onDidLabelChange.fire({ kind: NotificationViewItemLabelKind.MESSAGE });
+	}
+
+	public updateActions(actions?: INotificationActions): void {
+		this.setActions(actions);
+
+		this._onDidLabelChange.fire({ kind: NotificationViewItemLabelKind.ACTIONS });
+	}
+
+	public expand(): void {
+		if (this._expanded || !this.canCollapse) {
+			return;
+		}
+
+		this._expanded = true;
+		this._onDidExpansionChange.fire();
+	}
+
+	public collapse(): void {
+		if (!this._expanded || !this.canCollapse) {
+			return;
+		}
+
+		this._expanded = false;
+		this._onDidExpansionChange.fire();
+	}
+
+	public toggle(): void {
+		if (this._expanded) {
+			this.collapse();
+		} else {
+			this.expand();
+		}
+	}
+
+	public dispose(): void {
+		this._onDidDispose.fire();
+
+		this.toDispose = dispose(this.toDispose);
+	}
+
+	public equals(other: INotificationViewItem): boolean {
+		if (this._source !== other.source) {
+			return false;
+		}
+
+		const primaryActions = this._actions.primary;
+		const otherPrimaryActions = other.actions.primary;
+		if (primaryActions.length !== otherPrimaryActions.length) {
+			return false;
+		}
+
+		if (this._message.value !== other.message.value) {
+			return false;
+		}
+
+		for (let i = 0; i < primaryActions.length; i++) {
+			if (primaryActions[i].id !== otherPrimaryActions[i].id) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/common/resources.ts b/src/vs/workbench/common/resources.ts
index b4f626742fe..ce37e8b8eff 100644
--- a/src/vs/workbench/common/resources.ts
+++ b/src/vs/workbench/common/resources.ts
@@ -32,8 +32,8 @@ export class ResourceContextKey implements IContextKey<URI> {
 
 	constructor(
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IModeService private _modeService: IModeService,
-		@IFileService private _fileService: IFileService
+		@IModeService private readonly _modeService: IModeService,
+		@IFileService private readonly _fileService: IFileService
 	) {
 		this._schemeKey = ResourceContextKey.Scheme.bindTo(contextKeyService);
 		this._filenameKey = ResourceContextKey.Filename.bindTo(contextKeyService);
diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts
index 75ed026731e..ef4cdaaa8f6 100644
--- a/src/vs/workbench/common/theme.ts
+++ b/src/vs/workbench/common/theme.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import nls = require('vs/nls');
-import { registerColor, editorBackground, contrastBorder, transparent, lighten, darken } from 'vs/platform/theme/common/colorRegistry';
+import { registerColor, editorBackground, contrastBorder, transparent, editorWidgetBackground, textLinkForeground } from 'vs/platform/theme/common/colorRegistry';
 import { IDisposable, Disposable, dispose } from 'vs/base/common/lifecycle';
 import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
 import { Color } from 'vs/base/common/color';
@@ -366,71 +366,29 @@ export const TITLE_BAR_BORDER = registerColor('titleBar.border', {
 
 // < --- Notifications --- >
 
-export const NOTIFICATIONS_FOREGROUND = registerColor('notification.foreground', {
-	dark: '#EEEEEE',
-	light: '#EEEEEE',
-	hc: '#FFFFFF'
-}, nls.localize('notificationsForeground', "Notifications foreground color. Notifications slide in from the top of the window."));
-
-export const NOTIFICATIONS_BACKGROUND = registerColor('notification.background', {
-	dark: '#333333',
-	light: '#2C2C2C',
-	hc: '#000000'
-}, nls.localize('notificationsBackground', "Notifications background color. Notifications slide in from the top of the window."));
-
-export const NOTIFICATIONS_BUTTON_BACKGROUND = registerColor('notification.buttonBackground', {
-	dark: '#0E639C',
-	light: '#007ACC',
+export const NOTIFICATIONS_FOREGROUND = registerColor('notifications.foreground', {
+	dark: null,
+	light: null,
 	hc: null
-}, nls.localize('notificationsButtonBackground', "Notifications button background color. Notifications slide in from the top of the window."));
+}, nls.localize('notificationsForeground', "Notifications foreground color. Notifications slide in from the bottom right of the window."));
 
-export const NOTIFICATIONS_BUTTON_HOVER_BACKGROUND = registerColor('notification.buttonHoverBackground', {
-	dark: lighten(NOTIFICATIONS_BUTTON_BACKGROUND, 0.2),
-	light: darken(NOTIFICATIONS_BUTTON_BACKGROUND, 0.2),
-	hc: null
-}, nls.localize('notificationsButtonHoverBackground', "Notifications button background color when hovering. Notifications slide in from the top of the window."));
+export const NOTIFICATIONS_BACKGROUND = registerColor('notifications.background', {
+	dark: editorWidgetBackground,
+	light: editorWidgetBackground,
+	hc: editorWidgetBackground
+}, nls.localize('notificationsBackground', "Notifications background color. Notifications slide in from the bottom right of the window."));
 
-export const NOTIFICATIONS_BUTTON_FOREGROUND = registerColor('notification.buttonForeground', {
-	dark: Color.white,
-	light: Color.white,
-	hc: Color.white
-}, nls.localize('notificationsButtonForeground', "Notifications button foreground color. Notifications slide in from the top of the window."));
+export const NOTIFICATIONS_BORDER = registerColor('notifications.border', {
+	dark: editorBackground,
+	light: editorBackground,
+	hc: editorBackground
+}, nls.localize('notificationsBorder', "Notifications border color. Notifications slide in from the bottom right of the window."));
 
-export const NOTIFICATIONS_INFO_BACKGROUND = registerColor('notification.infoBackground', {
-	dark: '#007acc',
-	light: '#007acc',
-	hc: contrastBorder
-}, nls.localize('notificationsInfoBackground', "Notifications info background color. Notifications slide in from the top of the window."));
-
-export const NOTIFICATIONS_INFO_FOREGROUND = registerColor('notification.infoForeground', {
-	dark: NOTIFICATIONS_FOREGROUND,
-	light: NOTIFICATIONS_FOREGROUND,
-	hc: null
-}, nls.localize('notificationsInfoForeground', "Notifications info foreground color. Notifications slide in from the top of the window."));
-
-export const NOTIFICATIONS_WARNING_BACKGROUND = registerColor('notification.warningBackground', {
-	dark: '#B89500',
-	light: '#B89500',
-	hc: contrastBorder
-}, nls.localize('notificationsWarningBackground', "Notifications warning background color. Notifications slide in from the top of the window."));
-
-export const NOTIFICATIONS_WARNING_FOREGROUND = registerColor('notification.warningForeground', {
-	dark: NOTIFICATIONS_FOREGROUND,
-	light: NOTIFICATIONS_FOREGROUND,
-	hc: null
-}, nls.localize('notificationsWarningForeground', "Notifications warning foreground color. Notifications slide in from the top of the window."));
-
-export const NOTIFICATIONS_ERROR_BACKGROUND = registerColor('notification.errorBackground', {
-	dark: '#BE1100',
-	light: '#BE1100',
-	hc: contrastBorder
-}, nls.localize('notificationsErrorBackground', "Notifications error background color. Notifications slide in from the top of the window."));
-
-export const NOTIFICATIONS_ERROR_FOREGROUND = registerColor('notification.errorForeground', {
-	dark: NOTIFICATIONS_FOREGROUND,
-	light: NOTIFICATIONS_FOREGROUND,
-	hc: null
-}, nls.localize('notificationsErrorForeground', "Notifications error foreground color. Notifications slide in from the top of the window."));
+export const NOTIFICATIONS_LINKS = registerColor('notificationLink.foreground', {
+	dark: textLinkForeground,
+	light: textLinkForeground,
+	hc: textLinkForeground
+}, nls.localize('notificationsLink', "Notification links foreground color. Notifications slide in from the bottom right of the window."));
 
 /**
  * Base class for all themable workbench components.
diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts
index cab9d6035ca..453e722abd9 100644
--- a/src/vs/workbench/common/views.ts
+++ b/src/vs/workbench/common/views.ts
@@ -97,7 +97,7 @@ export const ViewsRegistry: IViewsRegistry = new class implements IViewsRegistry
 					this._viewLocations.push(viewDescriptor.location);
 				}
 				if (views.some(v => v.id === viewDescriptor.id)) {
-					throw new Error(localize('duplicateId', "A view with id `{0}` is already registered in the location `{1}`", viewDescriptor.id, viewDescriptor.location.id));
+					throw new Error(localize('duplicateId', "A view with id '{0}' is already registered in the location '{1}'", viewDescriptor.id, viewDescriptor.location.id));
 				}
 				views.push(viewDescriptor);
 			}
@@ -158,7 +158,7 @@ export interface IViewsViewlet extends IViewlet {
 
 export interface ITreeViewer extends IDisposable {
 
-	readonly dataProvider: ITreeViewDataProvider;
+	dataProvider: ITreeViewDataProvider;
 
 	refresh(treeItems?: ITreeItem[]): TPromise<void>;
 
@@ -168,7 +168,7 @@ export interface ITreeViewer extends IDisposable {
 
 	layout(height: number): void;
 
-	render(container: HTMLElement);
+	show(container: HTMLElement);
 
 	getOptimalWidth(): number;
 }
@@ -185,8 +185,6 @@ export interface ICustomViewsService {
 	_serviceBrand: any;
 
 	getTreeViewer(id: string): ITreeViewer;
-
-	registerTreeViewDataProvider(id: string, ITreeViewDataProvider): void;
 }
 
 export type TreeViewItemHandleArg = {
@@ -206,6 +204,8 @@ export interface ITreeItem {
 
 	parentHandle: string;
 
+	collapsibleState: TreeItemCollapsibleState;
+
 	label?: string;
 
 	icon?: string;
@@ -214,13 +214,14 @@ export interface ITreeItem {
 
 	resourceUri?: UriComponents;
 
+	tooltip?: string;
+
 	contextValue?: string;
 
 	command?: Command;
 
 	children?: ITreeItem[];
 
-	collapsibleState?: TreeItemCollapsibleState;
 }
 
 export interface ITreeViewDataProvider {
diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts
index f04c6bdbf0e..a3546b2344d 100644
--- a/src/vs/workbench/electron-browser/actions.ts
+++ b/src/vs/workbench/electron-browser/actions.ts
@@ -11,12 +11,10 @@ import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Action } from 'vs/base/common/actions';
 import { IWindowService, IWindowsService, MenuBarVisibility } from 'vs/platform/windows/common/windows';
-import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import nls = require('vs/nls');
 import product from 'vs/platform/node/product';
 import pkg from 'vs/platform/node/package';
 import errors = require('vs/base/common/errors');
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
@@ -51,6 +49,7 @@ import { getDomNodePagePosition, createStyleSheet, createCSSRule } from 'vs/base
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { Context } from 'vs/platform/contextkey/browser/contextKeyService';
 import { IWorkbenchIssueService } from 'vs/workbench/services/issue/common/issue';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 // --- actions
 
@@ -79,7 +78,7 @@ export class CloseWorkspaceAction extends Action {
 		id: string,
 		label: string,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IWindowService private windowService: IWindowService
 	) {
 		super(id, label);
@@ -87,7 +86,7 @@ export class CloseWorkspaceAction extends Action {
 
 	run(): TPromise<void> {
 		if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
-			this.messageService.show(Severity.Info, nls.localize('noWorkspaceOpened', "There is currently no workspace opened in this instance to close."));
+			this.notificationService.info(nls.localize('noWorkspaceOpened', "There is currently no workspace opened in this instance to close."));
 
 			return TPromise.as(null);
 		}
@@ -836,35 +835,6 @@ export class QuickOpenRecentAction extends BaseOpenRecentAction {
 	}
 }
 
-export class CloseMessagesAction extends Action {
-
-	public static readonly ID = 'workbench.action.closeMessages';
-	public static readonly LABEL = nls.localize('closeMessages', "Close Notification Messages");
-
-	constructor(
-		id: string,
-		label: string,
-		@IMessageService private messageService: IMessageService,
-		@IWorkbenchEditorService private editorService: IWorkbenchEditorService
-	) {
-		super(id, label);
-	}
-
-	public run(): TPromise<boolean> {
-
-		// Close any Message if visible
-		this.messageService.hideAll();
-
-		// Restore focus if we got an editor
-		const editor = this.editorService.getActiveEditor();
-		if (editor) {
-			editor.focus();
-		}
-
-		return TPromise.as(true);
-	}
-}
-
 export class OpenIssueReporterAction extends Action {
 	public static readonly ID = 'workbench.action.openIssueReporter';
 	public static readonly LABEL = nls.localize({ key: 'reportIssueInEnglish', comment: ['Translate this to "Report Issue in English" in all languages please!'] }, "Report Issue");
diff --git a/src/vs/workbench/electron-browser/bootstrap/index.js b/src/vs/workbench/electron-browser/bootstrap/index.js
index a933a9fc4c2..d4b6e878238 100644
--- a/src/vs/workbench/electron-browser/bootstrap/index.js
+++ b/src/vs/workbench/electron-browser/bootstrap/index.js
@@ -205,6 +205,8 @@ function main() {
 	const loaderFilename = configuration.appRoot + '/out/vs/loader.js';
 	const loaderSource = require('fs').readFileSync(loaderFilename);
 	require('vm').runInThisContext(loaderSource, { filename: loaderFilename });
+	var define = global.define;
+	global.define = undefined;
 
 	window.nodeRequire = require.__$__nodeRequire;
 
diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts
index da39162e0b2..136a7292250 100644
--- a/src/vs/workbench/electron-browser/main.contribution.ts
+++ b/src/vs/workbench/electron-browser/main.contribution.ts
@@ -14,8 +14,7 @@ import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'v
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
 import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform';
-import { KeybindingsReferenceAction, OpenDocumentationUrlAction, OpenIntroductoryVideosUrlAction, OpenTipsAndTricksUrlAction, OpenIssueReporterAction, ReportPerformanceIssueUsingReporterAction, ZoomResetAction, ZoomOutAction, ZoomInAction, ToggleFullScreenAction, ToggleMenuBarAction, CloseWorkspaceAction, CloseCurrentWindowAction, SwitchWindow, NewWindowAction, CloseMessagesAction, NavigateUpAction, NavigateDownAction, NavigateLeftAction, NavigateRightAction, IncreaseViewSizeAction, DecreaseViewSizeAction, ShowStartupPerformance, ToggleSharedProcessAction, QuickSwitchWindow, QuickOpenRecentAction, inRecentFilesPickerContextKey, ShowAboutDialogAction, InspectContextKeysAction } from 'vs/workbench/electron-browser/actions';
-import { MessagesVisibleContext } from 'vs/workbench/electron-browser/workbench';
+import { KeybindingsReferenceAction, OpenDocumentationUrlAction, OpenIntroductoryVideosUrlAction, OpenTipsAndTricksUrlAction, OpenIssueReporterAction, ReportPerformanceIssueUsingReporterAction, ZoomResetAction, ZoomOutAction, ZoomInAction, ToggleFullScreenAction, ToggleMenuBarAction, CloseWorkspaceAction, CloseCurrentWindowAction, SwitchWindow, NewWindowAction, NavigateUpAction, NavigateDownAction, NavigateLeftAction, NavigateRightAction, IncreaseViewSizeAction, DecreaseViewSizeAction, ShowStartupPerformance, ToggleSharedProcessAction, QuickSwitchWindow, QuickOpenRecentAction, inRecentFilesPickerContextKey, ShowAboutDialogAction, InspectContextKeysAction } from 'vs/workbench/electron-browser/actions';
 import { registerCommands } from 'vs/workbench/electron-browser/commands';
 import { AddRootFolderAction, GlobalRemoveRootFolderAction, OpenWorkspaceAction, SaveWorkspaceAsAction, OpenWorkspaceConfigFileAction, OpenFolderAsWorkspaceInNewWindowAction, OpenFileFolderAction, OpenFileAction, OpenFolderAction } from 'vs/workbench/browser/actions/workspaceActions';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
@@ -87,7 +86,6 @@ workbenchActionsRegistry.registerWorkbenchAction(
 	}), 'View: Reset Zoom', viewCategory
 );
 
-workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(CloseMessagesAction, CloseMessagesAction.ID, CloseMessagesAction.LABEL, { primary: KeyCode.Escape, secondary: [KeyMod.Shift | KeyCode.Escape] }, MessagesVisibleContext), 'Close Notification Messages');
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ToggleFullScreenAction, ToggleFullScreenAction.ID, ToggleFullScreenAction.LABEL, { primary: KeyCode.F11, mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KEY_F } }), 'View: Toggle Full Screen', viewCategory);
 if (isWindows || isLinux) {
 	workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ToggleMenuBarAction, ToggleMenuBarAction.ID, ToggleMenuBarAction.LABEL), 'View: Toggle Menu Bar', viewCategory);
@@ -254,10 +252,10 @@ configurationRegistry.registerConfiguration({
 			'default': true,
 			'description': nls.localize('activityBarVisibility', "Controls the visibility of the activity bar in the workbench.")
 		},
-		'workbench.panel.alwaysShowActions': {
+		'workbench.view.alwaysShowHeaderActions': {
 			'type': 'boolean',
 			'default': false,
-			'description': nls.localize('panelActionVisibility', "Controls the visibility of side panel tree view actions. Panel actions may either be always visible, or only visible when that panel is focused or hovered over.")
+			'description': nls.localize('viewVisibility', "Controls the visibility of view header actions. View header actions may either be always visible, or only visible when that view is focused or hovered over.")
 		},
 		'workbench.fontAliasing': {
 			'type': 'string',
@@ -410,6 +408,11 @@ configurationRegistry.registerConfiguration({
 			'default': true,
 			'description': nls.localize('zenMode.fullScreen', "Controls if turning on Zen Mode also puts the workbench into full screen mode.")
 		},
+		'zenMode.centerLayout': {
+			'type': 'boolean',
+			'default': true,
+			'description': nls.localize('zenMode.centerLayout', "Controls if turning on Zen Mode also centers the layout.")
+		},
 		'zenMode.hideTabs': {
 			'type': 'boolean',
 			'default': true,
@@ -431,4 +434,4 @@ configurationRegistry.registerConfiguration({
 			'description': nls.localize('zenMode.restore', "Controls if a window should restore to zen mode if it was exited in zen mode.")
 		}
 	}
-});
\ No newline at end of file
+});
diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts
index 7dee2b7d03c..b26d794e093 100644
--- a/src/vs/workbench/electron-browser/shell.ts
+++ b/src/vs/workbench/electron-browser/shell.ts
@@ -30,7 +30,6 @@ import { ElectronWindow } from 'vs/workbench/electron-browser/window';
 import { resolveWorkbenchCommonProperties } from 'vs/platform/telemetry/node/workbenchCommonProperties';
 import { IWindowsService, IWindowService, IWindowConfiguration } from 'vs/platform/windows/common/windows';
 import { WindowService } from 'vs/platform/windows/electron-browser/windowService';
-import { MessageService } from 'vs/workbench/services/message/electron-browser/messageService';
 import { IRequestService } from 'vs/platform/request/node/request';
 import { RequestService } from 'vs/platform/request/electron-browser/requestService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -54,8 +53,6 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView
 import { ILifecycleService, LifecyclePhase, ShutdownReason, StartupKind } from 'vs/platform/lifecycle/common/lifecycle';
 import { IMarkerService } from 'vs/platform/markers/common/markers';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IMessageService, IChoiceService, Severity } from 'vs/platform/message/common/message';
-import { ChoiceChannel } from 'vs/platform/message/common/messageIpc';
 import { ISearchService } from 'vs/platform/search/common/search';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { CommandService } from 'vs/platform/commands/common/commandService';
@@ -94,6 +91,11 @@ import { ILocalizationsChannel, LocalizationsChannelClient } from 'vs/platform/l
 import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
 import { IWorkbenchIssueService } from 'vs/workbench/services/issue/common/issue';
 import { WorkbenchIssueService } from 'vs/workbench/services/issue/electron-browser/workbenchIssueService';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { NotificationService } from 'vs/workbench/services/notification/common/notificationService';
+import { ChoiceChannel } from 'vs/platform/dialogs/common/choiceIpc';
+import { IChoiceService, IConfirmationService } from 'vs/platform/dialogs/common/dialogs';
+import { DialogService } from 'vs/workbench/services/dialogs/electron-browser/dialogs';
 
 /**
  * Services that we require for the Shell
@@ -113,7 +115,6 @@ export interface ICoreServices {
  */
 export class WorkbenchShell {
 	private storageService: IStorageService;
-	private messageService: MessageService;
 	private environmentService: IEnvironmentService;
 	private logService: ILogService;
 	private contextViewService: ContextViewService;
@@ -127,6 +128,7 @@ export class WorkbenchShell {
 	private themeService: WorkbenchThemeService;
 	private lifecycleService: LifecycleService;
 	private mainProcessServices: ServiceCollection;
+	private notificationService: INotificationService;
 
 	private container: HTMLElement;
 	private toUnbind: IDisposable[];
@@ -344,6 +346,9 @@ export class WorkbenchShell {
 
 		const instantiationService: IInstantiationService = new InstantiationService(serviceCollection, true);
 
+		this.notificationService = new NotificationService();
+		serviceCollection.set(INotificationService, this.notificationService);
+
 		this.broadcastService = instantiationService.createInstance(BroadcastService, this.configuration.windowId);
 		serviceCollection.set(IBroadcastService, this.broadcastService);
 
@@ -397,9 +402,9 @@ export class WorkbenchShell {
 		}
 		serviceCollection.set(ICrashReporterService, crashReporterService);
 
-		this.messageService = instantiationService.createInstance(MessageService, container);
-		serviceCollection.set(IMessageService, this.messageService);
-		serviceCollection.set(IChoiceService, this.messageService);
+		const dialog = instantiationService.createInstance(DialogService);
+		serviceCollection.set(IChoiceService, dialog);
+		serviceCollection.set(IConfirmationService, dialog);
 
 		const lifecycleService = instantiationService.createInstance(LifecycleService);
 		this.toUnbind.push(lifecycleService.onShutdown(reason => this.dispose(reason)));
@@ -506,8 +511,8 @@ export class WorkbenchShell {
 		this.logService.error(errorMsg);
 
 		// Show to user if friendly message provided
-		if (error && error.friendlyMessage && this.messageService) {
-			this.messageService.show(Severity.Error, error.friendlyMessage);
+		if (error && error.friendlyMessage && this.notificationService) {
+			this.notificationService.error(error.friendlyMessage);
 		}
 	}
 
diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts
index 034f90ae386..95501b89125 100644
--- a/src/vs/workbench/electron-browser/window.ts
+++ b/src/vs/workbench/electron-browser/window.ts
@@ -13,14 +13,12 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import arrays = require('vs/base/common/arrays');
 import objects = require('vs/base/common/objects');
 import DOM = require('vs/base/browser/dom');
-import Severity from 'vs/base/common/severity';
 import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IAction, Action } from 'vs/base/common/actions';
 import { AutoSaveConfiguration, IFileService } from 'vs/platform/files/common/files';
 import { toResource } from 'vs/workbench/common/editor';
 import { IWorkbenchEditorService, IResourceInputType } from 'vs/workbench/services/editor/common/editorService';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import { IWindowsService, IWindowService, IWindowSettings, IPath, IOpenFileRequest, IWindowsConfiguration, IAddFoldersRequest, IRunActionInWindowRequest } from 'vs/platform/windows/common/windows';
@@ -48,6 +46,7 @@ import { IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/work
 import { IIntegrityService } from 'vs/platform/integrity/common/integrity';
 import { AccessibilitySupport, isRootUser, isWindows, isMacintosh } from 'vs/base/common/platform';
 import product from 'vs/platform/node/product';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 const TextInputActions: IAction[] = [
 	new Action('undo', nls.localize('undo', "Undo"), null, true, () => document.execCommand('undo') && TPromise.as(true)),
@@ -83,7 +82,7 @@ export class ElectronWindow extends Themable {
 		@IWorkspaceConfigurationService private configurationService: IWorkspaceConfigurationService,
 		@ITitleService private titleService: ITitleService,
 		@IWorkbenchThemeService protected themeService: IWorkbenchThemeService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@ICommandService private commandService: ICommandService,
 		@IExtensionService private extensionService: IExtensionService,
 		@IViewletService private viewletService: IViewletService,
@@ -158,7 +157,7 @@ export class ElectronWindow extends Themable {
 				*/
 				this.telemetryService.publicLog('commandExecuted', { id: request.id, from: request.from });
 			}, err => {
-				this.messageService.show(Severity.Error, err);
+				this.notificationService.error(err);
 			});
 		});
 
@@ -195,7 +194,7 @@ export class ElectronWindow extends Themable {
 
 		// Message support
 		ipc.on('vscode:showInfoMessage', (_event: any, message: string) => {
-			this.messageService.show(Severity.Info, message);
+			this.notificationService.info(message);
 		});
 
 		// Support toggling auto save
@@ -329,7 +328,7 @@ export class ElectronWindow extends Themable {
 			if (isWindows) {
 				isAdminPromise = import('native-is-elevated').then(isElevated => isElevated());
 			} else {
-				isAdminPromise = Promise.resolve(isRootUser);
+				isAdminPromise = Promise.resolve(isRootUser());
 			}
 
 			return isAdminPromise.then(isAdmin => {
@@ -339,7 +338,7 @@ export class ElectronWindow extends Themable {
 
 				// Show warning message (unix only)
 				if (isAdmin && !isWindows) {
-					this.messageService.show(Severity.Warning, nls.localize('runningAsRoot', "It is not recommended to run {0} as root user.", product.nameShort));
+					this.notificationService.warn(nls.localize('runningAsRoot', "It is not recommended to run {0} as root user.", product.nameShort));
 				}
 			});
 		});
diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts
index 3666039dbf0..873e612d355 100644
--- a/src/vs/workbench/electron-browser/workbench.ts
+++ b/src/vs/workbench/electron-browser/workbench.ts
@@ -58,7 +58,6 @@ import { IConfigurationResolverService } from 'vs/workbench/services/configurati
 import { ConfigurationResolverService } from 'vs/workbench/services/configurationResolver/electron-browser/configurationResolverService';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { ITitleService } from 'vs/workbench/services/title/common/titleService';
-import { WorkbenchMessageService } from 'vs/workbench/services/message/browser/messageService';
 import { IWorkbenchEditorService, IResourceInputType, WorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
@@ -79,7 +78,6 @@ import { ServiceCollection } from 'vs/platform/instantiation/common/serviceColle
 import { ShutdownReason } from 'vs/platform/lifecycle/common/lifecycle';
 import { LifecycleService } from 'vs/platform/lifecycle/electron-browser/lifecycleService';
 import { IWindowService, IWindowConfiguration as IWindowSettings, IWindowConfiguration, IPath } from 'vs/platform/windows/common/windows';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar';
 import { IMenuService, SyncActionDescriptor } from 'vs/platform/actions/common/actions';
 import { MenuService } from 'vs/platform/actions/common/menuService';
@@ -99,8 +97,14 @@ import { domEvent } from 'vs/base/browser/event';
 import { InputFocusedContext } from 'vs/platform/workbench/common/contextkeys';
 import { ICustomViewsService } from 'vs/workbench/common/views';
 import { CustomViewsService } from 'vs/workbench/browser/parts/views/customView';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { NotificationService } from 'vs/workbench/services/notification/common/notificationService';
+import { NotificationsCenter } from 'vs/workbench/browser/parts/notifications/notificationsCenter';
+import { NotificationsAlerts } from 'vs/workbench/browser/parts/notifications/notificationsAlerts';
+import { NotificationsStatus } from 'vs/workbench/browser/parts/notifications/notificationsStatus';
+import { registerNotificationCommands } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
+import { NotificationsToasts } from 'vs/workbench/browser/parts/notifications/notificationsToasts';
 
-export const MessagesVisibleContext = new RawContextKey<boolean>('globalMessageVisible', false);
 export const EditorsVisibleContext = new RawContextKey<boolean>('editorIsOpen', false);
 export const InZenModeContext = new RawContextKey<boolean>('inZenMode', false);
 export const SidebarVisibleContext = new RawContextKey<boolean>('sidebarVisible', false);
@@ -113,6 +117,7 @@ interface WorkbenchParams {
 
 interface IZenModeSettings {
 	fullScreen: boolean;
+	centerLayout: boolean;
 	hideTabs: boolean;
 	hideActivityBar: boolean;
 	hideStatusBar: boolean;
@@ -155,6 +160,7 @@ export class Workbench implements IPartService {
 	private static readonly sidebarRestoreStorageKey = 'workbench.sidebar.restore';
 	private static readonly panelHiddenStorageKey = 'workbench.panel.hidden';
 	private static readonly zenModeActiveStorageKey = 'workbench.zenmode.active';
+	private static readonly centeredEditorLayoutActiveStorageKey = 'workbench.centered.editorlayout.active';
 	private static readonly panelPositionStorageKey = 'workbench.panel.location';
 	private static readonly defaultPanelPositionStorageKey = 'workbench.panel.defaultLocation';
 
@@ -191,6 +197,8 @@ export class Workbench implements IPartService {
 	private editorPart: EditorPart;
 	private statusbarPart: StatusbarPart;
 	private quickOpen: QuickOpenController;
+	private notificationsCenter: NotificationsCenter;
+	private notificationsToasts: NotificationsToasts;
 	private workbenchLayout: WorkbenchLayout;
 	private toUnbind: IDisposable[];
 	private sideBarHidden: boolean;
@@ -201,15 +209,16 @@ export class Workbench implements IPartService {
 	private panelHidden: boolean;
 	private editorBackgroundDelayer: Delayer<void>;
 	private closeEmptyWindowScheduler: RunOnceScheduler;
-	private messagesVisibleContext: IContextKey<boolean>;
 	private editorsVisibleContext: IContextKey<boolean>;
 	private inZenMode: IContextKey<boolean>;
 	private sideBarVisibleContext: IContextKey<boolean>;
 	private hasFilesToCreateOpenOrDiff: boolean;
 	private fontAliasing: FontAliasingOption;
+	private centeredEditorLayoutActive: boolean;
 	private zenMode: {
 		active: boolean;
 		transitionedToFullScreen: boolean;
+		transitionedToCenteredEditorLayout: boolean;
 		wasSideBarVisible: boolean;
 		wasPanelVisible: boolean;
 	};
@@ -223,10 +232,10 @@ export class Workbench implements IPartService {
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IStorageService private storageService: IStorageService,
-		@IMessageService private messageService: IMessageService,
 		@IConfigurationService private configurationService: WorkspaceService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
-		@IWindowService private windowService: IWindowService
+		@IWindowService private windowService: IWindowService,
+		@INotificationService private notificationService: NotificationService
 	) {
 		this.parent = parent;
 		this.container = container;
@@ -274,7 +283,6 @@ export class Workbench implements IPartService {
 		this.initServices();
 
 		// Contexts
-		this.messagesVisibleContext = MessagesVisibleContext.bindTo(this.contextKeyService);
 		this.editorsVisibleContext = EditorsVisibleContext.bindTo(this.contextKeyService);
 		this.inZenMode = InZenModeContext.bindTo(this.contextKeyService);
 		this.sideBarVisibleContext = SidebarVisibleContext.bindTo(this.contextKeyService);
@@ -379,6 +387,11 @@ export class Workbench implements IPartService {
 			this.toggleZenMode(true);
 		}
 
+		// Restore Forced Editor Center Mode
+		if (this.storageService.getBoolean(Workbench.centeredEditorLayoutActiveStorageKey, StorageScope.GLOBAL, false)) {
+			this.centeredEditorLayoutActive = true;
+		}
+
 		const onRestored = (error?: Error): IWorkbenchStartedInfo => {
 			this.workbenchCreated = true;
 
@@ -657,9 +670,13 @@ export class Workbench implements IPartService {
 		this.zenMode = {
 			active: false,
 			transitionedToFullScreen: false,
+			transitionedToCenteredEditorLayout: false,
 			wasSideBarVisible: false,
 			wasPanelVisible: false
 		};
+
+		// Centered Editor Layout
+		this.centeredEditorLayoutActive = false;
 	}
 
 	private setPanelPositionFromStorageOrConfig() {
@@ -772,6 +789,12 @@ export class Workbench implements IPartService {
 	private setStatusBarHidden(hidden: boolean, skipLayout?: boolean): void {
 		this.statusBarHidden = hidden;
 
+		// Adjust CSS
+		if (hidden) {
+			this.workbench.addClass('nostatusbar');
+		} else {
+			this.workbench.removeClass('nostatusbar');
+		}
 
 		// Layout
 		if (!skipLayout) {
@@ -782,7 +805,6 @@ export class Workbench implements IPartService {
 	public setActivityBarHidden(hidden: boolean, skipLayout?: boolean): void {
 		this.activityBarHidden = hidden;
 
-
 		// Layout
 		if (!skipLayout) {
 			this.workbenchLayout.layout();
@@ -1006,13 +1028,6 @@ export class Workbench implements IPartService {
 			this.toUnbind.push(listenerDispose);
 		}
 
-		// Handle message service and quick open events
-		this.toUnbind.push((<WorkbenchMessageService>this.messageService).onMessagesShowing(() => this.messagesVisibleContext.set(true)));
-		this.toUnbind.push((<WorkbenchMessageService>this.messageService).onMessagesCleared(() => this.messagesVisibleContext.reset()));
-
-		this.toUnbind.push(this.quickOpen.onShow(() => (<WorkbenchMessageService>this.messageService).suspend())); // when quick open is open, don't show messages behind
-		this.toUnbind.push(this.quickOpen.onHide(() => (<WorkbenchMessageService>this.messageService).resume()));  // resume messages once quick open is closed again
-
 		// Configuration changes
 		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(() => this.onDidUpdateConfiguration()));
 
@@ -1122,7 +1137,8 @@ export class Workbench implements IPartService {
 	}
 
 	private createWorkbenchLayout(): void {
-		this.workbenchLayout = this.instantiationService.createInstance(WorkbenchLayout,
+		this.workbenchLayout = this.instantiationService.createInstance(
+			WorkbenchLayout,
 			$(this.container),							// Parent
 			this.workbench,								// Workbench Container
 			{
@@ -1133,7 +1149,9 @@ export class Workbench implements IPartService {
 				panel: this.panelPart,					// Panel Part
 				statusbar: this.statusbarPart,			// Statusbar
 			},
-			this.quickOpen								// Quickopen
+			this.quickOpen,								// Quickopen
+			this.notificationsCenter,					// Notifications Center
+			this.notificationsToasts					// Notifications Toasts
 		);
 	}
 
@@ -1146,6 +1164,9 @@ export class Workbench implements IPartService {
 		if (this.panelHidden) {
 			this.workbench.addClass('nopanel');
 		}
+		if (this.statusBarHidden) {
+			this.workbench.addClass('nostatusbar');
+		}
 
 		// Apply font aliasing
 		this.setFontAliasing(this.fontAliasing);
@@ -1169,6 +1190,9 @@ export class Workbench implements IPartService {
 		this.createPanelPart();
 		this.createStatusbarPart();
 
+		// Notification Handlers
+		this.createNotificationsHandlers();
+
 		// Add Workbench to DOM
 		this.workbenchContainer.build(this.container);
 	}
@@ -1237,6 +1261,38 @@ export class Workbench implements IPartService {
 		this.statusbarPart.create(statusbarContainer);
 	}
 
+	private createNotificationsHandlers(): void {
+
+		// Notifications Center
+		this.notificationsCenter = this.instantiationService.createInstance(NotificationsCenter, this.workbench.getHTMLElement(), this.notificationService.model);
+		this.toUnbind.push(this.notificationsCenter);
+
+		// Notifications Toasts
+		this.notificationsToasts = this.instantiationService.createInstance(NotificationsToasts, this.workbench.getHTMLElement(), this.notificationService.model);
+		this.toUnbind.push(this.notificationsToasts);
+
+		// Notifications Alerts
+		const notificationsAlerts = this.instantiationService.createInstance(NotificationsAlerts, this.notificationService.model);
+		this.toUnbind.push(notificationsAlerts);
+
+		// Notifications Status
+		const notificationsStatus = this.instantiationService.createInstance(NotificationsStatus, this.notificationService.model);
+		this.toUnbind.push(notificationsStatus);
+
+		// Eventing
+		this.toUnbind.push(this.notificationsCenter.onDidChangeVisibility(() => {
+
+			// Update status
+			notificationsStatus.update(this.notificationsCenter.isVisible);
+
+			// Update toasts
+			this.notificationsToasts.update(this.notificationsCenter.isVisible);
+		}));
+
+		// Register Commands
+		registerNotificationCommands(this.notificationsCenter, this.notificationsToasts);
+	}
+
 	public getInstantiationService(): IInstantiationService {
 		return this.instantiationService;
 	}
@@ -1262,10 +1318,14 @@ export class Workbench implements IPartService {
 
 		// Check if zen mode transitioned to full screen and if now we are out of zen mode -> we need to go out of full screen
 		let toggleFullScreen = false;
+		// Same goes for the centered editor layout
+		let toggleCenteredEditorLayout = false;
 		if (this.zenMode.active) {
 			const config = this.configurationService.getValue<IZenModeSettings>('zenMode');
 			toggleFullScreen = !browser.isFullscreen() && config.fullScreen;
 			this.zenMode.transitionedToFullScreen = toggleFullScreen;
+			toggleCenteredEditorLayout = !this.isEditorLayoutCentered() && config.centerLayout;
+			this.zenMode.transitionedToCenteredEditorLayout = toggleCenteredEditorLayout;
 			this.zenMode.wasSideBarVisible = this.isVisible(Parts.SIDEBAR_PART);
 			this.zenMode.wasPanelVisible = this.isVisible(Parts.PANEL_PART);
 			this.setPanelHidden(true, true).done(void 0, errors.onUnexpectedError);
@@ -1300,10 +1360,15 @@ export class Workbench implements IPartService {
 			}
 
 			toggleFullScreen = this.zenMode.transitionedToFullScreen && browser.isFullscreen();
+			toggleCenteredEditorLayout = this.zenMode.transitionedToCenteredEditorLayout && this.isEditorLayoutCentered();
 		}
 
 		this.inZenMode.set(this.zenMode.active);
 
+		if (toggleCenteredEditorLayout) {
+			this.toggleCenteredEditorLayout(true);
+		}
+
 		if (!skipLayout) {
 			this.layout();
 		}
@@ -1313,6 +1378,19 @@ export class Workbench implements IPartService {
 		}
 	}
 
+	public isEditorLayoutCentered(): boolean {
+		return this.centeredEditorLayoutActive;
+	}
+
+	public toggleCenteredEditorLayout(skipLayout?: boolean): void {
+		this.centeredEditorLayoutActive = !this.centeredEditorLayoutActive;
+		this.storageService.store(Workbench.centeredEditorLayoutActiveStorageKey, this.centeredEditorLayoutActive, StorageScope.GLOBAL);
+
+		if (!skipLayout) {
+			this.layout();
+		}
+	}
+
 	// Resize requested part along the main axis
 	// layout will do all the math for us and adjusts the other Parts
 	public resizePart(part: Parts, sizeChange: number): void {
diff --git a/src/vs/workbench/parts/cache/node/nodeCachedDataManager.ts b/src/vs/workbench/parts/cache/node/nodeCachedDataManager.ts
index aaea3b00838..41379934444 100644
--- a/src/vs/workbench/parts/cache/node/nodeCachedDataManager.ts
+++ b/src/vs/workbench/parts/cache/node/nodeCachedDataManager.ts
@@ -35,7 +35,7 @@ export class NodeCachedDataManager implements IWorkbenchContribution {
 			if (err) {
 				/* __GDPR__
 					"cachedDataError" : {
-						"errorCode" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+						"errorCode" : { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
 						"path": { "classification": "CustomerContent", "purpose": "PerformanceAndHealth" }
 					}
 				*/
diff --git a/src/vs/workbench/parts/cli/electron-browser/cli.contribution.ts b/src/vs/workbench/parts/cli/electron-browser/cli.contribution.ts
index af31a3e601a..b101ed20f12 100644
--- a/src/vs/workbench/parts/cli/electron-browser/cli.contribution.ts
+++ b/src/vs/workbench/parts/cli/electron-browser/cli.contribution.ts
@@ -7,6 +7,7 @@ import * as nls from 'vs/nls';
 import * as path from 'path';
 import * as cp from 'child_process';
 import * as pfs from 'vs/base/node/pfs';
+import * as platform from 'vs/base/common/platform';
 import { nfcall } from 'vs/base/common/async';
 import { TPromise } from 'vs/base/common/winjs.base';
 import URI from 'vs/base/common/uri';
@@ -14,18 +15,27 @@ import { Action } from 'vs/base/common/actions';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import product from 'vs/platform/node/product';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IChoiceService, Choice } from 'vs/platform/dialogs/common/dialogs';
+import Severity from 'vs/base/common/severity';
+import { ILogService } from '../../../../platform/log/common/log';
 
 function ignore<T>(code: string, value: T = null): (err: any) => TPromise<T> {
 	return err => err.code === code ? TPromise.as<T>(value) : TPromise.wrapError<T>(err);
 }
 
-const root = URI.parse(require.toUrl('')).fsPath;
-const source = path.resolve(root, '..', 'bin', 'code');
+let _source: string = null;
+function getSource(): string {
+	if (!_source) {
+		const root = URI.parse(require.toUrl('')).fsPath;
+		_source = path.resolve(root, '..', 'bin', 'code');
+	}
+	return _source;
+}
 
 function isAvailable(): TPromise<boolean> {
-	return pfs.exists(source);
+	return pfs.exists(getSource());
 }
 
 class InstallAction extends Action {
@@ -36,7 +46,9 @@ class InstallAction extends Action {
 	constructor(
 		id: string,
 		label: string,
-		@IMessageService private messageService: IMessageService
+		@INotificationService private notificationService: INotificationService,
+		@IChoiceService private choiceService: IChoiceService,
+		@ILogService private logService: ILogService
 	) {
 		super(id, label);
 	}
@@ -49,7 +61,7 @@ class InstallAction extends Action {
 		return isAvailable().then(isAvailable => {
 			if (!isAvailable) {
 				const message = nls.localize('not available', "This command is not available");
-				this.messageService.show(Severity.Info, message);
+				this.notificationService.info(message);
 				return undefined;
 			}
 
@@ -61,7 +73,7 @@ class InstallAction extends Action {
 						const createSymlink = () => {
 							return pfs.unlink(this.target)
 								.then(null, ignore('ENOENT'))
-								.then(() => pfs.symlink(source, this.target));
+								.then(() => pfs.symlink(getSource(), this.target));
 						};
 
 						return createSymlink().then(null, err => {
@@ -75,7 +87,8 @@ class InstallAction extends Action {
 					}
 				})
 				.then(() => {
-					this.messageService.show(Severity.Info, nls.localize('successIn', "Shell command '{0}' successfully installed in PATH.", product.applicationName));
+					this.logService.trace('cli#install', this.target);
+					this.notificationService.info(nls.localize('successIn', "Shell command '{0}' successfully installed in PATH.", product.applicationName));
 				});
 		});
 	}
@@ -84,27 +97,28 @@ class InstallAction extends Action {
 		return pfs.lstat(this.target)
 			.then(stat => stat.isSymbolicLink())
 			.then(() => pfs.readlink(this.target))
-			.then(link => link === source)
+			.then(link => link === getSource())
 			.then(null, ignore('ENOENT', false));
 	}
 
 	private createBinFolder(): TPromise<void> {
 		return new TPromise<void>((c, e) => {
-			const message = nls.localize('warnEscalation', "Code will now prompt with 'osascript' for Administrator privileges to install the shell command.");
-			const actions = [
-				new Action('ok', nls.localize('ok', "OK"), '', true, () => {
-					const command = 'osascript -e "do shell script \\"mkdir -p /usr/local/bin && chown \\" & (do shell script (\\"whoami\\")) & \\" /usr/local/bin\\" with administrator privileges"';
+			const choices: Choice[] = [nls.localize('ok', "OK"), nls.localize('cancel2', "Cancel")];
 
-					nfcall(cp.exec, command, {})
-						.then(null, _ => TPromise.wrapError(new Error(nls.localize('cantCreateBinFolder', "Unable to create '/usr/local/bin'."))))
-						.done(c, e);
+			this.choiceService.choose(Severity.Info, nls.localize('warnEscalation', "Code will now prompt with 'osascript' for Administrator privileges to install the shell command."), choices).then(choice => {
+				switch (choice) {
+					case 0 /* OK */:
+						const command = 'osascript -e "do shell script \\"mkdir -p /usr/local/bin && chown \\" & (do shell script (\\"whoami\\")) & \\" /usr/local/bin\\" with administrator privileges"';
 
-					return null;
-				}),
-				new Action('cancel2', nls.localize('cancel2', "Cancel"), '', true, () => { e(new Error(nls.localize('aborted', "Aborted"))); return null; })
-			];
-
-			this.messageService.show(Severity.Info, { message, actions });
+						nfcall(cp.exec, command, {})
+							.then(null, _ => TPromise.wrapError(new Error(nls.localize('cantCreateBinFolder', "Unable to create '/usr/local/bin'."))))
+							.done(c, e);
+						break;
+					case 1 /* Cancel */:
+						e(new Error(nls.localize('aborted', "Aborted")));
+						break;
+				}
+			});
 		});
 	}
 }
@@ -117,7 +131,8 @@ class UninstallAction extends Action {
 	constructor(
 		id: string,
 		label: string,
-		@IMessageService private messageService: IMessageService
+		@INotificationService private notificationService: INotificationService,
+		@ILogService private logService: ILogService
 	) {
 		super(id, label);
 	}
@@ -130,20 +145,21 @@ class UninstallAction extends Action {
 		return isAvailable().then(isAvailable => {
 			if (!isAvailable) {
 				const message = nls.localize('not available', "This command is not available");
-				this.messageService.show(Severity.Info, message);
+				this.notificationService.info(message);
 				return undefined;
 			}
 
 			return pfs.unlink(this.target)
 				.then(null, ignore('ENOENT'))
 				.then(() => {
-					this.messageService.show(Severity.Info, nls.localize('successFrom', "Shell command '{0}' successfully uninstalled from PATH.", product.applicationName));
+					this.logService.trace('cli#uninstall', this.target);
+					this.notificationService.info(nls.localize('successFrom', "Shell command '{0}' successfully uninstalled from PATH.", product.applicationName));
 				});
 		});
 	}
 }
 
-if (process.platform === 'darwin') {
+if (platform.isMacintosh) {
 	const category = nls.localize('shellCommand', "Shell Command");
 
 	const workbenchActionsRegistry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.ts b/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.ts
index bfc2994524a..a9e4ec6741e 100644
--- a/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.ts
+++ b/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.ts
@@ -82,10 +82,10 @@ class AccessibilityHelpWidget extends Widget implements IOverlayWidget {
 
 	constructor(
 		editor: ICodeEditor,
-		@IContextKeyService private _contextKeyService: IContextKeyService,
-		@IKeybindingService private _keybindingService: IKeybindingService,
-		@IConfigurationService private _configurationService: IConfigurationService,
-		@IOpenerService private _openerService: IOpenerService
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IOpenerService private readonly _openerService: IOpenerService
 	) {
 		super();
 
diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.ts b/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.ts
index fee6b3b5579..c87f3cc5a17 100644
--- a/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.ts
+++ b/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.ts
@@ -24,10 +24,9 @@ import { CharCode } from 'vs/base/common/charCode';
 import { findMatchingThemeRule } from 'vs/workbench/services/textMate/electron-browser/TMHelper';
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { Color } from 'vs/base/common/color';
-import { IMessageService } from 'vs/platform/message/common/message';
-import Severity from 'vs/base/common/severity';
 import { registerThemingParticipant, HIGH_CONTRAST } from 'vs/platform/theme/common/themeService';
 import { editorHoverBackground, editorHoverBorder } from 'vs/platform/theme/common/colorRegistry';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 class InspectTMScopesController extends Disposable implements IEditorContribution {
 
@@ -41,7 +40,7 @@ class InspectTMScopesController extends Disposable implements IEditorContributio
 	private _textMateService: ITextMateService;
 	private _themeService: IWorkbenchThemeService;
 	private _modeService: IModeService;
-	private _messageService: IMessageService;
+	private _notificationService: INotificationService;
 	private _widget: InspectTMScopesWidget;
 
 	constructor(
@@ -49,14 +48,14 @@ class InspectTMScopesController extends Disposable implements IEditorContributio
 		@ITextMateService textMateService: ITextMateService,
 		@IModeService modeService: IModeService,
 		@IWorkbenchThemeService themeService: IWorkbenchThemeService,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService
 	) {
 		super();
 		this._editor = editor;
 		this._textMateService = textMateService;
 		this._themeService = themeService;
 		this._modeService = modeService;
-		this._messageService = messageService;
+		this._notificationService = notificationService;
 		this._widget = null;
 
 		this._register(this._editor.onDidChangeModel((e) => this.stop()));
@@ -80,7 +79,7 @@ class InspectTMScopesController extends Disposable implements IEditorContributio
 		if (!this._editor.getModel()) {
 			return;
 		}
-		this._widget = new InspectTMScopesWidget(this._editor, this._textMateService, this._modeService, this._themeService, this._messageService);
+		this._widget = new InspectTMScopesWidget(this._editor, this._textMateService, this._modeService, this._themeService, this._notificationService);
 	}
 
 	public stop(): void {
@@ -179,7 +178,7 @@ class InspectTMScopesWidget extends Disposable implements IContentWidget {
 	private readonly _editor: ICodeEditor;
 	private readonly _modeService: IModeService;
 	private readonly _themeService: IWorkbenchThemeService;
-	private readonly _messageService: IMessageService;
+	private readonly _notificationService: INotificationService;
 	private readonly _model: ITextModel;
 	private readonly _domNode: HTMLElement;
 	private readonly _grammar: TPromise<IGrammar>;
@@ -189,14 +188,14 @@ class InspectTMScopesWidget extends Disposable implements IContentWidget {
 		textMateService: ITextMateService,
 		modeService: IModeService,
 		themeService: IWorkbenchThemeService,
-		messageService: IMessageService
+		notificationService: INotificationService
 	) {
 		super();
 		this._isDisposed = false;
 		this._editor = editor;
 		this._modeService = modeService;
 		this._themeService = themeService;
-		this._messageService = messageService;
+		this._notificationService = notificationService;
 		this._model = this._editor.getModel();
 		this._domNode = document.createElement('div');
 		this._domNode.className = 'tm-inspect-widget';
@@ -222,7 +221,7 @@ class InspectTMScopesWidget extends Disposable implements IContentWidget {
 		this._grammar.then(
 			(grammar) => this._compute(grammar, position),
 			(err) => {
-				this._messageService.show(Severity.Warning, err);
+				this._notificationService.warn(err);
 				setTimeout(() => {
 					InspectTMScopesController.get(this._editor).stop();
 				});
diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts b/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts
index 4925f696c31..5bd7aadbf2c 100644
--- a/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts
+++ b/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts
@@ -13,12 +13,11 @@ import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService
 import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { IMessageService } from 'vs/platform/message/common/message';
-import Severity from 'vs/base/common/severity';
 import URI from 'vs/base/common/uri';
 import { InternalEditorOptions, EDITOR_DEFAULTS } from 'vs/editor/common/config/editorOptions';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 const transientWordWrapState = 'transientWordWrapState';
 const isWordWrapMinifiedKey = 'isWordWrapMinified';
@@ -150,8 +149,8 @@ class ToggleWordWrapAction extends EditorAction {
 		const editorConfiguration = editor.getConfiguration();
 		if (editorConfiguration.wrappingInfo.inDiffEditor) {
 			// Cannot change wrapping settings inside the diff editor
-			const messageService = accessor.get(IMessageService);
-			messageService.show(Severity.Info, nls.localize('wordWrap.notInDiffEditor', "Cannot toggle word wrap in a diff editor."));
+			const notificationService = accessor.get(INotificationService);
+			notificationService.info(nls.localize('wordWrap.notInDiffEditor', "Cannot toggle word wrap in a diff editor."));
 			return;
 		}
 
diff --git a/src/vs/workbench/parts/debug/electron-browser/baseDebugView.ts b/src/vs/workbench/parts/debug/browser/baseDebugView.ts
similarity index 100%
rename from src/vs/workbench/parts/debug/electron-browser/baseDebugView.ts
rename to src/vs/workbench/parts/debug/browser/baseDebugView.ts
diff --git a/src/vs/workbench/parts/debug/browser/breakpointWidget.ts b/src/vs/workbench/parts/debug/browser/breakpointWidget.ts
index 4c57aa11630..3db1596b06c 100644
--- a/src/vs/workbench/parts/debug/browser/breakpointWidget.ts
+++ b/src/vs/workbench/parts/debug/browser/breakpointWidget.ts
@@ -131,7 +131,7 @@ export class BreakpointWidget extends ZoneWidget {
 								hitCondition,
 								verified: oldBreakpoint.verified
 							}
-						});
+						}, false);
 					} else {
 						this.debugService.addBreakpoints(uri, [{
 							lineNumber: this.lineNumber,
diff --git a/src/vs/workbench/parts/debug/electron-browser/breakpointsView.ts b/src/vs/workbench/parts/debug/browser/breakpointsView.ts
similarity index 81%
rename from src/vs/workbench/parts/debug/electron-browser/breakpointsView.ts
rename to src/vs/workbench/parts/debug/browser/breakpointsView.ts
index 58878dbf3df..3d2743d7513 100644
--- a/src/vs/workbench/parts/debug/electron-browser/breakpointsView.ts
+++ b/src/vs/workbench/parts/debug/browser/breakpointsView.ts
@@ -33,6 +33,7 @@ import { ViewsViewletPanel, IViewletViewOptions } from 'vs/workbench/browser/par
 import { attachInputBoxStyler } from 'vs/platform/theme/common/styler';
 import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 
 const $ = dom.$;
 
@@ -69,7 +70,7 @@ export class BreakpointsView extends ViewsViewletPanel {
 		this.list = this.instantiationService.createInstance(WorkbenchList, container, delegate, [
 			this.instantiationService.createInstance(BreakpointsRenderer),
 			new ExceptionBreakpointsRenderer(this.debugService),
-			new FunctionBreakpointsRenderer(this.debugService),
+			this.instantiationService.createInstance(FunctionBreakpointsRenderer),
 			new FunctionBreakpointInputRenderer(this.debugService, this.contextViewService, this.themeService)
 		], {
 				identityProvider: element => element.getId(),
@@ -243,7 +244,11 @@ interface IBaseBreakpointTemplateData {
 	toDispose: IDisposable[];
 }
 
-interface IBreakpointTemplateData extends IBaseBreakpointTemplateData {
+interface IBaseBreakpointWithIconTemplateData extends IBaseBreakpointTemplateData {
+	icon: HTMLElement;
+}
+
+interface IBreakpointTemplateData extends IBaseBreakpointWithIconTemplateData {
 	lineNumber: HTMLElement;
 	filePath: HTMLElement;
 }
@@ -260,7 +265,8 @@ class BreakpointsRenderer implements IRenderer<IBreakpoint, IBreakpointTemplateD
 	constructor(
 		@IDebugService private debugService: IDebugService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
-		@IEnvironmentService private environmentService: IEnvironmentService
+		@IEnvironmentService private environmentService: IEnvironmentService,
+		@ITextFileService private textFileService: ITextFileService
 	) {
 		// noop
 	}
@@ -275,6 +281,7 @@ class BreakpointsRenderer implements IRenderer<IBreakpoint, IBreakpointTemplateD
 		const data: IBreakpointTemplateData = Object.create(null);
 		data.breakpoint = dom.append(container, $('.breakpoint'));
 
+		data.icon = $('.icon');
 		data.checkbox = <HTMLInputElement>$('input');
 		data.checkbox.type = 'checkbox';
 		data.toDispose = [];
@@ -282,6 +289,7 @@ class BreakpointsRenderer implements IRenderer<IBreakpoint, IBreakpointTemplateD
 			this.debugService.enableOrDisableBreakpoints(!data.context.enabled, data.context);
 		}));
 
+		dom.append(data.breakpoint, data.icon);
 		dom.append(data.breakpoint, data.checkbox);
 
 		data.name = dom.append(data.breakpoint, $('span.name'));
@@ -305,6 +313,10 @@ class BreakpointsRenderer implements IRenderer<IBreakpoint, IBreakpointTemplateD
 		data.filePath.textContent = getPathLabel(resources.dirname(breakpoint.uri), this.contextService, this.environmentService);
 		data.checkbox.checked = breakpoint.enabled;
 
+		const { message, className } = getBreakpointMessageAndClassName(this.debugService, this.textFileService, breakpoint);
+		data.icon.className = className + ' icon';
+		data.icon.title = message ? message : '';
+
 		const debugActive = this.debugService.state === State.Running || this.debugService.state === State.Stopped;
 		if (debugActive && !breakpoint.verified) {
 			dom.addClass(data.breakpoint, 'disabled');
@@ -366,10 +378,11 @@ class ExceptionBreakpointsRenderer implements IRenderer<IExceptionBreakpoint, IB
 	}
 }
 
-class FunctionBreakpointsRenderer implements IRenderer<IFunctionBreakpoint, IBaseBreakpointTemplateData> {
+class FunctionBreakpointsRenderer implements IRenderer<FunctionBreakpoint, IBaseBreakpointWithIconTemplateData> {
 
 	constructor(
-		private debugService: IDebugService
+		@IDebugService private debugService: IDebugService,
+		@ITextFileService private textFileService: ITextFileService
 	) {
 		// noop
 	}
@@ -380,10 +393,11 @@ class FunctionBreakpointsRenderer implements IRenderer<IFunctionBreakpoint, IBas
 		return FunctionBreakpointsRenderer.ID;
 	}
 
-	renderTemplate(container: HTMLElement): IBaseBreakpointTemplateData {
+	renderTemplate(container: HTMLElement): IBaseBreakpointWithIconTemplateData {
 		const data: IBreakpointTemplateData = Object.create(null);
 		data.breakpoint = dom.append(container, $('.breakpoint'));
 
+		data.icon = $('.icon');
 		data.checkbox = <HTMLInputElement>$('input');
 		data.checkbox.type = 'checkbox';
 		data.toDispose = [];
@@ -391,6 +405,7 @@ class FunctionBreakpointsRenderer implements IRenderer<IFunctionBreakpoint, IBas
 			this.debugService.enableOrDisableBreakpoints(!data.context.enabled, data.context);
 		}));
 
+		dom.append(data.breakpoint, data.icon);
 		dom.append(data.breakpoint, data.checkbox);
 
 		data.name = dom.append(data.breakpoint, $('span.name'));
@@ -398,9 +413,12 @@ class FunctionBreakpointsRenderer implements IRenderer<IFunctionBreakpoint, IBas
 		return data;
 	}
 
-	renderElement(functionBreakpoint: IFunctionBreakpoint, index: number, data: IBaseBreakpointTemplateData): void {
+	renderElement(functionBreakpoint: FunctionBreakpoint, index: number, data: IBaseBreakpointWithIconTemplateData): void {
 		data.context = functionBreakpoint;
 		data.name.textContent = functionBreakpoint.name;
+		const { className, message } = getBreakpointMessageAndClassName(this.debugService, this.textFileService, functionBreakpoint);
+		data.icon.className = className + ' icon';
+		data.icon.title = message ? message : '';
 		data.checkbox.checked = functionBreakpoint.enabled;
 		data.breakpoint.title = functionBreakpoint.name;
 
@@ -412,7 +430,7 @@ class FunctionBreakpointsRenderer implements IRenderer<IFunctionBreakpoint, IBas
 		}
 	}
 
-	disposeTemplate(templateData: IBaseBreakpointTemplateData): void {
+	disposeTemplate(templateData: IBaseBreakpointWithIconTemplateData): void {
 		dispose(templateData.toDispose);
 	}
 }
@@ -514,3 +532,78 @@ export function openBreakpointSource(breakpoint: Breakpoint, sideBySide: boolean
 		}
 	}, sideBySide);
 }
+
+export function getBreakpointMessageAndClassName(debugService: IDebugService, textFileService: ITextFileService, breakpoint: IBreakpoint | FunctionBreakpoint): { message?: string, className: string } {
+	const state = debugService.state;
+	const debugActive = state === State.Running || state === State.Stopped;
+
+	if (!breakpoint.enabled || !debugService.getModel().areBreakpointsActivated()) {
+		return {
+			className: 'debug-breakpoint-disabled-glyph',
+			message: nls.localize('breakpointDisabledHover', "Disabled Breakpoint"),
+		};
+	}
+
+	const appendMessage = (text: string): string => {
+		return !(breakpoint instanceof FunctionBreakpoint) && breakpoint.message ? text.concat(breakpoint.message) : text;
+	};
+	if (debugActive && !breakpoint.verified) {
+		return {
+			className: 'debug-breakpoint-unverified-glyph',
+			message: appendMessage(nls.localize('breakpointUnverifieddHover', "Unverified Breakpoint")),
+		};
+	}
+
+	const process = debugService.getViewModel().focusedProcess;
+	if (breakpoint instanceof FunctionBreakpoint) {
+		if (process && !process.session.capabilities.supportsFunctionBreakpoints) {
+			return {
+				className: 'debug-breakpoint-unsupported-glyph',
+				message: nls.localize('functionBreakpointUnsupported', "Function breakpoints not supported by this debug type"),
+			};
+		}
+
+		return {
+			className: 'debug-breakpoint-glyph',
+		};
+	}
+
+	if (debugActive && textFileService.isDirty(breakpoint.uri)) {
+		return {
+			className: 'debug-breakpoint-unverified-glyph',
+			message: appendMessage(nls.localize('breakpointDirtydHover', "Unverified breakpoint. File is modified, please restart debug session.")),
+		};
+	}
+
+	if (breakpoint.condition || breakpoint.hitCondition) {
+		if (process && breakpoint.condition && !process.session.capabilities.supportsConditionalBreakpoints) {
+			return {
+				className: 'debug-breakpoint-unsupported-glyph',
+				message: nls.localize('conditionalBreakpointUnsupported', "Conditional breakpoints not supported by this debug type"),
+			};
+		}
+		if (process && breakpoint.hitCondition && !process.session.capabilities.supportsHitConditionalBreakpoints) {
+			return {
+				className: 'debug-breakpoint-unsupported-glyph',
+				message: nls.localize('hitBreakpointUnsupported', "Hit conditional breakpoints not supported by this debug type"),
+			};
+		}
+
+		if (breakpoint.condition && breakpoint.hitCondition) {
+			return {
+				className: 'debug-breakpoint-conditional-glyph',
+				message: appendMessage(`Expression: ${breakpoint.condition}\nHitCount: ${breakpoint.hitCondition}`)
+			};
+		}
+
+		return {
+			className: 'debug-breakpoint-conditional-glyph',
+			message: appendMessage(breakpoint.condition ? breakpoint.condition : breakpoint.hitCondition)
+		};
+	}
+
+	return {
+		className: 'debug-breakpoint-glyph',
+		message: breakpoint.message
+	};
+}
diff --git a/src/vs/workbench/parts/debug/browser/debugActionItems.ts b/src/vs/workbench/parts/debug/browser/debugActionItems.ts
index 4d6367248ac..14ab35e5986 100644
--- a/src/vs/workbench/parts/debug/browser/debugActionItems.ts
+++ b/src/vs/workbench/parts/debug/browser/debugActionItems.ts
@@ -156,7 +156,7 @@ export class StartDebugActionItem implements IActionItem {
 		const manager = this.debugService.getConfigurationManager();
 		const launches = manager.getLaunches();
 		const inWorkspace = this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE;
-		manager.getLaunches().forEach(launch =>
+		launches.forEach(launch =>
 			launch.getConfigurationNames().forEach(name => {
 				if (name === manager.selectedConfiguration.name && launch === manager.selectedConfiguration.launch) {
 					this.selected = this.options.length;
diff --git a/src/vs/workbench/parts/debug/browser/debugActions.ts b/src/vs/workbench/parts/debug/browser/debugActions.ts
index 8cbe0a6d287..92812bd6b07 100644
--- a/src/vs/workbench/parts/debug/browser/debugActions.ts
+++ b/src/vs/workbench/parts/debug/browser/debugActions.ts
@@ -6,14 +6,12 @@
 import * as nls from 'vs/nls';
 import { Action } from 'vs/base/common/actions';
 import * as lifecycle from 'vs/base/common/lifecycle';
-import severity from 'vs/base/common/severity';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IFileService } from 'vs/platform/files/common/files';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { IDebugService, State, IProcess, IThread, IEnablement, IBreakpoint, IStackFrame, IDebugEditorContribution, EDITOR_CONTRIBUTION_ID, IExpression, REPL_ID, ProcessState }
 	from 'vs/workbench/parts/debug/common/debug';
 import { Variable, Expression, Thread, Breakpoint, Process } from 'vs/workbench/parts/debug/common/debugModel';
@@ -22,6 +20,7 @@ import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { TogglePanelAction } from 'vs/workbench/browser/panel';
 import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export abstract class AbstractDebugAction extends Action {
 
@@ -77,7 +76,7 @@ export class ConfigureAction extends AbstractDebugAction {
 	constructor(id: string, label: string,
 		@IDebugService debugService: IDebugService,
 		@IKeybindingService keybindingService: IKeybindingService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService
 	) {
 		super(id, label, 'debug-action configure', debugService, keybindingService);
@@ -99,7 +98,7 @@ export class ConfigureAction extends AbstractDebugAction {
 
 	public run(event?: any): TPromise<any> {
 		if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
-			this.messageService.show(severity.Info, nls.localize('noFolderDebugConfig', "Please first open a folder in order to do advanced debug configuration."));
+			this.notificationService.info(nls.localize('noFolderDebugConfig', "Please first open a folder in order to do advanced debug configuration."));
 			return TPromise.as(null);
 		}
 
@@ -126,7 +125,7 @@ export class StartAction extends AbstractDebugAction {
 
 	public run(): TPromise<any> {
 		const launch = this.debugService.getConfigurationManager().selectedConfiguration.launch;
-		return this.debugService.startDebugging(launch ? launch.workspace : undefined, undefined, this.isNoDebug());
+		return this.debugService.startDebugging(launch, undefined, this.isNoDebug());
 	}
 
 	protected isNoDebug(): boolean {
diff --git a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
index 313156f9059..43fed391592 100644
--- a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
+++ b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
@@ -3,11 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!vs/workbench/parts/debug/browser/media/debugActionsWidget';
+import 'vs/css!./media/debugActionsWidget';
 import * as errors from 'vs/base/common/errors';
 import * as strings from 'vs/base/common/strings';
 import * as browser from 'vs/base/browser/browser';
-import severity from 'vs/base/common/severity';
 import * as builder from 'vs/base/browser/builder';
 import * as dom from 'vs/base/browser/dom';
 import * as arrays from 'vs/base/common/arrays';
@@ -21,7 +20,6 @@ import { AbstractDebugAction, PauseAction, ContinueAction, StepBackAction, Rever
 import { FocusProcessActionItem } from 'vs/workbench/parts/debug/browser/debugActionItems';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { Themable } from 'vs/workbench/common/theme';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
@@ -30,6 +28,7 @@ import { localize } from 'vs/nls';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 const $ = builder.$;
 const DEBUG_ACTIONS_WIDGET_POSITION_KEY = 'debug.actionswidgetposition';
@@ -57,7 +56,7 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 	private isBuilt: boolean;
 
 	constructor(
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IDebugService private debugService: IDebugService,
 		@IPartService private partService: IPartService,
@@ -104,7 +103,7 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 		this.toUnbind.push(this.actionBar.actionRunner.onDidRun((e: IRunEvent) => {
 			// check for error
 			if (e.error && !errors.isPromiseCanceledError(e.error)) {
-				this.messageService.show(severity.Error, e.error);
+				this.notificationService.error(e.error);
 			}
 
 			// log in telemetry
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugCommands.ts b/src/vs/workbench/parts/debug/browser/debugCommands.ts
similarity index 95%
rename from src/vs/workbench/parts/debug/electron-browser/debugCommands.ts
rename to src/vs/workbench/parts/debug/browser/debugCommands.ts
index 889506d01c5..5ac2740a954 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugCommands.ts
+++ b/src/vs/workbench/parts/debug/browser/debugCommands.ts
@@ -6,12 +6,10 @@
 import * as nls from 'vs/nls';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { TPromise } from 'vs/base/common/winjs.base';
-import severity from 'vs/base/common/severity';
 import { List } from 'vs/base/browser/ui/list/listWidget';
 import * as errors from 'vs/base/common/errors';
 import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IListService } from 'vs/platform/list/browser/listService';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IDebugService, IEnablement, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_VARIABLES_FOCUSED, EDITOR_CONTRIBUTION_ID, IDebugEditorContribution, CONTEXT_IN_DEBUG_MODE, CONTEXT_NOT_IN_DEBUG_REPL, CONTEXT_EXPRESSION_SELECTED } from 'vs/workbench/parts/debug/common/debug';
 import { Expression, Variable, Breakpoint, FunctionBreakpoint } from 'vs/workbench/parts/debug/common/debugModel';
@@ -23,7 +21,8 @@ import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { openBreakpointSource } from 'vs/workbench/parts/debug/electron-browser/breakpointsView';
+import { openBreakpointSource } from 'vs/workbench/parts/debug/browser/breakpointsView';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export function registerCommands(): void {
 
@@ -156,7 +155,7 @@ export function registerCommands(): void {
 		handler: (accessor, launchUri: string) => {
 			const manager = accessor.get(IDebugService).getConfigurationManager();
 			if (accessor.get(IWorkspaceContextService).getWorkbenchState() === WorkbenchState.EMPTY) {
-				accessor.get(IMessageService).show(severity.Info, nls.localize('noFolderDebugConfig', "Please first open a folder in order to do advanced debug configuration."));
+				accessor.get(INotificationService).info(nls.localize('noFolderDebugConfig', "Please first open a folder in order to do advanced debug configuration."));
 				return TPromise.as(null);
 			}
 			const launch = manager.getLaunches().filter(l => l.uri.toString() === launchUri).pop() || manager.selectedConfiguration.launch;
diff --git a/src/vs/workbench/parts/debug/browser/debugContentProvider.ts b/src/vs/workbench/parts/debug/browser/debugContentProvider.ts
index c1ff118d0e0..90cd905c6ca 100644
--- a/src/vs/workbench/parts/debug/browser/debugContentProvider.ts
+++ b/src/vs/workbench/parts/debug/browser/debugContentProvider.ts
@@ -73,20 +73,24 @@ export class DebugContentProvider implements IWorkbenchContribution, ITextModelC
 			};
 		}
 
+		const createErrModel = (message: string) => {
+			this.debugService.sourceIsNotAvailable(resource);
+			const modePromise = this.modeService.getOrCreateMode(MIME_TEXT);
+			const model = this.modelService.createModel(message, modePromise, resource);
+
+			return model;
+		};
+
 		return process.session.source({ sourceReference: sourceRef, source: rawSource }).then(response => {
+			if (!response) {
+				return createErrModel(localize('canNotResolveSource', "Could not resolve resource {0}, no response from debug extension.", resource.toString()));
+			}
 
 			const mime = response.body.mimeType || guessMimeTypes(resource.path)[0];
 			const modePromise = this.modeService.getOrCreateMode(mime);
 			const model = this.modelService.createModel(response.body.content, modePromise, resource);
 
 			return model;
-		}, (err: DebugProtocol.ErrorResponse) => {
-
-			this.debugService.sourceIsNotAvailable(resource);
-			const modePromise = this.modeService.getOrCreateMode(MIME_TEXT);
-			const model = this.modelService.createModel(err.message, modePromise, resource);
-
-			return model;
-		});
+		}, (err: DebugProtocol.ErrorResponse) => createErrModel(err.message));
 	}
 }
diff --git a/src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts b/src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts
index 8ff1397423b..d4955347dae 100644
--- a/src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts
+++ b/src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts
@@ -3,8 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as objects from 'vs/base/common/objects';
 import * as lifecycle from 'vs/base/common/lifecycle';
 import { Constants } from 'vs/editor/common/core/uint';
 import { Range } from 'vs/editor/common/core/range';
@@ -13,6 +11,8 @@ import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IDebugService, IBreakpoint, State } from 'vs/workbench/parts/debug/common/debug';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { MarkdownString } from 'vs/base/common/htmlContent';
+import { getBreakpointMessageAndClassName } from 'vs/workbench/parts/debug/browser/breakpointsView';
+import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 
 interface IBreakpointDecoration {
 	decorationId: string;
@@ -25,22 +25,20 @@ interface IDebugEditorModelData {
 	toDispose: lifecycle.IDisposable[];
 	breakpointDecorations: IBreakpointDecoration[];
 	currentStackDecorations: string[];
-	dirty: boolean;
 	topStackFrameRange: Range;
 }
 
-const stickiness = TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges;
-
 export class DebugEditorModelManager implements IWorkbenchContribution {
 	static readonly ID = 'breakpointManager';
-
+	static readonly STICKINESS = TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges;
 	private modelDataMap: Map<string, IDebugEditorModelData>;
 	private toDispose: lifecycle.IDisposable[];
 	private ignoreDecorationsChangedEvent: boolean;
 
 	constructor(
 		@IModelService private modelService: IModelService,
-		@IDebugService private debugService: IDebugService
+		@IDebugService private debugService: IDebugService,
+		@ITextFileService private textFileService: ITextFileService
 	) {
 		this.modelDataMap = new Map<string, IDebugEditorModelData>();
 		this.toDispose = [];
@@ -68,7 +66,6 @@ export class DebugEditorModelManager implements IWorkbenchContribution {
 		this.toDispose.push(this.debugService.onDidChangeState(state => {
 			if (state === State.Inactive) {
 				this.modelDataMap.forEach(modelData => {
-					modelData.dirty = false;
 					modelData.topStackFrameRange = undefined;
 				});
 			}
@@ -89,7 +86,6 @@ export class DebugEditorModelManager implements IWorkbenchContribution {
 			toDispose: toDispose,
 			breakpointDecorations: breakpointDecorationIds.map((decorationId, index) => ({ decorationId, modelId: breakpoints[index].getId(), range: desiredDecorations[index].range })),
 			currentStackDecorations: currentStackDecorations,
-			dirty: false,
 			topStackFrameRange: undefined
 		});
 	}
@@ -220,9 +216,8 @@ export class DebugEditorModelManager implements IWorkbenchContribution {
 				}
 			}
 		}
-		modelData.dirty = this.debugService.state !== State.Inactive;
 
-		this.debugService.updateBreakpoints(modelUri, data);
+		this.debugService.updateBreakpoints(modelUri, data, true);
 	}
 
 	private onBreakpointsChange(): void {
@@ -283,106 +278,52 @@ export class DebugEditorModelManager implements IWorkbenchContribution {
 	}
 
 	private getBreakpointDecorationOptions(breakpoint: IBreakpoint): IModelDecorationOptions {
-		const activated = this.debugService.getModel().areBreakpointsActivated();
-		const state = this.debugService.state;
-		const debugActive = state === State.Running || state === State.Stopped;
-		const modelData = this.modelDataMap.get(breakpoint.uri.toString());
+		const { className, message } = getBreakpointMessageAndClassName(this.debugService, this.textFileService, breakpoint);
+		let glyphMarginHoverMessage: MarkdownString;
 
-		let result = (!breakpoint.enabled || !activated) ? DebugEditorModelManager.BREAKPOINT_DISABLED_DECORATION :
-			debugActive && modelData && modelData.dirty && !breakpoint.verified ? DebugEditorModelManager.BREAKPOINT_DIRTY_DECORATION :
-				debugActive && !breakpoint.verified ? DebugEditorModelManager.BREAKPOINT_UNVERIFIED_DECORATION :
-					!breakpoint.condition && !breakpoint.hitCondition ? DebugEditorModelManager.BREAKPOINT_DECORATION : null;
-
-		if (result) {
-			result = objects.deepClone(result);
-			if (breakpoint.message) {
-				result.glyphMarginHoverMessage = new MarkdownString().appendText(breakpoint.message);
+		if (message) {
+			if (breakpoint.condition || breakpoint.hitCondition) {
+				const modelData = this.modelDataMap.get(breakpoint.uri.toString());
+				const modeId = modelData ? modelData.model.getLanguageIdentifier().language : '';
+				glyphMarginHoverMessage = new MarkdownString().appendCodeblock(modeId, message);
+			} else {
+				glyphMarginHoverMessage = new MarkdownString().appendText(message);
 			}
-			if (breakpoint.column) {
-				result.beforeContentClassName = `debug-breakpoint-column ${result.glyphMarginClassName}-column`;
-			}
-
-			return result;
 		}
 
-		const process = this.debugService.getViewModel().focusedProcess;
-		if (process && !process.session.capabilities.supportsConditionalBreakpoints) {
-			return DebugEditorModelManager.BREAKPOINT_UNSUPPORTED_DECORATION;
-		}
-
-		const modeId = modelData ? modelData.model.getLanguageIdentifier().language : '';
-		let condition: string;
-		if (breakpoint.condition && breakpoint.hitCondition) {
-			condition = `Expression: ${breakpoint.condition}\nHitCount: ${breakpoint.hitCondition}`;
-		} else {
-			condition = breakpoint.condition ? breakpoint.condition : breakpoint.hitCondition;
-		}
-		const glyphMarginHoverMessage = new MarkdownString().appendCodeblock(modeId, condition);
-		const glyphMarginClassName = 'debug-breakpoint-conditional-glyph';
-		const beforeContentClassName = breakpoint.column ? `debug-breakpoint-column ${glyphMarginClassName}-column` : undefined;
-
 		return {
-			glyphMarginClassName,
+			glyphMarginClassName: className,
 			glyphMarginHoverMessage,
-			stickiness,
-			beforeContentClassName
+			stickiness: DebugEditorModelManager.STICKINESS,
+			beforeContentClassName: breakpoint.column ? `debug-breakpoint-column ${className}-column` : undefined
 		};
 	}
 
 	// editor decorations
 
-	private static BREAKPOINT_DECORATION: IModelDecorationOptions = {
-		glyphMarginClassName: 'debug-breakpoint-glyph',
-		stickiness
-	};
-
-	private static BREAKPOINT_DISABLED_DECORATION: IModelDecorationOptions = {
-		glyphMarginClassName: 'debug-breakpoint-disabled-glyph',
-		glyphMarginHoverMessage: new MarkdownString().appendText(nls.localize('breakpointDisabledHover', "Disabled Breakpoint")),
-		stickiness
-	};
-
-	private static BREAKPOINT_UNVERIFIED_DECORATION: IModelDecorationOptions = {
-		glyphMarginClassName: 'debug-breakpoint-unverified-glyph',
-		glyphMarginHoverMessage: new MarkdownString().appendText(nls.localize('breakpointUnverifieddHover', "Unverified Breakpoint")),
-		stickiness
-	};
-
-	private static BREAKPOINT_DIRTY_DECORATION: IModelDecorationOptions = {
-		glyphMarginClassName: 'debug-breakpoint-unverified-glyph',
-		glyphMarginHoverMessage: new MarkdownString().appendText(nls.localize('breakpointDirtydHover', "Unverified breakpoint. File is modified, please restart debug session.")),
-		stickiness
-	};
-
-	private static BREAKPOINT_UNSUPPORTED_DECORATION: IModelDecorationOptions = {
-		glyphMarginClassName: 'debug-breakpoint-unsupported-glyph',
-		glyphMarginHoverMessage: new MarkdownString().appendText(nls.localize('breakpointUnsupported', "Conditional breakpoints not supported by this debug type")),
-		stickiness
-	};
-
 	// we need a separate decoration for glyph margin, since we do not want it on each line of a multi line statement.
 	private static TOP_STACK_FRAME_MARGIN: IModelDecorationOptions = {
 		glyphMarginClassName: 'debug-top-stack-frame-glyph',
-		stickiness
+		stickiness: DebugEditorModelManager.STICKINESS
 	};
 
 	private static FOCUSED_STACK_FRAME_MARGIN: IModelDecorationOptions = {
 		glyphMarginClassName: 'debug-focused-stack-frame-glyph',
-		stickiness
+		stickiness: DebugEditorModelManager.STICKINESS
 	};
 
 	private static TOP_STACK_FRAME_DECORATION: IModelDecorationOptions = {
 		isWholeLine: true,
 		inlineClassName: 'debug-remove-token-colors',
 		className: 'debug-top-stack-frame-line',
-		stickiness
+		stickiness: DebugEditorModelManager.STICKINESS
 	};
 
 	private static TOP_STACK_FRAME_EXCEPTION_DECORATION: IModelDecorationOptions = {
 		isWholeLine: true,
 		inlineClassName: 'debug-remove-token-colors',
 		className: 'debug-top-stack-frame-exception-line',
-		stickiness
+		stickiness: DebugEditorModelManager.STICKINESS
 	};
 
 	private static TOP_STACK_FRAME_INLINE_DECORATION: IModelDecorationOptions = {
@@ -393,6 +334,6 @@ export class DebugEditorModelManager implements IWorkbenchContribution {
 		isWholeLine: true,
 		inlineClassName: 'debug-remove-token-colors',
 		className: 'debug-focused-stack-frame-line',
-		stickiness
+		stickiness: DebugEditorModelManager.STICKINESS
 	};
 }
diff --git a/src/vs/workbench/parts/debug/browser/debugQuickOpen.ts b/src/vs/workbench/parts/debug/browser/debugQuickOpen.ts
index c75ddf12c13..e9e32b77180 100644
--- a/src/vs/workbench/parts/debug/browser/debugQuickOpen.ts
+++ b/src/vs/workbench/parts/debug/browser/debugQuickOpen.ts
@@ -15,8 +15,7 @@ import * as errors from 'vs/base/common/errors';
 import { QuickOpenEntry, QuickOpenEntryGroup } from 'vs/base/parts/quickopen/browser/quickOpenModel';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { StartAction } from 'vs/workbench/parts/debug/browser/debugActions';
-import { IMessageService } from 'vs/platform/message/common/message';
-import { Severity } from 'vs/workbench/services/message/browser/messageList';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 class AddConfigEntry extends Model.QuickOpenEntry {
 
@@ -48,7 +47,7 @@ class AddConfigEntry extends Model.QuickOpenEntry {
 
 class StartDebugEntry extends Model.QuickOpenEntry {
 
-	constructor(private debugService: IDebugService, private contextService: IWorkspaceContextService, private messageService: IMessageService, private launch: ILaunch, private configurationName: string, highlights: Model.IHighlight[] = []) {
+	constructor(private debugService: IDebugService, private contextService: IWorkspaceContextService, private notificationService: INotificationService, private launch: ILaunch, private configurationName: string, highlights: Model.IHighlight[] = []) {
 		super(highlights);
 	}
 
@@ -70,7 +69,7 @@ class StartDebugEntry extends Model.QuickOpenEntry {
 		}
 		// Run selected debug configuration
 		this.debugService.getConfigurationManager().selectConfiguration(this.launch, this.configurationName);
-		this.debugService.startDebugging(this.launch.workspace).done(undefined, e => this.messageService.show(Severity.Error, e));
+		this.debugService.startDebugging(this.launch).done(undefined, e => this.notificationService.error(e));
 
 		return true;
 	}
@@ -85,7 +84,7 @@ export class DebugQuickOpenHandler extends Quickopen.QuickOpenHandler {
 		@IDebugService private debugService: IDebugService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@ICommandService private commandService: ICommandService,
-		@IMessageService private messageService: IMessageService
+		@INotificationService private notificationService: INotificationService
 	) {
 		super();
 	}
@@ -106,7 +105,7 @@ export class DebugQuickOpenHandler extends Quickopen.QuickOpenHandler {
 					if (launch === configManager.selectedConfiguration.launch && config === configManager.selectedConfiguration.name) {
 						this.autoFocusIndex = configurations.length;
 					}
-					configurations.push(new StartDebugEntry(this.debugService, this.contextService, this.messageService, launch, config, highlights));
+					configurations.push(new StartDebugEntry(this.debugService, this.contextService, this.notificationService, launch, config, highlights));
 				});
 		}
 		launches.filter(l => !l.hidden).forEach((l, index) => {
diff --git a/src/vs/workbench/parts/debug/browser/media/debug.contribution.css b/src/vs/workbench/parts/debug/browser/media/debug.contribution.css
index a6318e82a30..a6e9d4c0ef3 100644
--- a/src/vs/workbench/parts/debug/browser/media/debug.contribution.css
+++ b/src/vs/workbench/parts/debug/browser/media/debug.contribution.css
@@ -14,7 +14,7 @@
 }
 
 .monaco-editor .debug-top-stack-frame-range {
-	background: #ffeca0;
+	background: rgba(255, 255, 102, 0.6);
 }
 
 .monaco-editor .debug-top-stack-frame-column::before {
@@ -29,16 +29,16 @@
 	background: rgba(206, 231, 206, 1);
 }
 
-.monaco-editor .debug-breakpoint-hint-glyph {
+.debug-breakpoint-hint-glyph {
 	background: url('breakpoint-hint.svg') center center no-repeat;
 }
 
-.monaco-editor .debug-breakpoint-disabled-glyph,
+.debug-breakpoint-disabled-glyph,
 .monaco-editor .debug-breakpoint-column.debug-breakpoint-disabled-glyph-column::before {
 	background: url('breakpoint-disabled.svg') center center no-repeat;
 }
 
-.monaco-editor .debug-breakpoint-unverified-glyph,
+.debug-breakpoint-unverified-glyph,
 .monaco-editor .debug-breakpoint-column.debug-breakpoint-unverified-glyph-column::before {
 	background: url('breakpoint-unverified.svg') center center no-repeat;
 }
@@ -51,7 +51,7 @@
 	background: url('stackframe-arrow.svg') center center no-repeat;
 }
 
-.monaco-editor .debug-breakpoint-glyph,
+.debug-breakpoint-glyph,
 .monaco-editor .debug-breakpoint-column.debug-breakpoint-glyph-column::before {
 	background: url('breakpoint.svg') center center no-repeat;
 }
@@ -68,12 +68,12 @@
 	background-position: initial !important;
 }
 
-.monaco-editor .debug-breakpoint-conditional-glyph,
+.debug-breakpoint-conditional-glyph,
 .monaco-editor .debug-breakpoint-column.debug-breakpoint-conditional-glyph-column::before {
 	background: url('breakpoint-conditional.svg') center center no-repeat;
 }
 
-.monaco-editor .debug-breakpoint-unsupported-glyph,
+.debug-breakpoint-unsupported-glyph,
 .monaco-editor .debug-breakpoint-column.debug-breakpoint-unsupported-glyph-column::before {
 	background: url('breakpoint-unsupported.svg') center center no-repeat;
 }
@@ -233,27 +233,27 @@
 	background-color: rgba(255, 255, 0, 0.3)
 }
 
-.monaco-editor.vs-dark .debug-breakpoint-glyph,
+.vs-dark .debug-breakpoint-glyph,
 .monaco-editor.vs-dark .debug-breakpoint-column.debug-breakpoint-glyph-column::before {
 	background: url('breakpoint-dark.svg') center center no-repeat;
 }
 
-.monaco-editor.vs-dark .debug-breakpoint-conditional-glyph,
+.vs-dark .debug-breakpoint-conditional-glyph,
 .monaco-editor.vs-dark .debug-breakpoint-column.debug-breakpoint-conditional-glyph-column::before {
 	background: url('breakpoint-conditional-dark.svg') center center no-repeat;
 }
 
-.monaco-editor.vs-dark .debug-breakpoint-unsupported-glyph,
+.vs-dark .debug-breakpoint-unsupported-glyph,
 .monaco-editor.vs-dark .debug-breakpoint-column.debug-breakpoint-unsupported-glyph-column::before {
 	background: url('breakpoint-unsupported-dark.svg') center center no-repeat;
 }
 
-.monaco-editor.vs-dark .debug-breakpoint-disabled-glyph,
+.vs-dark .debug-breakpoint-disabled-glyph,
 .monaco-editor.vs-dark .debug-breakpoint-column.debug-breakpoint-disabled-glyph-column::before {
 	background: url('breakpoint-disabled-dark.svg') center center no-repeat;
 }
 
-.monaco-editor.vs-dark .debug-breakpoint-unverified-glyph,
+.vs-dark .debug-breakpoint-unverified-glyph,
 .monaco-editor.vs-dark .debug-breakpoint-column.debug-breakpoint-unverified-glyph-column::before {
 	background: url('breakpoint-unverified-dark.svg') center center no-repeat;
 }
diff --git a/src/vs/workbench/parts/debug/browser/media/debugViewlet.css b/src/vs/workbench/parts/debug/browser/media/debugViewlet.css
index 355de7ae222..e195fb3893e 100644
--- a/src/vs/workbench/parts/debug/browser/media/debugViewlet.css
+++ b/src/vs/workbench/parts/debug/browser/media/debugViewlet.css
@@ -348,7 +348,11 @@
 
 /* Breakpoints */
 
-.debug-viewlet .debug-breakpoints .monaco-list-row {
+.debug-viewlet .debug-breakpoints .monaco-list-row .breakpoint {
+	padding-left: 2px;
+}
+
+.debug-viewlet .debug-breakpoints .breakpoint.exception {
 	padding-left: 20px;
 }
 
@@ -363,6 +367,11 @@
 	flex-shrink: 0;
 }
 
+.debug-viewlet .debug-breakpoints .breakpoint > .icon {
+	width: 18px;
+	height: 18px;
+}
+
 .debug-viewlet .debug-breakpoints .breakpoint > .file-path {
 	opacity: 0.7;
 	font-size: 0.9em;
diff --git a/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.ts b/src/vs/workbench/parts/debug/browser/statusbarColorProvider.ts
similarity index 100%
rename from src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.ts
rename to src/vs/workbench/parts/debug/browser/statusbarColorProvider.ts
diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts
index 69096337e0d..eb5a9da6a92 100644
--- a/src/vs/workbench/parts/debug/common/debug.ts
+++ b/src/vs/workbench/parts/debug/common/debug.ts
@@ -429,6 +429,8 @@ export interface IConfigurationManager {
 
 	getLaunches(): ILaunch[];
 
+	getLaunch(workspaceUri: uri): ILaunch | undefined;
+
 	/**
 	 * Allows to register on change of selected debug configuration.
 	 */
@@ -547,7 +549,7 @@ export interface IDebugService {
 	/**
 	 * Updates the breakpoints.
 	 */
-	updateBreakpoints(uri: uri, data: { [id: string]: IBreakpointUpdateData }): void;
+	updateBreakpoints(uri: uri, data: { [id: string]: IBreakpointUpdateData }, sendOnResourceSaved: boolean): void;
 
 	/**
 	 * Enables or disables all breakpoints. If breakpoint is passed only enables or disables the passed breakpoint.
@@ -624,7 +626,7 @@ export interface IDebugService {
 	 * Also saves all files, manages if compounds are present in the configuration
 	 * and resolveds configurations via DebugConfigurationProviders.
 	 */
-	startDebugging(root: IWorkspaceFolder, configOrName?: IConfig | string, noDebug?: boolean): TPromise<any>;
+	startDebugging(launch: ILaunch, configOrName?: IConfig | string, noDebug?: boolean): TPromise<any>;
 
 	/**
 	 * Restarts a process or creates a new one if there is no active session.
diff --git a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts
index b1931df1789..8602ce48066 100644
--- a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts
@@ -15,7 +15,7 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { MenuId } from 'vs/platform/actions/common/actions';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { BaseDebugController, twistiePixels, renderViewTree } from 'vs/workbench/parts/debug/electron-browser/baseDebugView';
+import { BaseDebugController, twistiePixels, renderViewTree } from 'vs/workbench/parts/debug/browser/baseDebugView';
 import { ITree, IActionProvider, IDataSource, IRenderer, IAccessibilityProvider } from 'vs/base/parts/tree/browser/tree';
 import { IAction, IActionItem } from 'vs/base/common/actions';
 import { RestartAction, StopAction, ContinueAction, StepOverAction, StepIntoAction, StepOutAction, PauseAction, RestartFrameAction } from 'vs/workbench/parts/debug/browser/debugActions';
diff --git a/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts b/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts
index fb9e5dec2ed..401310cbc80 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts
@@ -17,7 +17,7 @@ import { ToggleViewletAction, Extensions as ViewletExtensions, ViewletRegistry,
 import { TogglePanelAction, Extensions as PanelExtensions, PanelRegistry, PanelDescriptor } from 'vs/workbench/browser/panel';
 import { StatusbarItemDescriptor, StatusbarAlignment, IStatusbarRegistry, Extensions as StatusExtensions } from 'vs/workbench/browser/parts/statusbar/statusbar';
 import { VariablesView } from 'vs/workbench/parts/debug/electron-browser/variablesView';
-import { BreakpointsView } from 'vs/workbench/parts/debug/electron-browser/breakpointsView';
+import { BreakpointsView } from 'vs/workbench/parts/debug/browser/breakpointsView';
 import { WatchExpressionsView } from 'vs/workbench/parts/debug/electron-browser/watchExpressionsView';
 import { CallStackView } from 'vs/workbench/parts/debug/electron-browser/callStackView';
 import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
@@ -38,9 +38,9 @@ import { DebugContentProvider } from 'vs/workbench/parts/debug/browser/debugCont
 import 'vs/workbench/parts/debug/electron-browser/debugEditorContribution';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-import * as debugCommands from 'vs/workbench/parts/debug/electron-browser/debugCommands';
+import { registerCommands } from 'vs/workbench/parts/debug/browser/debugCommands';
 import { IQuickOpenRegistry, Extensions as QuickOpenExtensions, QuickOpenHandlerDescriptor } from 'vs/workbench/browser/quickopen';
-import { StatusBarColorProvider } from 'vs/workbench/parts/debug/electron-browser/statusbarColorProvider';
+import { StatusBarColorProvider } from 'vs/workbench/parts/debug/browser/statusbarColorProvider';
 import { ViewLocation, ViewsRegistry } from 'vs/workbench/common/views';
 import { isMacintosh } from 'vs/base/common/platform';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
@@ -211,7 +211,7 @@ configurationRegistry.registerConfiguration({
 	}
 });
 
-debugCommands.registerCommands();
+registerCommands();
 
 // Register Debug Status
 const statusBar = Registry.as<IStatusbarRegistry>(StatusExtensions.Statusbar);
@@ -239,4 +239,4 @@ if (isMacintosh) {
 	registerTouchBarEntry(StepOutAction.ID, StepOutAction.LABEL, 4, CONTEXT_DEBUG_STATE.isEqualTo('stopped'), 'stepout-tb.png');
 	registerTouchBarEntry(RestartAction.ID, RestartAction.LABEL, 5, CONTEXT_IN_DEBUG_MODE, 'restart-tb.png');
 	registerTouchBarEntry(StopAction.ID, StopAction.LABEL, 6, CONTEXT_IN_DEBUG_MODE, 'stop-tb.png');
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
index adcdcc16cf2..ec04698d860 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
@@ -390,6 +390,14 @@ export class ConfigurationManager implements IConfigurationManager {
 		return this.launches;
 	}
 
+	public getLaunch(workspaceUri: uri): ILaunch {
+		if (!uri.isUri(workspaceUri)) {
+			return undefined;
+		}
+
+		return this.launches.filter(l => l.workspace && l.workspace.uri.toString() === workspaceUri.toString()).pop();
+	}
+
 	public get selectedConfiguration(): { launch: ILaunch, name: string } {
 		return {
 			launch: this.selectedLaunch,
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts b/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
index 321cbc4f93b..0337ca70b66 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
@@ -28,7 +28,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IContextMenuService, ContextSubMenu } from 'vs/platform/contextview/browser/contextView';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { DebugHoverWidget } from 'vs/workbench/parts/debug/electron-browser/debugHover';
 import { RemoveBreakpointAction, EditConditionalBreakpointAction, EnableBreakpointAction, DisableBreakpointAction, AddConditionalBreakpointAction } from 'vs/workbench/parts/debug/browser/debugActions';
 import { IDebugEditorContribution, IDebugService, State, IBreakpoint, EDITOR_CONTRIBUTION_ID, CONTEXT_BREAKPOINT_WIDGET_VISIBLE, IStackFrame, IDebugConfiguration, IExpression, IExceptionInfo } from 'vs/workbench/parts/debug/common/debug';
@@ -41,6 +41,7 @@ import { CoreEditingCommands } from 'vs/editor/browser/controller/coreCommands';
 import { first } from 'vs/base/common/arrays';
 import { IMarginData } from 'vs/editor/browser/controller/mouseTarget';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { ContextSubMenu } from 'vs/base/browser/contextmenu';
 
 const HOVER_DELAY = 300;
 const LAUNCH_JSON_REGEX = /launch\.json$/;
@@ -408,12 +409,13 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 	// configuration widget
 	private updateConfigurationWidgetVisibility(): void {
 		const model = this.editor.getModel();
+		if (this.configurationWidget) {
+			this.configurationWidget.dispose();
+		}
 		if (model && LAUNCH_JSON_REGEX.test(model.uri.toString())) {
 			this.configurationWidget = this.instantiationService.createInstance(FloatingClickWidget, this.editor, nls.localize('addConfiguration', "Add Configuration..."), null);
 			this.configurationWidget.render();
 			this.toDispose.push(this.configurationWidget.onClick(() => this.addLaunchConfiguration().done(undefined, errors.onUnexpectedError)));
-		} else if (this.configurationWidget) {
-			this.configurationWidget.dispose();
 		}
 	}
 
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugHover.ts b/src/vs/workbench/parts/debug/electron-browser/debugHover.ts
index aa20bf05c93..c88f3ed0a6e 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugHover.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugHover.ts
@@ -19,7 +19,7 @@ import { IContentWidget, ICodeEditor, IContentWidgetPosition, ContentWidgetPosit
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IDebugService, IExpression, IExpressionContainer } from 'vs/workbench/parts/debug/common/debug';
 import { Expression } from 'vs/workbench/parts/debug/common/debugModel';
-import { renderExpressionValue } from 'vs/workbench/parts/debug/electron-browser/baseDebugView';
+import { renderExpressionValue } from 'vs/workbench/parts/debug/browser/baseDebugView';
 import { VariablesDataSource, VariablesRenderer } from 'vs/workbench/parts/debug/electron-browser/variablesView';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { attachStylerCallback } from 'vs/platform/theme/common/styler';
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index f2400633557..fdad8c36e59 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -24,7 +24,6 @@ import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IExtensionService } from 'vs/platform/extensions/common/extensions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { FileChangesEvent, FileChangeType, IFileService } from 'vs/platform/files/common/files';
-import { IMessageService, CloseAction, IChoiceService } from 'vs/platform/message/common/message';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
@@ -52,6 +51,8 @@ import { IBroadcastService, IBroadcast } from 'vs/platform/broadcast/electron-br
 import { IRemoteConsoleLog, parse, getFirstFrame } from 'vs/base/node/console';
 import { Source } from 'vs/workbench/parts/debug/common/debugSource';
 import { TaskEvent, TaskEventKind } from 'vs/workbench/parts/tasks/common/tasks';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
+import { INotificationService, INotificationActions } from 'vs/platform/notification/common/notification';
 
 const DEBUG_BREAKPOINTS_KEY = 'debug.breakpoint';
 const DEBUG_BREAKPOINTS_ACTIVATED_KEY = 'debug.breakpointactivated';
@@ -87,7 +88,7 @@ export class DebugService implements debug.IDebugService {
 		@ITextFileService private textFileService: ITextFileService,
 		@IViewletService private viewletService: IViewletService,
 		@IPanelService private panelService: IPanelService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IChoiceService private choiceService: IChoiceService,
 		@IPartService private partService: IPartService,
 		@IWindowService private windowService: IWindowService,
@@ -274,7 +275,7 @@ export class DebugService implements debug.IDebugService {
 						if (session) {
 							session.disconnect().done(null, errors.onUnexpectedError);
 						}
-						this.messageService.show(severity.Error, e.message);
+						this.notificationService.error(e.message);
 					});
 				}
 			};
@@ -309,7 +310,7 @@ export class DebugService implements debug.IDebugService {
 			aria.status(nls.localize('debuggingStopped', "Debugging stopped."));
 			if (session && session.getId() === event.sessionId) {
 				if (event.body && event.body.restart && process) {
-					this.restartProcess(process, event.body.restart).done(null, err => this.messageService.show(severity.Error, err.message));
+					this.restartProcess(process, event.body.restart).done(null, err => this.notificationService.error(err.message));
 				} else {
 					session.disconnect().done(null, errors.onUnexpectedError);
 				}
@@ -587,9 +588,13 @@ export class DebugService implements debug.IDebugService {
 		return this.sendBreakpoints(uri);
 	}
 
-	public updateBreakpoints(uri: uri, data: { [id: string]: DebugProtocol.Breakpoint }): void {
+	public updateBreakpoints(uri: uri, data: { [id: string]: DebugProtocol.Breakpoint }, sendOnResourceSaved: boolean): void {
 		this.model.updateBreakpoints(data);
-		this.breakpointsToSendOnResourceSaved.add(uri.toString());
+		if (sendOnResourceSaved) {
+			this.breakpointsToSendOnResourceSaved.add(uri.toString());
+		} else {
+			this.sendBreakpoints(uri);
+		}
 	}
 
 	public removeBreakpoints(id?: string): TPromise<any> {
@@ -658,10 +663,10 @@ export class DebugService implements debug.IDebugService {
 		this.model.removeWatchExpressions(id);
 	}
 
-	public startDebugging(root: IWorkspaceFolder, configOrName?: debug.IConfig | string, noDebug = false): TPromise<any> {
+	public startDebugging(launch: debug.ILaunch, configOrName?: debug.IConfig | string, noDebug = false): TPromise<any> {
 
 		// make sure to save all files and that the configuration is up to date
-		return this.extensionService.activateByEvent('onDebug').then(() => this.textFileService.saveAll().then(() => this.configurationService.reloadConfiguration(root).then(() =>
+		return this.extensionService.activateByEvent('onDebug').then(() => this.textFileService.saveAll().then(() => this.configurationService.reloadConfiguration(launch ? launch.workspace : undefined).then(() =>
 			this.extensionService.whenInstalledExtensionsRegistered().then(() => {
 				if (this.model.getProcesses().length === 0) {
 					this.removeReplExpressions();
@@ -669,8 +674,6 @@ export class DebugService implements debug.IDebugService {
 					this.model.getBreakpoints().forEach(bp => bp.verified = false);
 				}
 				this.launchJsonChanged = false;
-				const launch = root ? this.configurationManager.getLaunches().filter(l => l.workspace && l.workspace.uri.toString() === root.uri.toString()).pop()
-					: this.configurationManager.getWorkspaceLaunch();
 
 				let config: debug.IConfig, compound: debug.ICompound;
 				if (!configOrName) {
@@ -695,28 +698,28 @@ export class DebugService implements debug.IDebugService {
 							return TPromise.as(null);
 						}
 
-						let rootForName: IWorkspaceFolder;
+						let launchForName: debug.ILaunch;
 						if (typeof configData === 'string') {
 							const launchesContainingName = this.configurationManager.getLaunches().filter(l => !!l.getConfiguration(name));
 							if (launchesContainingName.length === 1) {
-								rootForName = launchesContainingName[0].workspace;
+								launchForName = launchesContainingName[0];
 							} else if (launchesContainingName.length > 1 && launchesContainingName.indexOf(launch) >= 0) {
 								// If there are multiple launches containing the configuration give priority to the configuration in the current launch
-								rootForName = launch.workspace;
+								launchForName = launch;
 							} else {
 								return TPromise.wrapError(new Error(launchesContainingName.length === 0 ? nls.localize('noConfigurationNameInWorkspace', "Could not find launch configuration '{0}' in the workspace.", name)
-									: nls.localize('multipleConfigurationNamesInWorkspace', "There are multiple launch configurations `{0}` in the workspace. Use folder name to qualify the configuration.", name)));
+									: nls.localize('multipleConfigurationNamesInWorkspace', "There are multiple launch configurations '{0}' in the workspace. Use folder name to qualify the configuration.", name)));
 							}
 						} else if (configData.folder) {
-							const root = this.contextService.getWorkspace().folders.filter(f => f.name === configData.folder).pop();
-							if (root) {
-								rootForName = root;
+							const launchesMatchingConfigData = this.configurationManager.getLaunches().filter(l => l.workspace && l.workspace.name === configData.folder && !!l.getConfiguration(configData.name));
+							if (launchesMatchingConfigData.length === 1) {
+								launchForName = launchesMatchingConfigData[0];
 							} else {
 								return TPromise.wrapError(new Error(nls.localize('noFolderWithName', "Can not find folder with name '{0}' for configuration '{1}' in compound '{2}'.", configData.folder, configData.name, compound.name)));
 							}
 						}
 
-						return this.startDebugging(rootForName, name, noDebug);
+						return this.startDebugging(launchForName, name, noDebug);
 					}));
 				}
 				if (configOrName && !config) {
@@ -751,7 +754,7 @@ export class DebugService implements debug.IDebugService {
 						this.configurationManager.resolveConfigurationByProviders(launch && launch.workspace ? launch.workspace.uri : undefined, type, config).then(config => {
 							// a falsy config indicates an aborted launch
 							if (config && config.type) {
-								return this.createProcess(root, config, sessionId);
+								return this.createProcess(launch, config, sessionId);
 							}
 
 							if (launch) {
@@ -766,8 +769,7 @@ export class DebugService implements debug.IDebugService {
 		)));
 	}
 
-	private createProcess(root: IWorkspaceFolder, config: debug.IConfig, sessionId: string): TPromise<void> {
-		const launch = root ? this.configurationManager.getLaunches().filter(l => l.workspace && l.workspace.uri.toString() === root.uri.toString()).pop() : undefined;
+	private createProcess(launch: debug.ILaunch, config: debug.IConfig, sessionId: string): TPromise<void> {
 		return this.textFileService.saveAll().then(() =>
 			(launch ? launch.resolveConfiguration(config) : TPromise.as(config)).then(resolvedConfig => {
 				if (!resolvedConfig) {
@@ -778,25 +780,26 @@ export class DebugService implements debug.IDebugService {
 				if (!this.configurationManager.getAdapter(resolvedConfig.type) || (config.request !== 'attach' && config.request !== 'launch')) {
 					let message: string;
 					if (config.request !== 'attach' && config.request !== 'launch') {
-						message = config.request ? nls.localize('debugRequestNotSupported', "Attribute `{0}` has an unsupported value '{1}' in the chosen debug configuration.", 'request', config.request)
+						message = config.request ? nls.localize('debugRequestNotSupported', "Attribute '{0}' has an unsupported value '{1}' in the chosen debug configuration.", 'request', config.request)
 							: nls.localize('debugRequesMissing', "Attribute '{0}' is missing from the chosen debug configuration.", 'request');
 
 					} else {
 						message = resolvedConfig.type ? nls.localize('debugTypeNotSupported', "Configured debug type '{0}' is not supported.", resolvedConfig.type) :
-							nls.localize('debugTypeMissing', "Missing property `type` for the chosen launch configuration.");
+							nls.localize('debugTypeMissing', "Missing property 'type' for the chosen launch configuration.");
 					}
 
-					return TPromise.wrapError(errors.create(message, { actions: [this.instantiationService.createInstance(debugactions.ConfigureAction, debugactions.ConfigureAction.ID, debugactions.ConfigureAction.LABEL), CloseAction] }));
+					return TPromise.wrapError(errors.create(message, { actions: [this.instantiationService.createInstance(debugactions.ConfigureAction, debugactions.ConfigureAction.ID, debugactions.ConfigureAction.LABEL)] }));
 				}
 
 				this.toDisposeOnSessionEnd.set(sessionId, []);
 
-				return this.runPreLaunchTask(sessionId, root, resolvedConfig.preLaunchTask).then((taskSummary: ITaskSummary) => {
+				const workspace = launch ? launch.workspace : undefined;
+				return this.runPreLaunchTask(sessionId, workspace, resolvedConfig.preLaunchTask).then((taskSummary: ITaskSummary) => {
 					const errorCount = resolvedConfig.preLaunchTask ? this.markerService.getStatistics().errors : 0;
 					const successExitCode = taskSummary && taskSummary.exitCode === 0;
 					const failureExitCode = taskSummary && taskSummary.exitCode !== undefined && taskSummary.exitCode !== 0;
 					if (successExitCode || (errorCount === 0 && !failureExitCode)) {
-						return this.doCreateProcess(root, resolvedConfig, sessionId);
+						return this.doCreateProcess(workspace, resolvedConfig, sessionId);
 					}
 
 					const message = errorCount > 1 ? nls.localize('preLaunchTaskErrors', "Build errors have been detected during preLaunchTask '{0}'.", resolvedConfig.preLaunchTask) :
@@ -806,7 +809,7 @@ export class DebugService implements debug.IDebugService {
 					return this.choiceService.choose(severity.Error, message, [nls.localize('debugAnyway', "Debug Anyway"), nls.localize('showErrors', "Show Errors"), nls.localize('cancel', "Cancel")], 2, true).then(choice => {
 						switch (choice) {
 							case 0:
-								return this.doCreateProcess(root, resolvedConfig, sessionId);
+								return this.doCreateProcess(workspace, resolvedConfig, sessionId);
 							case 1:
 								return this.panelService.openPanel(Constants.MARKERS_PANEL_ID).then(() => undefined);
 							default:
@@ -817,7 +820,7 @@ export class DebugService implements debug.IDebugService {
 					return this.choiceService.choose(severity.Error, err.message, [nls.localize('debugAnyway', "Debug Anyway"), debugactions.ConfigureAction.LABEL, this.taskService.configureAction().label, nls.localize('cancel', "Cancel")], 3, true).then(choice => {
 						switch (choice) {
 							case 0:
-								return this.doCreateProcess(root, resolvedConfig, sessionId);
+								return this.doCreateProcess(workspace, resolvedConfig, sessionId);
 							case 1:
 								return launch && launch.openConfigFile(false);
 							case 2:
@@ -829,7 +832,7 @@ export class DebugService implements debug.IDebugService {
 				});
 			}, err => {
 				if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
-					this.messageService.show(severity.Error, nls.localize('noFolderWorkspaceDebugError', "The active file can not be debugged. Make sure it is saved on disk and that you have a debug extension installed for that file type."));
+					this.notificationService.error(nls.localize('noFolderWorkspaceDebugError', "The active file can not be debugged. Make sure it is saved on disk and that you have a debug extension installed for that file type."));
 					return undefined;
 				}
 
@@ -942,8 +945,8 @@ export class DebugService implements debug.IDebugService {
 					isBuiltin: adapter.extensionDescription.isBuiltin,
 					launchJsonExists: root && !!this.configurationService.getValue<debug.IGlobalConfig>('launch', { resource: root.uri })
 				});
-			}).then(() => process, (error: any) => {
-				if (error instanceof Error && error.message === 'Canceled') {
+			}).then(() => process, (error: Error | string) => {
+				if (errors.isPromiseCanceledError(error)) {
 					// Do not show 'canceled' error messages to the user #7906
 					return TPromise.as(null);
 				}
@@ -952,7 +955,7 @@ export class DebugService implements debug.IDebugService {
 				/* __GDPR__
 					"debugMisconfiguration" : {
 						"type" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						"error": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+						"error": { "classification": "CallstackOrException", "purpose": "FeatureInsight" }
 					}
 				*/
 				this.telemetryService.publicLog('debugMisconfiguration', { type: configuration ? configuration.type : undefined, error: errorMessage });
@@ -972,8 +975,14 @@ export class DebugService implements debug.IDebugService {
 				}
 
 				const configureAction = this.instantiationService.createInstance(debugactions.ConfigureAction, debugactions.ConfigureAction.ID, debugactions.ConfigureAction.LABEL);
-				const actions = (error.actions && error.actions.length) ? error.actions.concat([configureAction]) : [CloseAction, configureAction];
-				this.messageService.show(severity.Error, { message: errorMessage, actions });
+
+				let actions: INotificationActions = { primary: [] };
+				if (errors.isErrorWithActions(error)) {
+					actions.primary.push(...error.actions);
+				}
+				actions.primary.push(configureAction);
+
+				this.notificationService.notify({ severity: severity.Error, message: errorMessage, actions });
 				return undefined;
 			});
 		});
@@ -1063,7 +1072,7 @@ export class DebugService implements debug.IDebugService {
 						// Read the configuration again if a launch.json has been changed, if not just use the inmemory configuration
 						let config = process.configuration;
 
-						const launch = this.configurationManager.getLaunches().filter(l => l.workspace && process.session.root && l.workspace.uri.toString() === process.session.root.uri.toString()).pop();
+						const launch = process.session.root ? this.configurationManager.getLaunch(process.session.root.uri) : undefined;
 						if (this.launchJsonChanged && launch) {
 							this.launchJsonChanged = false;
 							config = launch.getConfiguration(process.configuration.name) || config;
@@ -1072,7 +1081,7 @@ export class DebugService implements debug.IDebugService {
 							config.noDebug = process.configuration.noDebug;
 						}
 						config.__restart = restartData;
-						this.startDebugging(process.session.root, config).then(() => c(null), err => e(err));
+						this.startDebugging(launch, config).then(() => c(null), err => e(err));
 					}, 300);
 				});
 			}).then(() => {
@@ -1123,7 +1132,7 @@ export class DebugService implements debug.IDebugService {
 		});
 
 		this.model.removeProcess(session.getId());
-		if (process && process.state !== debug.ProcessState.INACTIVE) {
+		if (process) {
 			process.inactive = true;
 			this._onDidEndProcess.fire(process);
 		}
diff --git a/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.ts b/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.ts
index 96e069a9a59..4041544b39d 100644
--- a/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.ts
@@ -34,6 +34,23 @@ export class CopyValueAction extends Action {
 	}
 }
 
+export class CopyEvaluatePathAction extends Action {
+	static readonly ID = 'workbench.debug.viewlet.action.copyEvaluatePath';
+	static LABEL = nls.localize('copyPath', "Copy Path");
+
+	constructor(id: string, label: string, private value: any) {
+		super(id, label);
+	}
+
+	public run(): TPromise<any> {
+		if (this.value instanceof Variable) {
+			clipboard.writeText(this.value.evaluateName);
+		}
+
+		return TPromise.as(null);
+	}
+}
+
 export class CopyAction extends Action {
 	static readonly ID = 'workbench.debug.action.copy';
 	static LABEL = nls.localize('copy', "Copy");
diff --git a/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts b/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
index 6ed9ed23c88..d6fd04b8204 100644
--- a/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
@@ -12,9 +12,7 @@ import objects = require('vs/base/common/objects');
 import { Action } from 'vs/base/common/actions';
 import errors = require('vs/base/common/errors');
 import { TPromise } from 'vs/base/common/winjs.base';
-import severity from 'vs/base/common/severity';
 import stdfork = require('vs/base/node/stdFork');
-import { IMessageService, CloseAction } from 'vs/platform/message/common/message';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { ITerminalService } from 'vs/workbench/parts/terminal/common/terminal';
 import { ITerminalService as IExternalTerminalService } from 'vs/workbench/parts/execution/common/execution';
@@ -26,6 +24,7 @@ import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { ExtensionsChannelId } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { TerminalSupport } from 'vs/workbench/parts/debug/electron-browser/terminalSupport';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export interface SessionExitedEvent extends debug.DebugEvent {
 	body: {
@@ -72,7 +71,7 @@ export class RawDebugSession extends V8Protocol implements debug.ISession {
 		private adapter: Adapter,
 		public customTelemetryService: ITelemetryService,
 		public root: IWorkspaceFolder,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IOutputService private outputService: IOutputService,
 		@ITerminalService private terminalService: ITerminalService,
@@ -166,7 +165,7 @@ export class RawDebugSession extends V8Protocol implements debug.ISession {
 				if (error && error.sendTelemetry) {
 					/* __GDPR__
 						"debugProtocolErrorResponse" : {
-							"error" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+							"error" : { "classification": "CallstackOrException", "purpose": "FeatureInsight" }
 						}
 					*/
 					this.telemetryService.publicLog('debugProtocolErrorResponse', { error: telemetryMessage });
@@ -183,7 +182,7 @@ export class RawDebugSession extends V8Protocol implements debug.ISession {
 				if (error && error.url) {
 					const label = error.urlLabel ? error.urlLabel : nls.localize('moreInfo', "More Info");
 					return TPromise.wrapError<R>(errors.create(userMessage, {
-						actions: [CloseAction, new Action('debug.moreInfo', label, null, true, () => {
+						actions: [new Action('debug.moreInfo', label, null, true, () => {
 							window.open(error.url);
 							return TPromise.as(null);
 						})]
@@ -524,7 +523,7 @@ export class RawDebugSession extends V8Protocol implements debug.ISession {
 	}
 
 	protected onServerError(err: Error): void {
-		this.messageService.show(severity.Error, nls.localize('stoppingDebugAdapter', "{0}. Stopping the debug adapter.", err.message));
+		this.notificationService.error(nls.localize('stoppingDebugAdapter', "{0}. Stopping the debug adapter.", err.message));
 		this.stopServer().done(null, errors.onUnexpectedError);
 	}
 
@@ -532,7 +531,7 @@ export class RawDebugSession extends V8Protocol implements debug.ISession {
 		this.serverProcess = null;
 		this.cachedInitServer = null;
 		if (!this.disconnected) {
-			this.messageService.show(severity.Error, nls.localize('debugAdapterCrash', "Debug adapter process has terminated unexpectedly"));
+			this.notificationService.error(nls.localize('debugAdapterCrash', "Debug adapter process has terminated unexpectedly"));
 		}
 		this.onEvent({ event: 'exit', type: 'event', seq: 0 });
 	}
diff --git a/src/vs/workbench/parts/debug/electron-browser/replViewer.ts b/src/vs/workbench/parts/debug/electron-browser/replViewer.ts
index d382679b170..a46709ce358 100644
--- a/src/vs/workbench/parts/debug/electron-browser/replViewer.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/replViewer.ts
@@ -17,7 +17,7 @@ import { ITree, IAccessibilityProvider, ContextMenuEvent, IDataSource, IRenderer
 import { ICancelableEvent } from 'vs/base/parts/tree/browser/treeDefaults';
 import { IExpressionContainer, IExpression, IReplElementSource } from 'vs/workbench/parts/debug/common/debug';
 import { Model, RawObjectReplElement, Expression, SimpleReplElement, Variable } from 'vs/workbench/parts/debug/common/debugModel';
-import { renderVariable, renderExpressionValue, IVariableTemplateData, BaseDebugController } from 'vs/workbench/parts/debug/electron-browser/baseDebugView';
+import { renderVariable, renderExpressionValue, IVariableTemplateData, BaseDebugController } from 'vs/workbench/parts/debug/browser/baseDebugView';
 import { ClearReplAction } from 'vs/workbench/parts/debug/browser/debugActions';
 import { CopyAction, CopyAllAction } from 'vs/workbench/parts/debug/electron-browser/electronDebugActions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
diff --git a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
index 3cf08e18ec4..061852aad56 100644
--- a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
@@ -50,16 +50,26 @@ export class TerminalSupport {
 
 	private static isBusy(t: ITerminalInstance): boolean {
 		if (t.processId) {
-			// if shell has at least one child process, assume that shell is busy
-			if (platform.isWindows) {
-				const result = cp.spawnSync('wmic', ['process', 'get', 'ParentProcessId']);
-				const pids = result.stdout.toString().split('\r\n');
-				return pids.some(p => parseInt(p) === t.processId);
-			} else {
-				const result = cp.spawnSync('/usr/bin/pgrep', ['-P', String(t.processId)]);
-				return result.stdout.toString().trim().length > 0;
+			try {
+				// if shell has at least one child process, assume that shell is busy
+				if (platform.isWindows) {
+					const result = cp.spawnSync('wmic', ['process', 'get', 'ParentProcessId']);
+					if (result.stdout) {
+						const pids = result.stdout.toString().split('\r\n');
+						return pids.some(p => parseInt(p) === t.processId);
+					}
+				} else {
+					const result = cp.spawnSync('/usr/bin/pgrep', ['-P', String(t.processId)]);
+					if (result.stdout) {
+						return result.stdout.toString().trim().length > 0;
+					}
+				}
+			}
+			catch (e) {
+				// silently ignore
 			}
 		}
+		// fall back to safe side
 		return true;
 	}
 
diff --git a/src/vs/workbench/parts/debug/electron-browser/variablesView.ts b/src/vs/workbench/parts/debug/electron-browser/variablesView.ts
index 6d6b197dc1e..ee5cf34aace 100644
--- a/src/vs/workbench/parts/debug/electron-browser/variablesView.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/variablesView.ts
@@ -17,11 +17,11 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { MenuId } from 'vs/platform/actions/common/actions';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { twistiePixels, renderViewTree, IVariableTemplateData, BaseDebugController, renderRenameBox, renderVariable } from 'vs/workbench/parts/debug/electron-browser/baseDebugView';
+import { twistiePixels, renderViewTree, IVariableTemplateData, BaseDebugController, renderRenameBox, renderVariable } from 'vs/workbench/parts/debug/browser/baseDebugView';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IAction, IActionItem } from 'vs/base/common/actions';
 import { SetValueAction, AddToWatchExpressionsAction } from 'vs/workbench/parts/debug/browser/debugActions';
-import { CopyValueAction } from 'vs/workbench/parts/debug/electron-browser/electronDebugActions';
+import { CopyValueAction, CopyEvaluatePathAction } from 'vs/workbench/parts/debug/electron-browser/electronDebugActions';
 import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { ViewModel } from 'vs/workbench/parts/debug/common/debugViewModel';
 import { equalsIgnoreCase } from 'vs/base/common/strings';
@@ -180,6 +180,7 @@ class VariablesActionProvider implements IActionProvider {
 		const variable = <Variable>element;
 		actions.push(new SetValueAction(SetValueAction.ID, SetValueAction.LABEL, variable, this.debugService, this.keybindingService));
 		actions.push(new CopyValueAction(CopyValueAction.ID, CopyValueAction.LABEL, variable, this.debugService));
+		actions.push(new CopyEvaluatePathAction(CopyEvaluatePathAction.ID, CopyEvaluatePathAction.LABEL, variable));
 		actions.push(new Separator());
 		actions.push(new AddToWatchExpressionsAction(AddToWatchExpressionsAction.ID, AddToWatchExpressionsAction.LABEL, variable, this.debugService, this.keybindingService));
 
diff --git a/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts b/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts
index c03086ae9a9..9cd0b0c85fd 100644
--- a/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts
@@ -26,7 +26,7 @@ import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { equalsIgnoreCase } from 'vs/base/common/strings';
 import { IMouseEvent, DragMouseEvent } from 'vs/base/browser/mouseEvent';
 import { DefaultDragAndDrop, OpenMode, ClickBehavior } from 'vs/base/parts/tree/browser/treeDefaults';
-import { IVariableTemplateData, renderVariable, renderRenameBox, renderExpressionValue, BaseDebugController, twistiePixels, renderViewTree } from 'vs/workbench/parts/debug/electron-browser/baseDebugView';
+import { IVariableTemplateData, renderVariable, renderRenameBox, renderExpressionValue, BaseDebugController, twistiePixels, renderViewTree } from 'vs/workbench/parts/debug/browser/baseDebugView';
 import { WorkbenchTree } from 'vs/platform/list/browser/listService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
diff --git a/src/vs/workbench/parts/debug/test/common/mockDebug.ts b/src/vs/workbench/parts/debug/test/common/mockDebug.ts
index 81acf9c471d..fec5a6e4086 100644
--- a/src/vs/workbench/parts/debug/test/common/mockDebug.ts
+++ b/src/vs/workbench/parts/debug/test/common/mockDebug.ts
@@ -6,44 +6,44 @@
 import uri from 'vs/base/common/uri';
 import Event, { Emitter } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
-import * as debug from 'vs/workbench/parts/debug/common/debug';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { ILaunch, IDebugService, State, DebugEvent, IProcess, IConfigurationManager, IStackFrame, IBreakpointData, IBreakpointUpdateData, IConfig, IModel, IViewModel, ISession } from 'vs/workbench/parts/debug/common/debug';
 
-export class MockDebugService implements debug.IDebugService {
+export class MockDebugService implements IDebugService {
 	public _serviceBrand: any;
 
-	public get state(): debug.State {
+	public get state(): State {
 		return null;
 	}
 
-	public get onDidCustomEvent(): Event<debug.DebugEvent> {
+	public get onDidCustomEvent(): Event<DebugEvent> {
 		return null;
 	}
 
-	public get onDidNewProcess(): Event<debug.IProcess> {
+	public get onDidNewProcess(): Event<IProcess> {
 		return null;
 	}
 
-	public get onDidEndProcess(): Event<debug.IProcess> {
+	public get onDidEndProcess(): Event<IProcess> {
 		return null;
 	}
 
-	public get onDidChangeState(): Event<debug.State> {
+	public get onDidChangeState(): Event<State> {
 		return null;
 	}
 
-	public getConfigurationManager(): debug.IConfigurationManager {
+	public getConfigurationManager(): IConfigurationManager {
 		return null;
 	}
 
-	public focusStackFrame(focusedStackFrame: debug.IStackFrame): void {
+	public focusStackFrame(focusedStackFrame: IStackFrame): void {
 	}
 
-	public addBreakpoints(uri: uri, rawBreakpoints: debug.IBreakpointData[]): TPromise<void> {
+	public addBreakpoints(uri: uri, rawBreakpoints: IBreakpointData[]): TPromise<void> {
 		return TPromise.as(null);
 	}
 
-	public updateBreakpoints(uri: uri, data: { [id: string]: debug.IBreakpointUpdateData }): void { }
+	public updateBreakpoints(uri: uri, data: { [id: string]: IBreakpointUpdateData }, sendOnResourceSaved: boolean): void { }
 
 	public enableOrDisableBreakpoints(enabled: boolean): TPromise<void> {
 		return TPromise.as(null);
@@ -85,7 +85,7 @@ export class MockDebugService implements debug.IDebugService {
 
 	public removeWatchExpressions(id?: string): void { }
 
-	public startDebugging(root: IWorkspaceFolder, configOrName?: debug.IConfig | string, noDebug?: boolean): TPromise<any> {
+	public startDebugging(launch: ILaunch, configOrName?: IConfig | string, noDebug?: boolean): TPromise<any> {
 		return TPromise.as(null);
 	}
 
@@ -97,11 +97,11 @@ export class MockDebugService implements debug.IDebugService {
 		return TPromise.as(null);
 	}
 
-	public getModel(): debug.IModel {
+	public getModel(): IModel {
 		return null;
 	}
 
-	public getViewModel(): debug.IViewModel {
+	public getViewModel(): IViewModel {
 		return null;
 	}
 
@@ -110,7 +110,7 @@ export class MockDebugService implements debug.IDebugService {
 	public sourceIsNotAvailable(uri: uri): void { }
 }
 
-export class MockSession implements debug.ISession {
+export class MockSession implements ISession {
 	public readyForBreakpoints = true;
 	public emittedStopped = true;
 
@@ -166,7 +166,7 @@ export class MockSession implements debug.ISession {
 		return {};
 	}
 
-	public get onDidEvent(): Event<debug.DebugEvent> {
+	public get onDidEvent(): Event<DebugEvent> {
 		return null;
 	}
 
@@ -175,8 +175,8 @@ export class MockSession implements debug.ISession {
 		return emitter.event;
 	}
 
-	public get onDidExitAdapter(): Event<debug.DebugEvent> {
-		const emitter = new Emitter<debug.DebugEvent>();
+	public get onDidExitAdapter(): Event<DebugEvent> {
+		const emitter = new Emitter<DebugEvent>();
 		return emitter.event;
 	}
 
diff --git a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
index 869a9d8c7c1..e56fffecff5 100644
--- a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
+++ b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
@@ -17,14 +17,14 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
 import { ITerminalService as IIntegratedTerminalService, KEYBINDING_CONTEXT_TERMINAL_NOT_FOCUSED } from 'vs/workbench/parts/terminal/common/terminal';
-import { DEFAULT_TERMINAL_WINDOWS, DEFAULT_TERMINAL_LINUX_READY, DEFAULT_TERMINAL_OSX, ITerminalConfiguration } from 'vs/workbench/parts/execution/electron-browser/terminal';
+import { getDefaultTerminalWindows, getDefaultTerminalLinuxReady, DEFAULT_TERMINAL_OSX, ITerminalConfiguration } from 'vs/workbench/parts/execution/electron-browser/terminal';
 import { WinTerminalService, MacTerminalService, LinuxTerminalService } from 'vs/workbench/parts/execution/electron-browser/terminalService';
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
 import { ResourceContextKey } from 'vs/workbench/common/resources';
 import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IFileService } from 'vs/platform/files/common/files';
 import { IListService } from 'vs/platform/list/browser/listService';
-import { getResourceForCommand } from 'vs/workbench/parts/files/browser/files';
+import { getMultiSelectedResources } from 'vs/workbench/parts/files/browser/files';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { Schemas } from 'vs/base/common/network';
 
@@ -36,7 +36,7 @@ if (env.isWindows) {
 	registerSingleton(ITerminalService, LinuxTerminalService);
 }
 
-DEFAULT_TERMINAL_LINUX_READY.then(defaultTerminalLinux => {
+getDefaultTerminalLinuxReady().then(defaultTerminalLinux => {
 	let configurationRegistry = <IConfigurationRegistry>Registry.as(Extensions.Configuration);
 	configurationRegistry.registerConfiguration({
 		'id': 'externalTerminal',
@@ -57,7 +57,7 @@ DEFAULT_TERMINAL_LINUX_READY.then(defaultTerminalLinux => {
 			'terminal.external.windowsExec': {
 				'type': 'string',
 				'description': nls.localize('terminal.external.windowsExec', "Customizes which terminal to run on Windows."),
-				'default': DEFAULT_TERMINAL_WINDOWS,
+				'default': getDefaultTerminalWindows(),
 				'isExecutable': true
 			},
 			'terminal.external.osxExec': {
@@ -85,20 +85,27 @@ CommandsRegistry.registerCommand({
 		const fileService = accessor.get(IFileService);
 		const integratedTerminalService = accessor.get(IIntegratedTerminalService);
 		const terminalService = accessor.get(ITerminalService);
-		resource = getResourceForCommand(resource, accessor.get(IListService), editorService);
 
-		return fileService.resolveFile(resource).then(stat => {
-			return stat.isDirectory ? stat.resource.fsPath : paths.dirname(stat.resource.fsPath);
-		}).then(directoryToOpen => {
-			if (configurationService.getValue<ITerminalConfiguration>().terminal.explorerKind === 'integrated') {
-				const instance = integratedTerminalService.createInstance({ cwd: directoryToOpen }, true);
-				if (instance) {
-					integratedTerminalService.setActiveInstance(instance);
-					integratedTerminalService.showPanel(true);
+		const directorySet = new Set<string>();
+		const resources = getMultiSelectedResources(resource, accessor.get(IListService), editorService);
+
+		return resources.map(r => {
+			return fileService.resolveFile(r).then(stat => {
+				return stat.isDirectory ? stat.resource.fsPath : paths.dirname(stat.resource.fsPath);
+			}).then(directoryToOpen => {
+				if (!directorySet.has(directoryToOpen)) {
+					directorySet.add(directoryToOpen);
+					if (configurationService.getValue<ITerminalConfiguration>().terminal.explorerKind === 'integrated') {
+						const instance = integratedTerminalService.createInstance({ cwd: directoryToOpen }, true);
+						if (instance && (resource === r || resources.length === 1)) {
+							integratedTerminalService.setActiveInstance(instance);
+							integratedTerminalService.showPanel(true);
+						}
+					} else {
+						terminalService.openTerminal(directoryToOpen);
+					}
 				}
-			} else {
-				terminalService.openTerminal(directoryToOpen);
-			}
+			});
 		});
 	}
 });
diff --git a/src/vs/workbench/parts/execution/electron-browser/terminal.ts b/src/vs/workbench/parts/execution/electron-browser/terminal.ts
index 9ddb4c6369e..7dd4a07cb4b 100644
--- a/src/vs/workbench/parts/execution/electron-browser/terminal.ts
+++ b/src/vs/workbench/parts/execution/electron-browser/terminal.ts
@@ -8,32 +8,44 @@ import env = require('vs/base/common/platform');
 import * as pfs from 'vs/base/node/pfs';
 import { TPromise } from 'vs/base/common/winjs.base';
 
-export const DEFAULT_TERMINAL_LINUX_READY = new TPromise<string>(c => {
-	if (env.isLinux) {
-		TPromise.join([pfs.exists('/etc/debian_version'), process.lazyEnv]).then(([isDebian]) => {
-			if (isDebian) {
-				c('x-terminal-emulator');
-			} else if (process.env.DESKTOP_SESSION === 'gnome' || process.env.DESKTOP_SESSION === 'gnome-classic') {
-				c('gnome-terminal');
-			} else if (process.env.DESKTOP_SESSION === 'kde-plasma') {
-				c('konsole');
-			} else if (process.env.COLORTERM) {
-				c(process.env.COLORTERM);
-			} else if (process.env.TERM) {
-				c(process.env.TERM);
-			} else {
-				c('xterm');
+let _DEFAULT_TERMINAL_LINUX_READY: TPromise<string> = null;
+export function getDefaultTerminalLinuxReady(): TPromise<string> {
+	if (!_DEFAULT_TERMINAL_LINUX_READY) {
+		_DEFAULT_TERMINAL_LINUX_READY = new TPromise<string>(c => {
+			if (env.isLinux) {
+				TPromise.join([pfs.exists('/etc/debian_version'), process.lazyEnv]).then(([isDebian]) => {
+					if (isDebian) {
+						c('x-terminal-emulator');
+					} else if (process.env.DESKTOP_SESSION === 'gnome' || process.env.DESKTOP_SESSION === 'gnome-classic') {
+						c('gnome-terminal');
+					} else if (process.env.DESKTOP_SESSION === 'kde-plasma') {
+						c('konsole');
+					} else if (process.env.COLORTERM) {
+						c(process.env.COLORTERM);
+					} else if (process.env.TERM) {
+						c(process.env.TERM);
+					} else {
+						c('xterm');
+					}
+				});
+				return;
 			}
-		});
-		return;
-	}
 
-	c('xterm');
-});
+			c('xterm');
+		});
+	}
+	return _DEFAULT_TERMINAL_LINUX_READY;
+}
 
 export const DEFAULT_TERMINAL_OSX = 'Terminal.app';
 
-export const DEFAULT_TERMINAL_WINDOWS = `${process.env.windir}\\${process.env.hasOwnProperty('PROCESSOR_ARCHITEW6432') ? 'Sysnative' : 'System32'}\\cmd.exe`;
+let _DEFAULT_TERMINAL_WINDOWS: string = null;
+export function getDefaultTerminalWindows(): string {
+	if (!_DEFAULT_TERMINAL_WINDOWS) {
+		_DEFAULT_TERMINAL_WINDOWS = `${process.env.windir}\\${process.env.hasOwnProperty('PROCESSOR_ARCHITEW6432') ? 'Sysnative' : 'System32'}\\cmd.exe`;
+	}
+	return _DEFAULT_TERMINAL_WINDOWS;
+}
 
 export interface ITerminalConfiguration {
 	terminal: {
diff --git a/src/vs/workbench/parts/execution/electron-browser/terminalService.ts b/src/vs/workbench/parts/execution/electron-browser/terminalService.ts
index 1d25e068cbe..6c383779843 100644
--- a/src/vs/workbench/parts/execution/electron-browser/terminalService.ts
+++ b/src/vs/workbench/parts/execution/electron-browser/terminalService.ts
@@ -14,7 +14,7 @@ import { assign } from 'vs/base/common/objects';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ITerminalService } from 'vs/workbench/parts/execution/common/execution';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ITerminalConfiguration, DEFAULT_TERMINAL_WINDOWS, DEFAULT_TERMINAL_LINUX_READY, DEFAULT_TERMINAL_OSX } from 'vs/workbench/parts/execution/electron-browser/terminal';
+import { ITerminalConfiguration, getDefaultTerminalWindows, getDefaultTerminalLinuxReady, DEFAULT_TERMINAL_OSX } from 'vs/workbench/parts/execution/electron-browser/terminal';
 import uri from 'vs/base/common/uri';
 import { IProcessEnvironment } from 'vs/base/common/platform';
 
@@ -31,7 +31,7 @@ export class WinTerminalService implements ITerminalService {
 	private static readonly CMD = 'cmd.exe';
 
 	constructor(
-		@IConfigurationService private _configurationService: IConfigurationService
+		@IConfigurationService private readonly _configurationService: IConfigurationService
 	) {
 	}
 
@@ -46,7 +46,7 @@ export class WinTerminalService implements ITerminalService {
 
 		const configuration = this._configurationService.getValue<ITerminalConfiguration>();
 		const terminalConfig = configuration.terminal.external;
-		const exec = terminalConfig.windowsExec || DEFAULT_TERMINAL_WINDOWS;
+		const exec = terminalConfig.windowsExec || getDefaultTerminalWindows();
 
 		return new TPromise<void>((c, e) => {
 
@@ -78,7 +78,7 @@ export class WinTerminalService implements ITerminalService {
 
 	private spawnTerminal(spawner, configuration: ITerminalConfiguration, command: string, cwd?: string): TPromise<void> {
 		const terminalConfig = configuration.terminal.external;
-		const exec = terminalConfig.windowsExec || DEFAULT_TERMINAL_WINDOWS;
+		const exec = terminalConfig.windowsExec || getDefaultTerminalWindows();
 		const spawnType = this.getSpawnType(exec);
 
 		// Make the drive letter uppercase on Windows (see #9448)
@@ -120,7 +120,7 @@ export class MacTerminalService implements ITerminalService {
 	private static readonly OSASCRIPT = '/usr/bin/osascript';	// osascript is the AppleScript interpreter on OS X
 
 	constructor(
-		@IConfigurationService private _configurationService: IConfigurationService
+		@IConfigurationService private readonly _configurationService: IConfigurationService
 	) { }
 
 	public openTerminal(cwd?: string): void {
@@ -211,7 +211,7 @@ export class LinuxTerminalService implements ITerminalService {
 	private static readonly WAIT_MESSAGE = nls.localize('press.any.key', "Press any key to continue...");
 
 	constructor(
-		@IConfigurationService private _configurationService: IConfigurationService
+		@IConfigurationService private readonly _configurationService: IConfigurationService
 	) { }
 
 
@@ -226,7 +226,7 @@ export class LinuxTerminalService implements ITerminalService {
 
 		const configuration = this._configurationService.getValue<ITerminalConfiguration>();
 		const terminalConfig = configuration.terminal.external;
-		const execPromise = terminalConfig.linuxExec ? TPromise.as(terminalConfig.linuxExec) : DEFAULT_TERMINAL_LINUX_READY;
+		const execPromise = terminalConfig.linuxExec ? TPromise.as(terminalConfig.linuxExec) : getDefaultTerminalLinuxReady();
 
 		return new TPromise<void>((c, e) => {
 
@@ -280,7 +280,7 @@ export class LinuxTerminalService implements ITerminalService {
 
 	private spawnTerminal(spawner, configuration: ITerminalConfiguration, cwd?: string): TPromise<void> {
 		const terminalConfig = configuration.terminal.external;
-		const execPromise = terminalConfig.linuxExec ? TPromise.as(terminalConfig.linuxExec) : DEFAULT_TERMINAL_LINUX_READY;
+		const execPromise = terminalConfig.linuxExec ? TPromise.as(terminalConfig.linuxExec) : getDefaultTerminalLinuxReady();
 		const env = cwd ? { cwd: cwd } : void 0;
 
 		return new TPromise<void>((c, e) => {
diff --git a/src/vs/workbench/parts/execution/test/electron-browser/terminalService.test.ts b/src/vs/workbench/parts/execution/test/electron-browser/terminalService.test.ts
index 9eb9e7b123e..787aded95ef 100644
--- a/src/vs/workbench/parts/execution/test/electron-browser/terminalService.test.ts
+++ b/src/vs/workbench/parts/execution/test/electron-browser/terminalService.test.ts
@@ -7,7 +7,7 @@
 
 import { deepEqual, equal } from 'assert';
 import { WinTerminalService, LinuxTerminalService, MacTerminalService } from 'vs/workbench/parts/execution/electron-browser/terminalService';
-import { DEFAULT_TERMINAL_WINDOWS, DEFAULT_TERMINAL_LINUX_READY, DEFAULT_TERMINAL_OSX } from 'vs/workbench/parts/execution/electron-browser/terminal';
+import { getDefaultTerminalWindows, getDefaultTerminalLinuxReady, DEFAULT_TERMINAL_OSX } from 'vs/workbench/parts/execution/electron-browser/terminal';
 
 suite('Execution - TerminalService', () => {
 	let mockOnExit: Function;
@@ -61,7 +61,7 @@ suite('Execution - TerminalService', () => {
 		let mockSpawner = {
 			spawn: (command: any, args: any, opts: any) => {
 				// assert
-				equal(args[args.length - 1], DEFAULT_TERMINAL_WINDOWS, 'terminal should equal expected');
+				equal(args[args.length - 1], getDefaultTerminalWindows(), 'terminal should equal expected');
 				done();
 				return {
 					on: (evt: any) => evt
@@ -197,7 +197,7 @@ suite('Execution - TerminalService', () => {
 	});
 
 	test(`LinuxTerminalService - uses default terminal when configuration.terminal.external.linuxExec is undefined`, done => {
-		DEFAULT_TERMINAL_LINUX_READY.then(defaultTerminalLinux => {
+		getDefaultTerminalLinuxReady().then(defaultTerminalLinux => {
 			let testCwd = 'path/to/workspace';
 			let mockSpawner = {
 				spawn: (command: any, args: any, opts: any) => {
@@ -220,4 +220,4 @@ suite('Execution - TerminalService', () => {
 			);
 		});
 	});
-});
\ No newline at end of file
+});
diff --git a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
index 20d38a211f6..ced754665f7 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
@@ -16,7 +16,6 @@ import Event, { Emitter, once, chain } from 'vs/base/common/event';
 import Cache from 'vs/base/common/cache';
 import { Action } from 'vs/base/common/actions';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
-import Severity from 'vs/base/common/severity';
 import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
 import { Builder } from 'vs/base/browser/builder';
 import { domEvent } from 'vs/base/browser/event';
@@ -25,7 +24,7 @@ import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IExtensionManifest, IKeyBinding, IView, IExtensionTipsService } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionManifest, IKeyBinding, IView, IExtensionTipsService, LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ResolvedKeybinding, KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput';
 import { IExtensionsWorkbenchService, IExtensionsViewlet, VIEWLET_ID, IExtension, IExtensionDependencies } from 'vs/workbench/parts/extensions/common/extensions';
@@ -33,12 +32,11 @@ import { Renderer, DataSource, Controller } from 'vs/workbench/parts/extensions/
 import { RatingsWidget, InstallCountWidget } from 'vs/workbench/parts/extensions/browser/extensionsWidgets';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { CombinedInstallAction, UpdateAction, EnableAction, DisableAction, BuiltinStatusLabelAction, ReloadAction, MaliciousStatusLabelAction } from 'vs/workbench/parts/extensions/browser/extensionsActions';
-import WebView from 'vs/workbench/parts/html/browser/webview';
+import { CombinedInstallAction, UpdateAction, EnableAction, DisableAction, ReloadAction, MaliciousStatusLabelAction } from 'vs/workbench/parts/extensions/browser/extensionsActions';
+import { Webview } from 'vs/workbench/parts/html/browser/webview';
 import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
 import { Position } from 'vs/platform/editor/common/editor';
@@ -46,7 +44,7 @@ import { IPartService, Parts } from 'vs/workbench/services/part/common/partServi
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IContextKeyService, RawContextKey, ContextKeyExpr, IContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { Command, ICommandOptions } from 'vs/editor/browser/editorExtensions';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
@@ -54,15 +52,13 @@ import { Color } from 'vs/base/common/color';
 import { WorkbenchTree } from 'vs/platform/list/browser/listService';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { assign } from 'vs/base/common/objects';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 /**  A context key that is set when an extension editor webview has focus. */
 export const KEYBINDING_CONTEXT_EXTENSIONEDITOR_WEBVIEW_FOCUS = new RawContextKey<boolean>('extensionEditorWebviewFocus', undefined);
-/**  A context key that is set when an extension editor webview not have focus. */
-export const KEYBINDING_CONTEXT_EXTENSIONEDITOR_WEBVIEW_NOT_FOCUSED: ContextKeyExpr = KEYBINDING_CONTEXT_EXTENSIONEDITOR_WEBVIEW_FOCUS.toNegated();
 /**  A context key that is set when the find widget find input in extension editor webview is focused. */
 export const KEYBINDING_CONTEXT_EXTENSIONEDITOR_FIND_WIDGET_INPUT_FOCUSED = new RawContextKey<boolean>('extensionEditorFindWidgetInputFocused', false);
-/**  A context key that is set when the find widget find input in extension editor webview is not focused. */
-export const KEYBINDING_CONTEXT_EXTENSIONEDITOR_FIND_WIDGET_INPUT_NOT_FOCUSED: ContextKeyExpr = KEYBINDING_CONTEXT_EXTENSIONEDITOR_FIND_WIDGET_INPUT_FOCUSED.toNegated();
 
 function renderBody(body: string): string {
 	const styleSheetPath = require.toUrl('./media/markdown.css').replace('file://', 'vscode-core-resource://');
@@ -153,12 +149,13 @@ interface ILayoutParticipant {
 
 export class ExtensionEditor extends BaseEditor {
 
-	static ID: string = 'workbench.editor.extension';
+	static readonly ID: string = 'workbench.editor.extension';
 
 	private icon: HTMLImageElement;
 	private name: HTMLElement;
 	private identifier: HTMLElement;
 	private preview: HTMLElement;
+	private builtin: HTMLElement;
 	private license: HTMLElement;
 	private publisher: HTMLElement;
 	private installCount: HTMLElement;
@@ -182,7 +179,7 @@ export class ExtensionEditor extends BaseEditor {
 	private contentDisposables: IDisposable[] = [];
 	private transientDisposables: IDisposable[] = [];
 	private disposables: IDisposable[];
-	private activeWebview: WebView;
+	private activeWebview: Webview;
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -191,13 +188,14 @@ export class ExtensionEditor extends BaseEditor {
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IThemeService protected themeService: IThemeService,
 		@IKeybindingService private keybindingService: IKeybindingService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IOpenerService private openerService: IOpenerService,
 		@IPartService private partService: IPartService,
 		@IContextViewService private contextViewService: IContextViewService,
 		@IContextKeyService private contextKeyService: IContextKeyService,
 		@IExtensionTipsService private extensionTipsService: IExtensionTipsService,
-		@IEnvironmentService private environmentService: IEnvironmentService
+		@IEnvironmentService private environmentService: IEnvironmentService,
+		@IWorkspaceContextService private contextService: IWorkspaceContextService
 
 	) {
 		super(ExtensionEditor.ID, telemetryService, themeService);
@@ -222,7 +220,12 @@ export class ExtensionEditor extends BaseEditor {
 		const title = append(details, $('.title'));
 		this.name = append(title, $('span.name.clickable', { title: localize('name', "Extension name") }));
 		this.identifier = append(title, $('span.identifier', { title: localize('extension id', "Extension identifier") }));
+
 		this.preview = append(title, $('span.preview', { title: localize('preview', "Preview") }));
+		this.preview.textContent = localize('preview', "Preview");
+
+		this.builtin = append(title, $('span.builtin'));
+		this.builtin.textContent = localize('builtin', "Built-in");
 
 		const subtitle = append(details, $('.subtitle'));
 		this.publisher = append(subtitle, $('span.publisher.clickable', { title: localize('publisher', "Publisher name") }));
@@ -285,11 +288,8 @@ export class ExtensionEditor extends BaseEditor {
 
 		this.name.textContent = extension.displayName;
 		this.identifier.textContent = extension.id;
-		if (extension.preview) {
-			this.preview.textContent = localize('preview', "Preview");
-		} else {
-			this.preview.textContent = null;
-		}
+		this.preview.style.display = extension.preview ? 'inherit' : 'none';
+		this.builtin.style.display = extension.type === LocalExtensionType.System ? 'inherit' : 'none';
 
 		this.publisher.textContent = extension.publisherDisplayName;
 		this.description.textContent = extension.description;
@@ -348,7 +348,6 @@ export class ExtensionEditor extends BaseEditor {
 		const ratings = this.instantiationService.createInstance(RatingsWidget, this.rating, { extension });
 		this.transientDisposables.push(ratings);
 
-		const builtinStatusAction = this.instantiationService.createInstance(BuiltinStatusLabelAction);
 		const maliciousStatusAction = this.instantiationService.createInstance(MaliciousStatusLabelAction, true);
 		const installAction = this.instantiationService.createInstance(CombinedInstallAction);
 		const updateAction = this.instantiationService.createInstance(UpdateAction);
@@ -357,7 +356,6 @@ export class ExtensionEditor extends BaseEditor {
 		const reloadAction = this.instantiationService.createInstance(ReloadAction);
 
 		installAction.extension = extension;
-		builtinStatusAction.extension = extension;
 		maliciousStatusAction.extension = extension;
 		updateAction.extension = extension;
 		enableAction.extension = extension;
@@ -365,8 +363,8 @@ export class ExtensionEditor extends BaseEditor {
 		reloadAction.extension = extension;
 
 		this.extensionActionBar.clear();
-		this.extensionActionBar.push([reloadAction, updateAction, enableAction, disableAction, installAction, builtinStatusAction, maliciousStatusAction], { icon: true, label: true });
-		this.transientDisposables.push(enableAction, updateAction, reloadAction, disableAction, installAction, builtinStatusAction, maliciousStatusAction);
+		this.extensionActionBar.push([reloadAction, updateAction, enableAction, disableAction, installAction, maliciousStatusAction], { icon: true, label: true });
+		this.transientDisposables.push(enableAction, updateAction, reloadAction, disableAction, installAction, maliciousStatusAction);
 
 		this.navbar.clear();
 		this.navbar.onChange(this.onNavbarChange.bind(this, extension), this, this.transientDisposables);
@@ -423,12 +421,12 @@ export class ExtensionEditor extends BaseEditor {
 			.then<void>(body => {
 				const allowedBadgeProviders = this.extensionsWorkbenchService.allowedBadgeProviders;
 				const webViewOptions = allowedBadgeProviders.length > 0 ? { allowScripts: false, allowSvgs: false, svgWhiteList: allowedBadgeProviders } : {};
-				this.activeWebview = new WebView(this.content, this.partService.getContainer(Parts.EDITOR_PART), this.environmentService, this.contextViewService, this.contextKey, this.findInputFocusContextKey, webViewOptions, false);
+				this.activeWebview = new Webview(this.content, this.partService.getContainer(Parts.EDITOR_PART), this.environmentService, this.contextService, this.contextViewService, this.contextKey, this.findInputFocusContextKey, webViewOptions, false);
 				const removeLayoutParticipant = arrays.insert(this.layoutParticipants, this.activeWebview);
 				this.contentDisposables.push(toDisposable(removeLayoutParticipant));
 
 				this.activeWebview.style(this.themeService.getTheme());
-				this.activeWebview.contents = [body];
+				this.activeWebview.contents = body;
 
 				this.activeWebview.onDidClickLink(link => {
 					// Whitelist supported schemes for links
@@ -517,7 +515,7 @@ export class ExtensionEditor extends BaseEditor {
 				scrollableContent.scanDomNode();
 			}, error => {
 				append(this.content, $('p.nocontent')).textContent = error;
-				this.messageService.show(Severity.Error, error);
+				this.notificationService.error(error);
 			});
 		});
 	}
@@ -928,7 +926,7 @@ export class ExtensionEditor extends BaseEditor {
 			return;
 		}
 
-		this.messageService.show(Severity.Error, err);
+		this.notificationService.error(err);
 	}
 
 	dispose(): void {
diff --git a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
index a6b981a9006..9f84e91c9af 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
@@ -20,7 +20,6 @@ import { ExtensionsConfigurationInitialContent } from 'vs/workbench/parts/extens
 import { LocalExtensionType, IExtensionEnablementService, IExtensionTipsService, EnablementState, ExtensionsLabel } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { ToggleViewletAction } from 'vs/workbench/browser/viewlet';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -38,12 +37,12 @@ import { Color } from 'vs/base/common/color';
 import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
 import { ITextEditorSelection } from 'vs/platform/editor/common/editor';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import Severity from 'vs/base/common/severity';
 import { PagedModel } from 'vs/base/common/paging';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/workspaceCommands';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class InstallAction extends Action {
 
@@ -392,7 +391,7 @@ export class ManageExtensionAction extends Action {
 		this.class = ManageExtensionAction.HideManageExtensionClass;
 		this.tooltip = '';
 		this.enabled = false;
-		if (this.extension && this.extension.type !== LocalExtensionType.System) {
+		if (this.extension) {
 			const state = this.extension.state;
 			this.enabled = state === ExtensionState.Installed;
 			this.class = this.enabled || state === ExtensionState.Uninstalling ? ManageExtensionAction.Class : ManageExtensionAction.HideManageExtensionClass;
@@ -573,7 +572,7 @@ export class DisableForWorkspaceAction extends Action implements IExtensionActio
 	private update(): void {
 		this.enabled = false;
 		if (this.extension && this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY) {
-			this.enabled = this.extension.type !== LocalExtensionType.System && (this.extension.enablementState === EnablementState.Enabled || this.extension.enablementState === EnablementState.WorkspaceEnabled) && this.extension.local && this.extensionEnablementService.canChangeEnablement(this.extension.local);
+			this.enabled = (this.extension.enablementState === EnablementState.Enabled || this.extension.enablementState === EnablementState.WorkspaceEnabled) && this.extension.local && this.extensionEnablementService.canChangeEnablement(this.extension.local);
 		}
 	}
 
@@ -611,7 +610,7 @@ export class DisableGloballyAction extends Action implements IExtensionAction {
 	private update(): void {
 		this.enabled = false;
 		if (this.extension) {
-			this.enabled = this.extension.type !== LocalExtensionType.System && (this.extension.enablementState === EnablementState.Enabled || this.extension.enablementState === EnablementState.WorkspaceEnabled) && this.extension.local && this.extensionEnablementService.canChangeEnablement(this.extension.local);
+			this.enabled = (this.extension.enablementState === EnablementState.Enabled || this.extension.enablementState === EnablementState.WorkspaceEnabled) && this.extension.local && this.extensionEnablementService.canChangeEnablement(this.extension.local);
 		}
 	}
 
@@ -665,7 +664,7 @@ export class DisableAction extends Action {
 			return;
 		}
 
-		this.enabled = this.extension.state === ExtensionState.Installed && this.extension.type !== LocalExtensionType.System && this._disableActions.some(a => a.enabled);
+		this.enabled = this.extension.state === ExtensionState.Installed && this._disableActions.some(a => a.enabled);
 		this.class = this.enabled ? DisableAction.EnabledClass : DisableAction.DisabledClass;
 	}
 
@@ -1004,6 +1003,29 @@ export class ClearExtensionsInputAction extends Action {
 	}
 }
 
+export class ShowBuiltInExtensionsAction extends Action {
+
+	static readonly ID = 'workbench.extensions.action.listBuiltInExtensions';
+	static LABEL = localize('showBuiltInExtensions', "Show Built-in Extensions");
+
+	constructor(
+		id: string,
+		label: string,
+		@IViewletService private viewletService: IViewletService
+	) {
+		super(id, label, null, true);
+	}
+
+	run(): TPromise<void> {
+		return this.viewletService.openViewlet(VIEWLET_ID, true)
+			.then(viewlet => viewlet as IExtensionsViewlet)
+			.then(viewlet => {
+				viewlet.search('@builtin ');
+				viewlet.focus();
+			});
+	}
+}
+
 export class ShowOutdatedExtensionsAction extends Action {
 
 	static readonly ID = 'workbench.extensions.action.listOutdatedExtensions';
@@ -1087,7 +1109,7 @@ export class InstallWorkspaceRecommendedExtensionsAction extends Action {
 		@IViewletService private viewletService: IViewletService,
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IExtensionTipsService private extensionTipsService: IExtensionTipsService,
-		@IMessageService private messageService: IMessageService
+		@INotificationService private notificationService: INotificationService
 	) {
 		super(id, label, 'extension-action');
 		this.extensionsWorkbenchService.onChange(() => this.update(), this, this.disposables);
@@ -1114,7 +1136,7 @@ export class InstallWorkspaceRecommendedExtensionsAction extends Action {
 				.then(viewlet => {
 					if (!toInstall.length) {
 						this.enabled = false;
-						this.messageService.show(Severity.Info, localize('allExtensionsInstalled', "All extensions recommended for this workspace have already been installed"));
+						this.notificationService.info(localize('allExtensionsInstalled', "All extensions recommended for this workspace have already been installed"));
 						viewlet.focus();
 						return TPromise.as(null);
 					}
@@ -1162,7 +1184,7 @@ export class InstallRecommendedExtensionAction extends Action {
 		extensionId: string,
 		@IViewletService private viewletService: IViewletService,
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IMessageService private messageService: IMessageService
+		@INotificationService private notificationService: INotificationService
 	) {
 		super(InstallRecommendedExtensionAction.ID, InstallRecommendedExtensionAction.LABEL, null);
 		this.extensionId = extensionId;
@@ -1179,7 +1201,7 @@ export class InstallRecommendedExtensionAction extends Action {
 			.then(viewlet => {
 				if (this.extensionsWorkbenchService.local.some(x => x.id.toLowerCase() === this.extensionId.toLowerCase())) {
 					this.enabled = false;
-					this.messageService.show(Severity.Info, localize('extensionInstalled', "The recommended extension has already been installed"));
+					this.notificationService.info(localize('extensionInstalled', "The recommended extension has already been installed"));
 					viewlet.focus();
 					return TPromise.as(null);
 				}
@@ -1530,31 +1552,6 @@ export class ConfigureWorkspaceFolderRecommendedExtensionsAction extends Abstrac
 	}
 }
 
-export class BuiltinStatusLabelAction extends Action {
-
-	private static readonly Class = 'built-in-status';
-
-	private _extension: IExtension;
-	get extension(): IExtension { return this._extension; }
-	set extension(extension: IExtension) { this._extension = extension; this.update(); }
-
-	constructor() {
-		super('extensions.install', localize('builtin', "Built-in"), '', false);
-	}
-
-	private update(): void {
-		if (this.extension && this.extension.type === LocalExtensionType.System) {
-			this.class = `${BuiltinStatusLabelAction.Class} system`;
-		} else {
-			this.class = `${BuiltinStatusLabelAction.Class} user`;
-		}
-	}
-
-	run(): TPromise<any> {
-		return TPromise.as(null);
-	}
-}
-
 export class MaliciousStatusLabelAction extends Action {
 
 	private static readonly Class = 'malicious-status';
diff --git a/src/vs/workbench/parts/extensions/browser/extensionsList.ts b/src/vs/workbench/parts/extensions/browser/extensionsList.ts
index 6bcb78be8ec..3550a47ee42 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionsList.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionsList.ts
@@ -10,18 +10,18 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Action } from 'vs/base/common/actions';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { IDelegate } from 'vs/base/browser/ui/list/list';
 import { IPagedRenderer } from 'vs/base/browser/ui/list/listPaging';
 import { once } from 'vs/base/common/event';
 import { domEvent } from 'vs/base/browser/event';
 import { IExtension, IExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/common/extensions';
-import { InstallAction, UpdateAction, BuiltinStatusLabelAction, ManageExtensionAction, ReloadAction, extensionButtonProminentBackground, extensionButtonProminentForeground, MaliciousStatusLabelAction } from 'vs/workbench/parts/extensions/browser/extensionsActions';
+import { InstallAction, UpdateAction, ManageExtensionAction, ReloadAction, extensionButtonProminentBackground, extensionButtonProminentForeground, MaliciousStatusLabelAction } from 'vs/workbench/parts/extensions/browser/extensionsActions';
 import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { Label, RatingsWidget, InstallCountWidget } from 'vs/workbench/parts/extensions/browser/extensionsWidgets';
 import { IExtensionService } from 'vs/platform/extensions/common/extensions';
 import { IExtensionTipsService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export interface ITemplateData {
 	root: HTMLElement;
@@ -48,7 +48,7 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 
 	constructor(
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IExtensionService private extensionService: IExtensionService,
 		@IExtensionTipsService private extensionTipsService: IExtensionTipsService,
@@ -90,21 +90,20 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 				return null;
 			}
 		});
-		actionbar.onDidRun(({ error }) => error && this.messageService.show(Severity.Error, error));
+		actionbar.onDidRun(({ error }) => error && this.notificationService.error(error));
 
 		const versionWidget = this.instantiationService.createInstance(Label, version, (e: IExtension) => e.version);
 		const installCountWidget = this.instantiationService.createInstance(InstallCountWidget, installCount, { small: true });
 		const ratingsWidget = this.instantiationService.createInstance(RatingsWidget, ratings, { small: true });
 
-		const builtinStatusAction = this.instantiationService.createInstance(BuiltinStatusLabelAction);
 		const maliciousStatusAction = this.instantiationService.createInstance(MaliciousStatusLabelAction, false);
 		const installAction = this.instantiationService.createInstance(InstallAction);
 		const updateAction = this.instantiationService.createInstance(UpdateAction);
 		const reloadAction = this.instantiationService.createInstance(ReloadAction);
 		const manageAction = this.instantiationService.createInstance(ManageExtensionAction);
 
-		actionbar.push([reloadAction, updateAction, installAction, builtinStatusAction, maliciousStatusAction, manageAction], actionOptions);
-		const disposables = [versionWidget, installCountWidget, ratingsWidget, builtinStatusAction, maliciousStatusAction, updateAction, reloadAction, manageAction, actionbar, bookmarkStyler];
+		actionbar.push([reloadAction, updateAction, installAction, maliciousStatusAction, manageAction], actionOptions);
+		const disposables = [versionWidget, installCountWidget, ratingsWidget, maliciousStatusAction, updateAction, reloadAction, manageAction, actionbar, bookmarkStyler];
 
 		return {
 			root, element, icon, name, installCount, ratings, author, description, disposables,
@@ -113,7 +112,6 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 				versionWidget.extension = extension;
 				installCountWidget.extension = extension;
 				ratingsWidget.extension = extension;
-				builtinStatusAction.extension = extension;
 				maliciousStatusAction.extension = extension;
 				installAction.extension = extension;
 				updateAction.extension = extension;
diff --git a/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts b/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts
index cf4aebc302c..13df5927501 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts
@@ -11,7 +11,7 @@ import { QuickOpenHandler } from 'vs/workbench/browser/quickopen';
 import { IExtensionsViewlet, VIEWLET_ID } from 'vs/workbench/parts/extensions/common/extensions';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IExtensionGalleryService, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 class SimpleEntry extends QuickOpenEntry {
 
@@ -77,7 +77,7 @@ export class GalleryExtensionsHandler extends QuickOpenHandler {
 		@IViewletService private viewletService: IViewletService,
 		@IExtensionGalleryService private galleryService: IExtensionGalleryService,
 		@IExtensionManagementService private extensionsService: IExtensionManagementService,
-		@IMessageService private messageService: IMessageService
+		@INotificationService private notificationService: INotificationService
 	) {
 		super();
 	}
@@ -100,7 +100,7 @@ export class GalleryExtensionsHandler extends QuickOpenHandler {
 								.then(viewlet => viewlet as IExtensionsViewlet)
 								.then(viewlet => viewlet.search(`@id:${text}`))
 								.then(() => this.extensionsService.installFromGallery(galleryExtension))
-								.done(null, err => this.messageService.show(Severity.Error, err));
+								.done(null, err => this.notificationService.error(err));
 						};
 
 						entries.push(new SimpleEntry(label, action));
diff --git a/src/vs/workbench/parts/extensions/browser/media/code-icon.svg b/src/vs/workbench/parts/extensions/browser/media/code-icon.svg
new file mode 100644
index 00000000000..cc61f81ea5a
--- /dev/null
+++ b/src/vs/workbench/parts/extensions/browser/media/code-icon.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024"><style>.st0{fill:#f6f6f6;fill-opacity:0}.st1{fill:#fff}.st2{fill:#167abf}</style><path class="st0" d="M1024 1024H0V0h1024v1024z"/><path class="st1" d="M1024 85.333v853.333H0V85.333h1024z"/><path class="st2" d="M0 85.333h298.667v853.333H0V85.333zm1024 0v853.333H384V85.333h640zm-554.667 160h341.333v-64H469.333v64zm341.334 533.334H469.333v64h341.333l.001-64zm128-149.334H597.333v64h341.333l.001-64zm0-149.333H597.333v64h341.333l.001-64zm0-149.333H597.333v64h341.333l.001-64z"/></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/extensions/browser/media/extensionActions.css b/src/vs/workbench/parts/extensions/browser/media/extensionActions.css
index 9ff9876d7e5..bc8bf6f9743 100644
--- a/src/vs/workbench/parts/extensions/browser/media/extensionActions.css
+++ b/src/vs/workbench/parts/extensions/browser/media/extensionActions.css
@@ -30,12 +30,10 @@
 .monaco-action-bar .action-item.disabled .action-label.extension-action.enable,
 .monaco-action-bar .action-item.disabled .action-label.extension-action.disable,
 .monaco-action-bar .action-item.disabled .action-label.extension-action.reload,
-.monaco-action-bar .action-item.disabled .action-label.built-in-status.user,
 .monaco-action-bar .action-item.disabled .action-label.malicious-status.not-malicious {
 	display: none;
 }
 
-.monaco-action-bar .action-item .action-label.built-in-status
 .monaco-action-bar .action-item .action-label.malicious-status {
 	border-radius: 4px;
 	color: inherit;
@@ -46,7 +44,6 @@
 	line-height: initial;
 }
 
-.extension-editor>.header>.details>.actions>.monaco-action-bar .action-item .action-label.built-in-status,
 .extension-editor>.header>.details>.actions>.monaco-action-bar .action-item .action-label.malicious-status {
 	font-weight: normal;
 }
diff --git a/src/vs/workbench/parts/extensions/browser/media/extensionEditor.css b/src/vs/workbench/parts/extensions/browser/media/extensionEditor.css
index 75f9f139f12..1addf69c029 100644
--- a/src/vs/workbench/parts/extensions/browser/media/extensionEditor.css
+++ b/src/vs/workbench/parts/extensions/browser/media/extensionEditor.css
@@ -61,6 +61,12 @@
 	white-space: nowrap;
 }
 
+.extension-editor > .header > .details > .title > .builtin {
+	font-size: 10px;
+	font-style: italic;
+	margin-left: 10px;
+}
+
 .vs .extension-editor > .header > .details > .title > .preview {
 	color: white;
 }
@@ -337,4 +343,4 @@
 	font-size: 90%;
 	font-weight: 600;
 	opacity: 0.6;
-}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/extensions/common/extensions.ts b/src/vs/workbench/parts/extensions/common/extensions.ts
index d26c46d117b..b1124cb6ffc 100644
--- a/src/vs/workbench/parts/extensions/common/extensions.ts
+++ b/src/vs/workbench/parts/extensions/common/extensions.ts
@@ -86,8 +86,10 @@ export interface IExtensionsWorkbenchService {
 
 export const ConfigurationKey = 'extensions';
 export const AutoUpdateConfigurationKey = 'extensions.autoUpdate';
+export const ShowRecommendationsOnlyOnDemandKey = 'extensions.showRecommendationsOnlyOnDemand';
 
 export interface IExtensionsConfiguration {
 	autoUpdate: boolean;
 	ignoreRecommendations: boolean;
+	showRecommendationsOnlyOnDemand: boolean;
 }
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts
index 7a8e65fd19e..610f8bdec77 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts
@@ -16,7 +16,7 @@ import { StatusbarAlignment, IStatusbarRegistry, StatusbarItemDescriptor, Extens
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IExtensionHostProfileService, ProfileSessionState, RuntimeExtensionsInput } from 'vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class ExtensionHostProfileService extends Disposable implements IExtensionHostProfileService {
 
@@ -39,7 +39,7 @@ export class ExtensionHostProfileService extends Disposable implements IExtensio
 		@IExtensionService private readonly _extensionService: IExtensionService,
 		@IWorkbenchEditorService private readonly _editorService: IWorkbenchEditorService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IMessageService private readonly _messageService: IMessageService
+		@INotificationService private readonly _notificationService: INotificationService
 	) {
 		super();
 		this._profile = null;
@@ -71,7 +71,7 @@ export class ExtensionHostProfileService extends Disposable implements IExtensio
 		}
 
 		if (!this._extensionService.canProfileExtensionHost()) {
-			this._messageService.show(Severity.Info, nls.localize('noPro', "To profile extensions, launch with `--inspect-extensions=<port>`."));
+			this._notificationService.info(nls.localize('noPro', "To profile extensions, launch with '--inspect-extensions=<port>'."));
 			return;
 		}
 
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
index 5be419ee069..9279553faea 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
@@ -15,14 +15,13 @@ import { IModelService } from 'vs/editor/common/services/modelService';
 import { ITextModel } from 'vs/editor/common/model';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import product from 'vs/platform/node/product';
-import { IChoiceService, IMessageService } from 'vs/platform/message/common/message';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ShowRecommendedExtensionsAction, InstallWorkspaceRecommendedExtensionsAction, InstallRecommendedExtensionAction } from 'vs/workbench/parts/extensions/browser/extensionsActions';
 import Severity from 'vs/base/common/severity';
 import { IWorkspaceContextService, IWorkspaceFolder, IWorkspace, IWorkspaceFoldersChangeEvent, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { Schemas } from 'vs/base/common/network';
 import { IFileService } from 'vs/platform/files/common/files';
-import { IExtensionsConfiguration, ConfigurationKey } from 'vs/workbench/parts/extensions/common/extensions';
+import { IExtensionsConfiguration, ConfigurationKey, ShowRecommendationsOnlyOnDemandKey } from 'vs/workbench/parts/extensions/common/extensions';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import * as pfs from 'vs/base/node/pfs';
@@ -36,6 +35,7 @@ import { getHashedRemotesFromUri } from 'vs/workbench/parts/stats/node/workspace
 import { IRequestService } from 'vs/platform/request/node/request';
 import { asJson } from 'vs/base/node/request';
 import { isNumber } from 'vs/base/common/types';
+import { IChoiceService, Choice } from 'vs/platform/dialogs/common/dialogs';
 
 interface IExtensionsContent {
 	recommendations: string[];
@@ -44,7 +44,6 @@ interface IExtensionsContent {
 const empty: { [key: string]: any; } = Object.create(null);
 const milliSecondsInADay = 1000 * 60 * 60 * 24;
 const choiceNever = localize('neverShowAgain', "Don't Show Again");
-const choiceClose = localize('close', "Close");
 
 interface IDynamicWorkspaceRecommendations {
 	remoteSet: string[];
@@ -63,10 +62,11 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 	private _extensionsRecommendationsUrl: string;
 	private _disposables: IDisposable[] = [];
 	public promptWorkspaceRecommendationsPromise: TPromise<any>;
+	private proactiveRecommendationsFetched: boolean = false;
 
 	constructor(
-		@IExtensionGalleryService private _galleryService: IExtensionGalleryService,
-		@IModelService private _modelService: IModelService,
+		@IExtensionGalleryService private readonly _galleryService: IExtensionGalleryService,
+		@IModelService private readonly _modelService: IModelService,
 		@IStorageService private storageService: IStorageService,
 		@IChoiceService private choiceService: IChoiceService,
 		@IExtensionManagementService private extensionsService: IExtensionManagementService,
@@ -74,7 +74,6 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		@IFileService private fileService: IFileService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IConfigurationService private configurationService: IConfigurationService,
-		@IMessageService private messageService: IMessageService,
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@IExtensionService private extensionService: IExtensionService,
@@ -89,15 +88,39 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		if (product.extensionsGallery && product.extensionsGallery.recommendationsUrl) {
 			this._extensionsRecommendationsUrl = product.extensionsGallery.recommendationsUrl;
 		}
-		this.getDynamicWorkspaceRecommendations();
-		this._suggestFileBasedRecommendations();
 
+		this.getCachedDynamicWorkspaceRecommendations();
+		this._suggestFileBasedRecommendations();
 		this.promptWorkspaceRecommendationsPromise = this._suggestWorkspaceRecommendations();
 
-		// Executable based recommendations carry out a lot of file stats, so run them after 10 secs
-		// So that the startup is not affected
-		setTimeout(() => this._suggestBasedOnExecutables(this._exeBasedRecommendations), 10000);
+		if (!this.configurationService.getValue<boolean>(ShowRecommendationsOnlyOnDemandKey)) {
+			this.fetchProactiveRecommendations(true);
+		}
+
 		this._register(this.contextService.onDidChangeWorkspaceFolders(e => this.onWorkspaceFoldersChanged(e)));
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			if (!this.proactiveRecommendationsFetched && !this.configurationService.getValue<boolean>(ShowRecommendationsOnlyOnDemandKey)) {
+				this.fetchProactiveRecommendations();
+			}
+		}));
+	}
+
+	private fetchProactiveRecommendations(calledDuringStartup?: boolean): TPromise<void> {
+		let fetchPromise = TPromise.as(null);
+		if (!this.proactiveRecommendationsFetched) {
+			this.proactiveRecommendationsFetched = true;
+
+			// Executable based recommendations carry out a lot of file stats, so run them after 10 secs
+			// So that the startup is not affected
+
+			fetchPromise = new TPromise((c, e) => {
+				setTimeout(() => {
+					TPromise.join([this._suggestBasedOnExecutables(), this.getDynamicWorkspaceRecommendations()]).then(() => c(null));
+				}, calledDuringStartup ? 10000 : 0);
+			});
+
+		}
+		return fetchPromise;
 	}
 
 	private isEnabled(): boolean {
@@ -107,6 +130,10 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 	getAllRecommendationsWithReason(): { [id: string]: { reasonId: ExtensionRecommendationReason, reasonText: string }; } {
 		let output: { [id: string]: { reasonId: ExtensionRecommendationReason, reasonText: string }; } = Object.create(null);
 
+		if (!this.proactiveRecommendationsFetched) {
+			return output;
+		}
+
 		if (this.contextService.getWorkspace().folders && this.contextService.getWorkspace().folders.length === 1) {
 			const currentRepo = this.contextService.getWorkspace().folders[0].name;
 			this._dynamicWorkspaceRecommendations.forEach(x => output[x.toLowerCase()] = {
@@ -238,10 +265,12 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		return fileBased;
 	}
 
-	getOtherRecommendations(): string[] {
-		const others = distinct([...Object.keys(this._exeBasedRecommendations), ...this._dynamicWorkspaceRecommendations]);
-		shuffle(others);
-		return others;
+	getOtherRecommendations(): TPromise<string[]> {
+		return this.fetchProactiveRecommendations().then(() => {
+			const others = distinct([...Object.keys(this._exeBasedRecommendations), ...this._dynamicWorkspaceRecommendations]);
+			shuffle(others);
+			return others;
+		});
 	}
 
 	getKeymapRecommendations(): string[] {
@@ -342,7 +371,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 			);
 
 			const config = this.configurationService.getValue<IExtensionsConfiguration>(ConfigurationKey);
-			if (config.ignoreRecommendations) {
+			if (config.ignoreRecommendations || config.showRecommendationsOnlyOnDemand) {
 				return;
 			}
 
@@ -369,16 +398,15 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 
 				const recommendationsAction = this.instantiationService.createInstance(ShowRecommendedExtensionsAction, ShowRecommendedExtensionsAction.ID, localize('showRecommendations', "Show Recommendations"));
 				const installAction = this.instantiationService.createInstance(InstallRecommendedExtensionAction, id);
-				const options = [
+				const options: Choice[] = [
 					localize('install', 'Install'),
 					recommendationsAction.label,
-					choiceNever,
-					choiceClose
+					{ label: choiceNever }
 				];
 
-				this.choiceService.choose(Severity.Info, message, options, 3).done(choice => {
+				this.choiceService.choose(Severity.Info, message, options).done(choice => {
 					switch (choice) {
-						case 0:
+						case 0 /* Install */:
 							/* __GDPR__
 								"extensionRecommendations:popup" : {
 									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -387,7 +415,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 							*/
 							this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'install', extensionId: name });
 							return installAction.run();
-						case 1:
+						case 1 /* Show Recommendations */:
 							/* __GDPR__
 								"extensionRecommendations:popup" : {
 									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -396,7 +424,8 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 							*/
 							this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'show', extensionId: name });
 							return recommendationsAction.run();
-						case 2: importantRecommendationsIgnoreList.push(id);
+						case 2 /* Never show again */:
+							importantRecommendationsIgnoreList.push(id);
 							this.storageService.store(
 								'extensionsAssistant/importantRecommendationsIgnore',
 								JSON.stringify(importantRecommendationsIgnoreList),
@@ -410,14 +439,6 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 							*/
 							this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'neverShowAgain', extensionId: name });
 							return this.ignoreExtensionRecommendations();
-						case 3:
-							/* __GDPR__
-								"extensionRecommendations:popup" : {
-									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-									"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
-								}
-							*/
-							this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'close', extensionId: name });
 					}
 				}, () => {
 					/* __GDPR__
@@ -460,15 +481,14 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 
 					const searchMarketplaceAction = this.instantiationService.createInstance(ShowLanguageExtensionsAction, fileExtension);
 
-					const options = [
+					const options: Choice[] = [
 						localize('searchMarketplace', "Search Marketplace"),
-						choiceNever,
-						choiceClose
+						{ label: choiceNever }
 					];
 
-					this.choiceService.choose(Severity.Info, message, options, 2).done(choice => {
+					this.choiceService.choose(Severity.Info, message, options).done(choice => {
 						switch (choice) {
-							case 0:
+							case 0 /* Search Marketplace */:
 								/* __GDPR__
 									"fileExtensionSuggestion:popup" : {
 										"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -478,7 +498,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 								this.telemetryService.publicLog('fileExtensionSuggestion:popup', { userReaction: 'ok', fileExtension: fileExtension });
 								searchMarketplaceAction.run();
 								break;
-							case 1:
+							case 1 /* Never show again */:
 								fileExtensionSuggestionIgnoreList.push(fileExtension);
 								this.storageService.store(
 									'extensionsAssistant/fileExtensionsSuggestionIgnore',
@@ -492,14 +512,6 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 									}
 								*/
 								this.telemetryService.publicLog('fileExtensionSuggestion:popup', { userReaction: 'neverShowAgain', fileExtension: fileExtension });
-							case 2:
-								/* __GDPR__
-									"fileExtensionSuggestion:popup" : {
-										"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-										"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
-									}
-								*/
-								this.telemetryService.publicLog('fileExtensionSuggestion:popup', { userReaction: 'close', fileExtension: fileExtension });
 								break;
 						}
 					}, () => {
@@ -521,7 +533,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		const config = this.configurationService.getValue<IExtensionsConfiguration>(ConfigurationKey);
 
 		return this.getWorkspaceRecommendations().then(allRecommendations => {
-			if (!allRecommendations.length || config.ignoreRecommendations || this.storageService.getBoolean(storageKey, StorageScope.WORKSPACE, false)) {
+			if (!allRecommendations.length || config.ignoreRecommendations || config.showRecommendationsOnlyOnDemand || this.storageService.getBoolean(storageKey, StorageScope.WORKSPACE, false)) {
 				return;
 			}
 
@@ -537,16 +549,15 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 				const showAction = this.instantiationService.createInstance(ShowRecommendedExtensionsAction, ShowRecommendedExtensionsAction.ID, localize('showRecommendations', "Show Recommendations"));
 				const installAllAction = this.instantiationService.createInstance(InstallWorkspaceRecommendedExtensionsAction, InstallWorkspaceRecommendedExtensionsAction.ID, localize('installAll', "Install All"));
 
-				const options = [
+				const options: Choice[] = [
 					installAllAction.label,
 					showAction.label,
-					choiceNever,
-					choiceClose
+					{ label: choiceNever }
 				];
 
-				return this.choiceService.choose(Severity.Info, message, options, 3).done(choice => {
+				return this.choiceService.choose(Severity.Info, message, options).done(choice => {
 					switch (choice) {
-						case 0:
+						case 0 /* Install */:
 							/* __GDPR__
 								"extensionRecommendations:popup" : {
 									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
@@ -554,7 +565,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 							*/
 							this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'install' });
 							return installAllAction.run();
-						case 1:
+						case 1 /* Show Recommendations */:
 							/* __GDPR__
 								"extensionRecommendations:popup" : {
 									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
@@ -562,7 +573,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 							*/
 							this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'show' });
 							return showAction.run();
-						case 2:
+						case 2 /* Never show again */:
 							/* __GDPR__
 								"extensionRecommendations:popup" : {
 									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
@@ -570,13 +581,6 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 							*/
 							this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'neverShowAgain' });
 							return this.storageService.store(storageKey, true, StorageScope.WORKSPACE);
-						case 3:
-							/* __GDPR__
-								"extensionRecommendations:popup" : {
-									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-								}
-							*/
-							this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'close' });
 					}
 				}, () => {
 					/* __GDPR__
@@ -598,18 +602,17 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 			localize('cancel', "Cancel")
 		];
 
-		this.choiceService.choose(Severity.Info, message, options, 2).done(choice => {
+		this.choiceService.choose(Severity.Info, message, options).done(choice => {
 			switch (choice) {
 				case 0:	// If the user ignores the current message and selects different file type
-					// we should hide all the stacked up messages as he has selected Yes, Ignore All
-					this.messageService.hideAll();
 					return this.setIgnoreRecommendationsConfig(true);
-				case 1: return this.setIgnoreRecommendationsConfig(false);
+				case 1:
+					return this.setIgnoreRecommendationsConfig(false);
 			}
 		});
 	}
 
-	private _suggestBasedOnExecutables(recommendations: { [id: string]: string; }): void {
+	private _suggestBasedOnExecutables(): TPromise<any> {
 		const homeDir = os.homedir();
 		let foundExecutables: Set<string> = new Set<string>();
 
@@ -620,13 +623,14 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 					(product.exeBasedExtensionTips[exeName]['recommendations'] || [])
 						.forEach(x => {
 							if (product.exeBasedExtensionTips[exeName]['friendlyName']) {
-								recommendations[x] = product.exeBasedExtensionTips[exeName]['friendlyName'];
+								this._exeBasedRecommendations[x] = product.exeBasedExtensionTips[exeName]['friendlyName'];
 							}
 						});
 				}
 			});
 		};
 
+		let promises: TPromise<any>[] = [];
 		// Loop through recommended extensions
 		forEach(product.exeBasedExtensionTips, entry => {
 			if (typeof entry.value !== 'object' || !Array.isArray(entry.value['recommendations'])) {
@@ -643,12 +647,14 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 					.replace('%ProgramFiles(x86)%', process.env['ProgramFiles(x86)'])
 					.replace('%ProgramFiles%', process.env['ProgramFiles'])
 					.replace('%APPDATA%', process.env['APPDATA']);
-				findExecutable(exeName, windowsPath);
+				promises.push(findExecutable(exeName, windowsPath));
 			} else {
-				findExecutable(exeName, paths.join('/usr/local/bin', exeName));
-				findExecutable(exeName, paths.join(homeDir, exeName));
+				promises.push(findExecutable(exeName, paths.join('/usr/local/bin', exeName)));
+				promises.push(findExecutable(exeName, paths.join(homeDir, exeName)));
 			}
 		});
+
+		return TPromise.join(promises);
 	}
 
 	private setIgnoreRecommendationsConfig(configVal: boolean) {
@@ -659,9 +665,9 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		}
 	}
 
-	private getDynamicWorkspaceRecommendations(): TPromise<void> {
+	private getCachedDynamicWorkspaceRecommendations() {
 		if (this.contextService.getWorkbenchState() !== WorkbenchState.FOLDER) {
-			return TPromise.as(null);
+			return;
 		}
 
 		const storageKey = 'extensionsAssistant/dynamicWorkspaceRecommendations';
@@ -684,13 +690,17 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 				}
 			*/
 			this.telemetryService.publicLog('dynamicWorkspaceRecommendations', { count: this._dynamicWorkspaceRecommendations.length, cache: 1 });
+		}
+	}
+
+	private getDynamicWorkspaceRecommendations(): TPromise<void> {
+		if (this.contextService.getWorkbenchState() !== WorkbenchState.FOLDER
+			|| this._dynamicWorkspaceRecommendations.length
+			|| !this._extensionsRecommendationsUrl) {
 			return TPromise.as(null);
 		}
 
-		if (!this._extensionsRecommendationsUrl) {
-			return TPromise.as(null);
-		}
-
+		const storageKey = 'extensionsAssistant/dynamicWorkspaceRecommendations';
 		const workspaceUri = this.contextService.getWorkspace().folders[0].uri;
 		return TPromise.join([getHashedRemotesFromUri(workspaceUri, this.fileService, false), getHashedRemotesFromUri(workspaceUri, this.fileService, true)]).then(([hashedRemotes1, hashedRemotes2]) => {
 			const hashedRemotes = (hashedRemotes1 || []).concat(hashedRemotes2 || []);
@@ -698,43 +708,37 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 				return null;
 			}
 
-			return new TPromise((c, e) => {
-				setTimeout(() => {
-					this.requestService.request({ type: 'GET', url: this._extensionsRecommendationsUrl }).then(context => {
-						if (context.res.statusCode !== 200) {
-							return c(null);
-						}
-						return asJson(context).then((result) => {
-							const allRecommendations: IDynamicWorkspaceRecommendations[] = Array.isArray(result['workspaceRecommendations']) ? result['workspaceRecommendations'] : [];
-							if (!allRecommendations.length) {
-								return c(null);
-							}
+			return this.requestService.request({ type: 'GET', url: this._extensionsRecommendationsUrl }).then(context => {
+				if (context.res.statusCode !== 200) {
+					return TPromise.as(null);
+				}
+				return asJson(context).then((result) => {
+					const allRecommendations: IDynamicWorkspaceRecommendations[] = Array.isArray(result['workspaceRecommendations']) ? result['workspaceRecommendations'] : [];
+					if (!allRecommendations.length) {
+						return;
+					}
 
-							let foundRemote = false;
-							for (let i = 0; i < hashedRemotes.length && !foundRemote; i++) {
-								for (let j = 0; j < allRecommendations.length && !foundRemote; j++) {
-									if (Array.isArray(allRecommendations[j].remoteSet) && allRecommendations[j].remoteSet.indexOf(hashedRemotes[i]) > -1) {
-										foundRemote = true;
-										this._dynamicWorkspaceRecommendations = allRecommendations[j].recommendations || [];
-										this.storageService.store(storageKey, JSON.stringify({
-											recommendations: this._dynamicWorkspaceRecommendations,
-											timestamp: Date.now()
-										}), StorageScope.WORKSPACE);
-										/* __GDPR__
-											"dynamicWorkspaceRecommendations" : {
-												"count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-												"cache" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-											}
-										*/
-										this.telemetryService.publicLog('dynamicWorkspaceRecommendations', { count: this._dynamicWorkspaceRecommendations.length, cache: 0 });
+					let foundRemote = false;
+					for (let i = 0; i < hashedRemotes.length && !foundRemote; i++) {
+						for (let j = 0; j < allRecommendations.length && !foundRemote; j++) {
+							if (Array.isArray(allRecommendations[j].remoteSet) && allRecommendations[j].remoteSet.indexOf(hashedRemotes[i]) > -1) {
+								foundRemote = true;
+								this._dynamicWorkspaceRecommendations = allRecommendations[j].recommendations || [];
+								this.storageService.store(storageKey, JSON.stringify({
+									recommendations: this._dynamicWorkspaceRecommendations,
+									timestamp: Date.now()
+								}), StorageScope.WORKSPACE);
+								/* __GDPR__
+									"dynamicWorkspaceRecommendations" : {
+										"count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+										"cache" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 									}
-								}
+								*/
+								this.telemetryService.publicLog('dynamicWorkspaceRecommendations', { count: this._dynamicWorkspaceRecommendations.length, cache: 0 });
 							}
-
-							return c(null);
-						});
-					});
-				}, 10000);
+						}
+					}
+				});
 			});
 		});
 	}
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts b/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
index 178a39a6886..fbbb5424432 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
@@ -208,6 +208,11 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 				type: 'boolean',
 				description: localize('extensionsIgnoreRecommendations', "If set to true, the notifications for extension recommendations will stop showing up."),
 				default: false
+			},
+			'extensions.showRecommendationsOnlyOnDemand': {
+				type: 'boolean',
+				description: localize('extensionsShowRecommendationsOnlyOnDemand', "If set to true, recommendations will not be fetched or shown unless specifically requested by the user."),
+				default: false
 			}
 		}
 	});
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
index 9cb0397433d..ec829879ee3 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
@@ -6,17 +6,15 @@
 import { localize } from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Action } from 'vs/base/common/actions';
-import severity from 'vs/base/common/severity';
 import paths = require('vs/base/common/paths');
-import { ReloadWindowAction } from 'vs/workbench/electron-browser/actions';
 import { IExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IWindowsService, IWindowService } from 'vs/platform/windows/common/windows';
 import { IFileService } from 'vs/platform/files/common/files';
 import URI from 'vs/base/common/uri';
+import Severity from 'vs/base/common/severity';
 import { mnemonicButtonLabel } from 'vs/base/common/labels';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
 
 export class OpenExtensionsFolderAction extends Action {
 
@@ -58,8 +56,7 @@ export class InstallVSIXAction extends Action {
 		id = InstallVSIXAction.ID,
 		label = InstallVSIXAction.LABEL,
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IMessageService private messageService: IMessageService,
-		@IInstantiationService private instantiationService: IInstantiationService,
+		@IChoiceService private choiceService: IChoiceService,
 		@IWindowService private windowsService: IWindowService
 	) {
 		super(id, label, 'extension-action install-vsix', true);
@@ -77,13 +74,13 @@ export class InstallVSIXAction extends Action {
 			}
 
 			return TPromise.join(result.map(vsix => this.extensionsWorkbenchService.install(vsix))).then(() => {
-				this.messageService.show(
-					severity.Info,
-					{
-						message: localize('InstallVSIXAction.success', "Successfully installed the extension. Reload to enable it."),
-						actions: [this.instantiationService.createInstance(ReloadWindowAction, ReloadWindowAction.ID, localize('InstallVSIXAction.reloadNow', "Reload Now"))]
+				return this.choiceService.choose(Severity.Info, localize('InstallVSIXAction.success', "Successfully installed the extension. Reload to enable it."), [localize('InstallVSIXAction.reloadNow', "Reload Now")]).then(choice => {
+					if (choice === 0) {
+						return this.windowsService.reloadWindow();
 					}
-				);
+
+					return TPromise.as(undefined);
+				});
 			});
 		});
 	}
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts
index ac45a445b75..e8340c0a00b 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts
@@ -18,10 +18,10 @@ import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { IMessageService, Severity, IChoiceService } from 'vs/platform/message/common/message';
-import { Action } from 'vs/base/common/actions';
 import { BetterMergeDisabledNowKey, BetterMergeId, areSameExtensions, adoptToGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { getIdAndVersionFromLocalExtensionId } from 'vs/platform/extensionManagement/node/extensionManagementUtil';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
+import { Severity } from 'vs/platform/notification/common/notification';
 
 export interface IExtensionStatus {
 	identifier: IExtensionIdentifier;
@@ -65,14 +65,12 @@ export class KeymapExtensions implements IWorkbenchContribution {
 	}
 
 	private promptForDisablingOtherKeymaps(newKeymap: IExtensionStatus, oldKeymaps: IExtensionStatus[]): TPromise<void> {
-
-
 		const message = localize('disableOtherKeymapsConfirmation', "Disable other keymaps ({0}) to avoid conflicts between keybindings?", oldKeymaps.map(k => `'${k.local.manifest.displayName}'`).join(', '));
 		const options = [
 			localize('yes', "Yes"),
 			localize('no', "No")
 		];
-		return this.choiceService.choose(Severity.Info, message, options, 1, false)
+		return this.choiceService.choose(Severity.Info, message, options)
 			.then(value => {
 				const confirmed = value === 0;
 				const telemetryData: { [key: string]: any; } = {
@@ -151,7 +149,7 @@ export class BetterMergeDisabled implements IWorkbenchContribution {
 
 	constructor(
 		@IStorageService storageService: IStorageService,
-		@IMessageService messageService: IMessageService,
+		@IChoiceService choiceService: IChoiceService,
 		@IExtensionService extensionService: IExtensionService,
 		@IExtensionManagementService extensionManagementService: IExtensionManagementService,
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -159,17 +157,14 @@ export class BetterMergeDisabled implements IWorkbenchContribution {
 		extensionService.whenInstalledExtensionsRegistered().then(() => {
 			if (storageService.getBoolean(BetterMergeDisabledNowKey, StorageScope.GLOBAL, false)) {
 				storageService.remove(BetterMergeDisabledNowKey, StorageScope.GLOBAL);
-				messageService.show(Severity.Info, {
-					message: localize('betterMergeDisabled', "The Better Merge extension is now built-in, the installed extension was disabled and can be uninstalled."),
-					actions: [
-						new Action('uninstall', localize('uninstall', "Uninstall"), null, true, () => {
-							return extensionManagementService.getInstalled(LocalExtensionType.User).then(extensions => {
-								return Promise.all(extensions.filter(e => stripVersion(e.identifier.id) === BetterMergeId)
-									.map(e => extensionManagementService.uninstall(e, true)));
-							});
-						}),
-						new Action('later', localize('later', "Later"), null, true)
-					]
+
+				choiceService.choose(Severity.Info, localize('betterMergeDisabled', "The Better Merge extension is now built-in, the installed extension was disabled and can be uninstalled."), [localize('uninstall', "Uninstall")]).then(choice => {
+					if (choice === 0) {
+						extensionManagementService.getInstalled(LocalExtensionType.User).then(extensions => {
+							return Promise.all(extensions.filter(e => stripVersion(e.identifier.id) === BetterMergeId)
+								.map(e => extensionManagementService.uninstall(e, true)));
+						});
+					}
 				});
 			}
 		});
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
index 7c51274b7ff..594a6114a88 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
@@ -25,21 +25,20 @@ import { append, $, addStandardDisposableListener, EventType, addClass, removeCl
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IExtensionService } from 'vs/platform/extensions/common/extensions';
-import { IExtensionsWorkbenchService, IExtensionsViewlet, VIEWLET_ID, ExtensionState, AutoUpdateConfigurationKey } from '../common/extensions';
+import { IExtensionsWorkbenchService, IExtensionsViewlet, VIEWLET_ID, ExtensionState, AutoUpdateConfigurationKey, ShowRecommendationsOnlyOnDemandKey } from '../common/extensions';
 import {
 	ShowEnabledExtensionsAction, ShowInstalledExtensionsAction, ShowRecommendedExtensionsAction, ShowPopularExtensionsAction, ShowDisabledExtensionsAction,
 	ShowOutdatedExtensionsAction, ClearExtensionsInputAction, ChangeSortAction, UpdateAllAction, CheckForUpdatesAction, DisableAllAction, EnableAllAction,
-	EnableAutoUpdateAction, DisableAutoUpdateAction
+	EnableAutoUpdateAction, DisableAutoUpdateAction, ShowBuiltInExtensionsAction
 } from 'vs/workbench/parts/extensions/browser/extensionsActions';
 import { LocalExtensionType, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { InstallVSIXAction } from 'vs/workbench/parts/extensions/electron-browser/extensionsActions';
 import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput';
-import { ExtensionsListView, InstalledExtensionsView, RecommendedExtensionsView, WorkspaceRecommendedExtensionsView } from './extensionsViews';
+import { ExtensionsListView, InstalledExtensionsView, RecommendedExtensionsView, WorkspaceRecommendedExtensionsView, BuiltInExtensionsView } from './extensionsViews';
 import { OpenGlobalSettingsAction } from 'vs/workbench/parts/preferences/browser/preferencesActions';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
-import { IMessageService, CloseAction } from 'vs/platform/message/common/message';
 import Severity from 'vs/base/common/severity';
 import { IActivityService, ProgressBadge, NumberBadge } from 'vs/workbench/services/activity/common/activity';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
@@ -53,7 +52,9 @@ import { IContextKeyService, ContextKeyExpr, RawContextKey, IContextKey } from '
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { getGalleryExtensionIdFromLocal, getMaliciousExtensionsSet } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ILogService } from 'vs/platform/log/common/log';
-import { ReloadWindowAction } from 'vs/workbench/electron-browser/actions';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
+import { IWindowService } from 'vs/platform/windows/common/windows';
 
 interface SearchInputEvent extends Event {
 	target: HTMLInputElement;
@@ -63,7 +64,9 @@ interface SearchInputEvent extends Event {
 const NonEmptyWorkspaceContext = new RawContextKey<boolean>('nonEmptyWorkspace', false);
 const SearchExtensionsContext = new RawContextKey<boolean>('searchExtensions', false);
 const SearchInstalledExtensionsContext = new RawContextKey<boolean>('searchInstalledExtensions', false);
+const SearchBuiltInExtensionsContext = new RawContextKey<boolean>('searchBuiltInExtensions', false);
 const RecommendedExtensionsContext = new RawContextKey<boolean>('recommendedExtensions', false);
+const DefaultRecommendedExtensionsContext = new RawContextKey<boolean>('defaultRecommendedExtensions', false);
 
 export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtensionsViewlet {
 
@@ -71,7 +74,9 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
 	private nonEmptyWorkspaceContextKey: IContextKey<boolean>;
 	private searchExtensionsContextKey: IContextKey<boolean>;
 	private searchInstalledExtensionsContextKey: IContextKey<boolean>;
+	private searchBuiltInExtensionsContextKey: IContextKey<boolean>;
 	private recommendedExtensionsContextKey: IContextKey<boolean>;
+	private defaultRecommendedExtensionsContextKey: IContextKey<boolean>;
 
 	private searchDelayer: ThrottledDelayer<any>;
 	private root: HTMLElement;
@@ -89,7 +94,7 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
 		@IEditorGroupService private editorInputService: IEditorGroupService,
 		@IExtensionManagementService private extensionManagementService: IExtensionManagementService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IViewletService private viewletService: IViewletService,
 		@IThemeService themeService: IThemeService,
 		@IConfigurationService private configurationService: IConfigurationService,
@@ -106,8 +111,10 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
 		this.nonEmptyWorkspaceContextKey = NonEmptyWorkspaceContext.bindTo(contextKeyService);
 		this.searchExtensionsContextKey = SearchExtensionsContext.bindTo(contextKeyService);
 		this.searchInstalledExtensionsContextKey = SearchInstalledExtensionsContext.bindTo(contextKeyService);
+		this.searchBuiltInExtensionsContextKey = SearchBuiltInExtensionsContext.bindTo(contextKeyService);
 		this.recommendedExtensionsContextKey = RecommendedExtensionsContext.bindTo(contextKeyService);
-
+		this.defaultRecommendedExtensionsContextKey = DefaultRecommendedExtensionsContext.bindTo(contextKeyService);
+		this.defaultRecommendedExtensionsContextKey.set(!this.configurationService.getValue<boolean>(ShowRecommendationsOnlyOnDemandKey));
 		this.disposables.push(this.viewletService.onDidViewletOpen(this.onViewletOpen, this, this.disposables));
 
 		this.configurationService.onDidChangeConfiguration(e => {
@@ -115,6 +122,9 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
 				this.secondaryActions = null;
 				this.updateTitleArea();
 			}
+			if (e.affectedKeys.indexOf(ShowRecommendationsOnlyOnDemandKey) > -1) {
+				this.defaultRecommendedExtensionsContextKey.set(!this.configurationService.getValue<boolean>(ShowRecommendationsOnlyOnDemandKey));
+			}
 		}, this, this.disposables);
 	}
 
@@ -123,6 +133,7 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
 		viewDescriptors.push(this.createMarketPlaceExtensionsListViewDescriptor());
 		viewDescriptors.push(this.createInstalledExtensionsListViewDescriptor());
 		viewDescriptors.push(this.createSearchInstalledExtensionsListViewDescriptor());
+		viewDescriptors.push(this.createSearchBuiltInExtensionsListViewDescriptor());
 		viewDescriptors.push(this.createDefaultRecommendedExtensionsListViewDescriptor());
 		viewDescriptors.push(this.createOtherRecommendedExtensionsListViewDescriptor());
 		viewDescriptors.push(this.createWorkspaceRecommendedExtensionsListViewDescriptor());
@@ -135,7 +146,7 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
 			name: localize('marketPlace', "Marketplace"),
 			location: ViewLocation.Extensions,
 			ctor: ExtensionsListView,
-			when: ContextKeyExpr.and(ContextKeyExpr.has('searchExtensions'), ContextKeyExpr.not('searchInstalledExtensions'), ContextKeyExpr.not('recommendedExtensions')),
+			when: ContextKeyExpr.and(ContextKeyExpr.has('searchExtensions'), ContextKeyExpr.not('searchInstalledExtensions'), ContextKeyExpr.not('searchBuiltInExtensions'), ContextKeyExpr.not('recommendedExtensions')),
 			weight: 100
 		};
 	}
@@ -168,7 +179,7 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
 			name: localize('recommendedExtensions', "Recommended"),
 			location: ViewLocation.Extensions,
 			ctor: RecommendedExtensionsView,
-			when: ContextKeyExpr.and(ContextKeyExpr.not('searchExtensions')),
+			when: ContextKeyExpr.and(ContextKeyExpr.not('searchExtensions'), ContextKeyExpr.has('defaultRecommendedExtensions')),
 			weight: 70,
 			canToggleVisibility: true
 		};
@@ -200,6 +211,17 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
 		};
 	}
 
+	private createSearchBuiltInExtensionsListViewDescriptor(): IViewDescriptor {
+		return {
+			id: 'extensions.builtInExtensionsList',
+			name: localize('builtInExtensions', "Built-In"),
+			location: ViewLocation.Extensions,
+			ctor: BuiltInExtensionsView,
+			when: ContextKeyExpr.has('searchBuiltInExtensions'),
+			weight: 100
+		};
+	}
+
 	async create(parent: Builder): TPromise<void> {
 		parent.addClass('extensions-viewlet');
 		this.root = parent.getHTMLElement();
@@ -292,6 +314,7 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
 				this.instantiationService.createInstance(ShowOutdatedExtensionsAction, ShowOutdatedExtensionsAction.ID, ShowOutdatedExtensionsAction.LABEL),
 				this.instantiationService.createInstance(ShowEnabledExtensionsAction, ShowEnabledExtensionsAction.ID, ShowEnabledExtensionsAction.LABEL),
 				this.instantiationService.createInstance(ShowDisabledExtensionsAction, ShowDisabledExtensionsAction.ID, ShowDisabledExtensionsAction.LABEL),
+				this.instantiationService.createInstance(ShowBuiltInExtensionsAction, ShowBuiltInExtensionsAction.ID, ShowBuiltInExtensionsAction.LABEL),
 				this.instantiationService.createInstance(ShowRecommendedExtensionsAction, ShowRecommendedExtensionsAction.ID, ShowRecommendedExtensionsAction.LABEL),
 				this.instantiationService.createInstance(ShowPopularExtensionsAction, ShowPopularExtensionsAction.ID, ShowPopularExtensionsAction.LABEL),
 				new Separator(),
@@ -328,6 +351,7 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
 		const value = this.searchBox.value || '';
 		this.searchExtensionsContextKey.set(!!value);
 		this.searchInstalledExtensionsContextKey.set(InstalledExtensionsView.isInsalledExtensionsQuery(value));
+		this.searchBuiltInExtensionsContextKey.set(ExtensionsListView.isBuiltInExtensionsQuery(value));
 		this.recommendedExtensionsContextKey.set(ExtensionsListView.isRecommendedExtensionsQuery(value));
 		this.nonEmptyWorkspaceContextKey.set(this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY);
 
@@ -404,16 +428,15 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
 		if (/ECONNREFUSED/.test(message)) {
 			const error = createError(localize('suggestProxyError', "Marketplace returned 'ECONNREFUSED'. Please check the 'http.proxy' setting."), {
 				actions: [
-					this.instantiationService.createInstance(OpenGlobalSettingsAction, OpenGlobalSettingsAction.ID, OpenGlobalSettingsAction.LABEL),
-					CloseAction
+					this.instantiationService.createInstance(OpenGlobalSettingsAction, OpenGlobalSettingsAction.ID, OpenGlobalSettingsAction.LABEL)
 				]
 			});
 
-			this.messageService.show(Severity.Error, error);
+			this.notificationService.error(error);
 			return;
 		}
 
-		this.messageService.show(Severity.Error, err);
+		this.notificationService.error(err);
 	}
 
 	dispose(): void {
@@ -462,9 +485,9 @@ export class MaliciousExtensionChecker implements IWorkbenchContribution {
 
 	constructor(
 		@IExtensionManagementService private extensionsManagementService: IExtensionManagementService,
-		@IInstantiationService private instantiationService: IInstantiationService,
+		@IWindowService private windowService: IWindowService,
 		@ILogService private logService: ILogService,
-		@IMessageService private messageService: IMessageService
+		@IChoiceService private choiceService: IChoiceService
 	) {
 		this.loopCheckForMaliciousExtensions();
 	}
@@ -485,9 +508,12 @@ export class MaliciousExtensionChecker implements IWorkbenchContribution {
 
 				if (maliciousExtensions.length) {
 					return TPromise.join(maliciousExtensions.map(e => this.extensionsManagementService.uninstall(e, true).then(() => {
-						this.messageService.show(Severity.Warning, {
-							message: localize('malicious warning', "We have uninstalled '{0}' which was reported to be problematic.", getGalleryExtensionIdFromLocal(e)),
-							actions: [this.instantiationService.createInstance(ReloadWindowAction, ReloadWindowAction.ID, localize('reloadNow', "Reload Now"))]
+						return this.choiceService.choose(Severity.Warning, localize('malicious warning', "We have uninstalled '{0}' which was reported to be problematic.", getGalleryExtensionIdFromLocal(e)), [localize('reloadNow', "Reload Now")]).then(choice => {
+							if (choice === 0) {
+								return this.windowService.reloadWindow();
+							}
+
+							return TPromise.as(undefined);
 						});
 					})));
 				} else {
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
index eef0647b527..dbb7bf36faa 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
@@ -11,9 +11,7 @@ import { dispose } from 'vs/base/common/lifecycle';
 import { assign } from 'vs/base/common/objects';
 import { chain } from 'vs/base/common/event';
 import { isPromiseCanceledError, create as createError } from 'vs/base/common/errors';
-import Severity from 'vs/base/common/severity';
 import { PagedModel, IPagedModel, IPager } from 'vs/base/common/paging';
-import { IMessageService, CloseAction } from 'vs/platform/message/common/message';
 import { SortBy, SortOrder, IQueryOptions, LocalExtensionType, IExtensionTipsService, EnablementState } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
@@ -37,6 +35,7 @@ import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { InstallWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction } from 'vs/workbench/parts/extensions/browser/extensionsActions';
 import { WorkbenchPagedList } from 'vs/platform/list/browser/listService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class ExtensionsListView extends ViewsViewletPanel {
 
@@ -48,7 +47,7 @@ export class ExtensionsListView extends ViewsViewletPanel {
 
 	constructor(
 		private options: IViewletViewOptions,
-		@IMessageService protected messageService: IMessageService,
+		@INotificationService protected notificationService: INotificationService,
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IInstantiationService protected instantiationService: IInstantiationService,
@@ -146,6 +145,18 @@ export class ExtensionsListView extends ViewsViewletPanel {
 			case 'name': options = assign(options, { sortBy: SortBy.Title }); break;
 		}
 
+		if (!value || ExtensionsListView.isBuiltInExtensionsQuery(value)) {
+			// Show installed extensions
+			value = value ? value.replace(/@builtin/g, '').replace(/@sort:(\w+)(-\w*)?/g, '').trim().toLowerCase() : '';
+
+			let result = await this.extensionsWorkbenchService.queryLocal();
+
+			result = result
+				.filter(e => e.type === LocalExtensionType.System && e.name.toLowerCase().indexOf(value) > -1);
+
+			return new PagedModel(this.sortExtensions(result, options));
+		}
+
 		if (!value || ExtensionsListView.isInstalledExtensionsQuery(value)) {
 			// Show installed extensions
 			value = value ? value.replace(/@installed/g, '').replace(/@sort:(\w+)(-\w*)?/g, '').trim().toLowerCase() : '';
@@ -278,10 +289,11 @@ export class ExtensionsListView extends ViewsViewletPanel {
 			.then(local => {
 				const installedExtensions = local.map(x => `${x.publisher}.${x.name}`);
 				let fileBasedRecommendations = this.tipsService.getFileBasedRecommendations();
-				let others = this.tipsService.getOtherRecommendations();
+				const othersPromise = this.tipsService.getOtherRecommendations();
+				const workspacePromise = this.tipsService.getWorkspaceRecommendations();
 
-				return this.tipsService.getWorkspaceRecommendations()
-					.then(workspaceRecommendations => {
+				return TPromise.join([othersPromise, workspacePromise])
+					.then(([others, workspaceRecommendations]) => {
 						const names = this.getTrimmedRecommendations(installedExtensions, value, fileBasedRecommendations, others, workspaceRecommendations);
 
 						/* __GDPR__
@@ -311,10 +323,11 @@ export class ExtensionsListView extends ViewsViewletPanel {
 			.then(local => {
 				const installedExtensions = local.map(x => `${x.publisher}.${x.name}`);
 				let fileBasedRecommendations = this.tipsService.getFileBasedRecommendations();
-				let others = this.tipsService.getOtherRecommendations();
+				const othersPromise = this.tipsService.getOtherRecommendations();
+				const workspacePromise = this.tipsService.getWorkspaceRecommendations();
 
-				return this.tipsService.getWorkspaceRecommendations()
-					.then(workspaceRecommendations => {
+				return TPromise.join([othersPromise, workspacePromise])
+					.then(([others, workspaceRecommendations]) => {
 						workspaceRecommendations = workspaceRecommendations.map(x => x.toLowerCase());
 						fileBasedRecommendations = fileBasedRecommendations.filter(x => workspaceRecommendations.indexOf(x.toLowerCase()) === -1);
 						others = others.filter(x => workspaceRecommendations.indexOf(x.toLowerCase()) === -1);
@@ -451,16 +464,15 @@ export class ExtensionsListView extends ViewsViewletPanel {
 		if (/ECONNREFUSED/.test(message)) {
 			const error = createError(localize('suggestProxyError', "Marketplace returned 'ECONNREFUSED'. Please check the 'http.proxy' setting."), {
 				actions: [
-					this.instantiationService.createInstance(OpenGlobalSettingsAction, OpenGlobalSettingsAction.ID, OpenGlobalSettingsAction.LABEL),
-					CloseAction
+					this.instantiationService.createInstance(OpenGlobalSettingsAction, OpenGlobalSettingsAction.ID, OpenGlobalSettingsAction.LABEL)
 				]
 			});
 
-			this.messageService.show(Severity.Error, error);
+			this.notificationService.error(error);
 			return;
 		}
 
-		this.messageService.show(Severity.Error, err);
+		this.notificationService.error(err);
 	}
 
 	dispose(): void {
@@ -468,6 +480,10 @@ export class ExtensionsListView extends ViewsViewletPanel {
 		super.dispose();
 	}
 
+	static isBuiltInExtensionsQuery(query: string): boolean {
+		return /@builtin/i.test(query);
+	}
+
 	static isInstalledExtensionsQuery(query: string): boolean {
 		return /@installed/i.test(query);
 	}
@@ -520,6 +536,18 @@ export class InstalledExtensionsView extends ExtensionsListView {
 	}
 }
 
+export class BuiltInExtensionsView extends ExtensionsListView {
+
+	async show(query: string): TPromise<IPagedModel<IExtension>> {
+		if (!ExtensionsListView.isBuiltInExtensionsQuery(query)) {
+			return super.show(query);
+		}
+		let searchBuiltInQuery = '@builtin';
+		searchBuiltInQuery = query ? searchBuiltInQuery + ' ' + query : searchBuiltInQuery;
+		return super.show(searchBuiltInQuery);
+	}
+}
+
 export class RecommendedExtensionsView extends ExtensionsListView {
 
 	async show(query: string): TPromise<IPagedModel<IExtension>> {
@@ -538,7 +566,7 @@ export class WorkspaceRecommendedExtensionsView extends ExtensionsListView {
 		const actionbar = new ActionBar(listActionBar, {
 			animated: false
 		});
-		actionbar.onDidRun(({ error }) => error && this.messageService.show(Severity.Error, error));
+		actionbar.onDidRun(({ error }) => error && this.notificationService.error(error));
 		const installAllAction = this.instantiationService.createInstance(InstallWorkspaceRecommendedExtensionsAction, InstallWorkspaceRecommendedExtensionsAction.ID, InstallWorkspaceRecommendedExtensionsAction.LABEL);
 		const configureWorkspaceFolderAction = this.instantiationService.createInstance(ConfigureWorkspaceFolderRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction.ID, ConfigureWorkspaceFolderRecommendedExtensionsAction.LABEL);
 
diff --git a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
index e6256d7aeae..5292373ae35 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
@@ -26,7 +26,6 @@ import { IDelegate, IRenderer } from 'vs/base/browser/ui/list/list';
 import { WorkbenchList } from 'vs/platform/list/browser/listService';
 import { append, $, addClass, toggleClass } from 'vs/base/browser/dom';
 import { ActionBar, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { clipboard } from 'electron';
@@ -39,6 +38,7 @@ import { memoize } from 'vs/base/common/decorators';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 import Event from 'vs/base/common/event';
 import { DisableForWorkspaceAction, DisableGloballyAction } from 'vs/workbench/parts/extensions/browser/extensionsActions';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export const IExtensionHostProfileService = createDecorator<IExtensionHostProfileService>('extensionHostProfileService');
 
@@ -88,7 +88,7 @@ interface IRuntimeExtension {
 
 export class RuntimeExtensionsEditor extends BaseEditor {
 
-	static ID: string = 'workbench.editor.runtimeExtensions';
+	static readonly ID: string = 'workbench.editor.runtimeExtensions';
 
 	private _list: WorkbenchList<IRuntimeExtension>;
 	private _profileInfo: IExtensionHostProfile;
@@ -102,7 +102,7 @@ export class RuntimeExtensionsEditor extends BaseEditor {
 		@IThemeService themeService: IThemeService,
 		@IExtensionsWorkbenchService private readonly _extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IExtensionService private readonly _extensionService: IExtensionService,
-		@IMessageService private readonly _messageService: IMessageService,
+		@INotificationService private readonly _notificationService: INotificationService,
 		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IExtensionHostProfileService private readonly _extensionHostProfileService: IExtensionHostProfileService,
@@ -267,7 +267,7 @@ export class RuntimeExtensionsEditor extends BaseEditor {
 				const actionbar = new ActionBar(element, {
 					animated: false
 				});
-				actionbar.onDidRun(({ error }) => error && this._messageService.show(Severity.Error, error));
+				actionbar.onDidRun(({ error }) => error && this._notificationService.error(error));
 				actionbar.push(new ReportExtensionIssueAction(), { icon: true, label: true });
 
 				const disposables = [actionbar];
diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
index be921b9f2c7..5cc2c739f7b 100644
--- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
@@ -26,7 +26,6 @@ import { getGalleryExtensionIdFromLocal, getGalleryExtensionTelemetryData, getLo
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IWindowService } from 'vs/platform/windows/common/windows';
-import { IChoiceService, IMessageService } from 'vs/platform/message/common/message';
 import Severity from 'vs/base/common/severity';
 import URI from 'vs/base/common/uri';
 import { IExtension, IExtensionDependencies, ExtensionState, IExtensionsWorkbenchService, AutoUpdateConfigurationKey } from 'vs/workbench/parts/extensions/common/extensions';
@@ -36,6 +35,8 @@ import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensions
 import product from 'vs/platform/node/product';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IProgressService2, ProgressLocation } from 'vs/platform/progress/common/progress';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 interface IExtensionStateProvider<T> {
 	(extension: Extension): T;
@@ -138,6 +139,9 @@ class Extension implements IExtension {
 	}
 
 	private get defaultIconUrl(): string {
+		if (this.type === LocalExtensionType.System) {
+			return require.toUrl('../browser/media/code-icon.svg');
+		}
 		return require.toUrl('../browser/media/defaultIcon.png');
 	}
 
@@ -343,7 +347,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 		@IExtensionGalleryService private galleryService: IExtensionGalleryService,
 		@IConfigurationService private configurationService: IConfigurationService,
 		@ITelemetryService private telemetryService: ITelemetryService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IChoiceService private choiceService: IChoiceService,
 		@IURLService urlService: IURLService,
 		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService,
@@ -588,10 +592,6 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 	}
 
 	setEnablement(extension: IExtension, enablementState: EnablementState): TPromise<void> {
-		if (extension.type === LocalExtensionType.System) {
-			return TPromise.wrap<void>(void 0);
-		}
-
 		const enable = enablementState === EnablementState.Enabled || enablementState === EnablementState.WorkspaceEnabled;
 		return this.promptAndSetEnablement(extension, enablementState, enable).then(reload => {
 			/* __GDPR__
@@ -883,7 +883,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 			"extensionGallery:install" : {
 				"success": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
 				"duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-				"errorcode": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				"errorcode": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
 				"recommendationReason": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 				"${include}": [
 					"${GalleryExtensionTelemetryData}"
@@ -894,7 +894,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 			"extensionGallery:update" : {
 				"success": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
 				"duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-				"errorcode": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				"errorcode": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
 				"recommendationReason": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 				"${include}": [
 					"${GalleryExtensionTelemetryData}"
@@ -905,7 +905,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 			"extensionGallery:uninstall" : {
 				"success": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
 				"duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-				"errorcode": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				"errorcode": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
 				"recommendationReason": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 				"${include}": [
 					"${GalleryExtensionTelemetryData}"
@@ -926,7 +926,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 			return;
 		}
 
-		this.messageService.show(Severity.Error, err);
+		this.notificationService.error(err);
 	}
 
 	private onOpenExtensionUrl(uri: URI): void {
@@ -960,7 +960,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 							nls.localize('install', "Install"),
 							nls.localize('cancel', "Cancel")
 						];
-						return this.choiceService.choose(Severity.Info, message, options, 2, false).then(value => {
+						return this.choiceService.choose(Severity.Info, message, options).then(value => {
 							if (value !== 0) {
 								return TPromise.as(null);
 							}
diff --git a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts
index 312c16c9b5c..c5a9f76a8a5 100644
--- a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts
+++ b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts
@@ -467,8 +467,8 @@ suite('ExtensionsActions Test', () => {
 		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
 			.then(extensions => {
 				testObject.extension = extensions[0];
-				assert.ok(!testObject.enabled);
-				assert.equal('extension-action manage hide', testObject.class);
+				assert.ok(testObject.enabled);
+				assert.equal('extension-action manage', testObject.class);
 				assert.equal('', testObject.tooltip);
 			});
 	});
diff --git a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsTipsService.test.ts b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsTipsService.test.ts
index 850e954fec0..604e99701a1 100644
--- a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsTipsService.test.ts
+++ b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsTipsService.test.ts
@@ -23,7 +23,7 @@ import { Emitter } from 'vs/base/common/event';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { TestTextResourceConfigurationService, TestContextService, TestLifecycleService } from 'vs/workbench/test/workbenchTestServices';
+import { TestTextResourceConfigurationService, TestContextService, TestLifecycleService, TestEnvironmentService } from 'vs/workbench/test/workbenchTestServices';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import URI from 'vs/base/common/uri';
 import { testWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
@@ -42,11 +42,11 @@ import { ExtensionManagementService } from 'vs/platform/extensionManagement/node
 import { ExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/node/extensionsWorkbenchService';
 import { TestExtensionEnablementService } from 'vs/platform/extensionManagement/test/common/extensionEnablementService.test';
 import { IURLService } from 'vs/platform/url/common/url';
-import { IChoiceService } from 'vs/platform/message/common/message';
 import product from 'vs/platform/node/product';
 import { ITextModel } from 'vs/editor/common/model';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
 
 const mockExtensionGallery: IGalleryExtension[] = [
 	aGalleryExtension('MockExtension1', {
@@ -227,7 +227,7 @@ suite('ExtensionsTipsService Test', () => {
 			}
 		});
 
-		testConfigurationService.setUserConfiguration(ConfigurationKey, { ignoreRecommendations: false });
+		testConfigurationService.setUserConfiguration(ConfigurationKey, { ignoreRecommendations: false, showRecommendationsOnlyOnDemand: false });
 		instantiationService.stub(IStorageService, { get: (a, b, c) => c, getBoolean: (a, b, c) => c, store: () => { } });
 		instantiationService.stub(IModelService, <IModelService>{
 			getModels(): any { return []; },
@@ -261,7 +261,7 @@ suite('ExtensionsTipsService Test', () => {
 			const myWorkspace = testWorkspace(URI.from({ scheme: 'file', path: folderDir }));
 			workspaceService = new TestContextService(myWorkspace);
 			instantiationService.stub(IWorkspaceContextService, workspaceService);
-			instantiationService.stub(IFileService, new FileService(workspaceService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), { disableWatcher: true }));
+			instantiationService.stub(IFileService, new FileService(workspaceService, TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), { disableWatcher: true }));
 		});
 	}
 
@@ -333,6 +333,17 @@ suite('ExtensionsTipsService Test', () => {
 		return testNoPromptForValidRecommendations(mockTestData.validRecommendedExtensions);
 	});
 
+	test('ExtensionTipsService: No Prompt for valid workspace recommendations if showRecommendationsOnlyOnDemand is set', () => {
+		testConfigurationService.setUserConfiguration(ConfigurationKey, { showRecommendationsOnlyOnDemand: true });
+		return setUpFolderWorkspace('myFolder', mockTestData.validRecommendedExtensions).then(() => {
+			testObject = instantiationService.createInstance(ExtensionTipsService);
+			return testObject.promptWorkspaceRecommendationsPromise.then(() => {
+				assert.equal(Object.keys(testObject.getAllRecommendationsWithReason()).length, 0);
+				assert.ok(!prompted);
+			});
+		});
+	});
+
 	test('ExtensionTipsService: No Prompt for valid workspace recommendations if ignoreRecommendations is set for current workspace', () => {
 		instantiationService.stub(IStorageService, { get: (a, b, c) => c, getBoolean: (a, b, c) => a === 'extensionsAssistant/workspaceRecommendationsIgnore' || c });
 		return testNoPromptForValidRecommendations(mockTestData.validRecommendedExtensions);
diff --git a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
index 7c93cf08c8a..cfb7f0a4d82 100644
--- a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
+++ b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
@@ -30,12 +30,12 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { TestContextService, TestWindowService } from 'vs/workbench/test/workbenchTestServices';
-import { IChoiceService } from 'vs/platform/message/common/message';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILogService, NullLogService } from 'vs/platform/log/common/log';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { IProgressService2 } from 'vs/platform/progress/common/progress';
 import { ProgressService2 } from 'vs/workbench/services/progress/browser/progressService2';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
 
 suite('ExtensionsWorkbenchService Test', () => {
 
@@ -797,14 +797,14 @@ suite('ExtensionsWorkbenchService Test', () => {
 			});
 	});
 
-	test('test system extensions are always enabled', () => {
+	test('test system extensions can be disabled', () => {
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a', {}, { type: LocalExtensionType.System })]);
 		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
 		return testObject.setEnablement(testObject.local[0], EnablementState.Disabled)
 			.then(() => {
 				const actual = testObject.local[0];
-				assert.equal(actual.enablementState, EnablementState.Enabled);
+				assert.equal(actual.enablementState, EnablementState.Disabled);
 			});
 	});
 
diff --git a/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.ts b/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.ts
index 1386c6629fb..9f8b1102649 100644
--- a/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.ts
+++ b/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.ts
@@ -14,7 +14,7 @@ import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'v
 Registry.as<IStatusbarRegistry>(Extensions.Statusbar).registerStatusbarItem(new StatusbarItemDescriptor(
 	FeedbackStatusbarItem,
 	StatusbarAlignment.RIGHT,
-	-100 /* Low Priority */
+	-100 /* towards the end of the right hand side */
 ));
 
 // Configuration: Workbench
diff --git a/src/vs/workbench/parts/feedback/electron-browser/feedback.ts b/src/vs/workbench/parts/feedback/electron-browser/feedback.ts
index 305ae9ee6bd..04103c8b695 100644
--- a/src/vs/workbench/parts/feedback/electron-browser/feedback.ts
+++ b/src/vs/workbench/parts/feedback/electron-browser/feedback.ts
@@ -114,8 +114,7 @@ export class FeedbackDropdown extends Dropdown {
 
 	protected renderContents(container: HTMLElement): IDisposable {
 		const $form = $('form.feedback-form').attr({
-			action: 'javascript:void(0);',
-			tabIndex: '-1'
+			action: 'javascript:void(0);'
 		}).appendTo(container);
 
 		$(container).addClass('monaco-menu-container');
@@ -224,7 +223,7 @@ export class FeedbackDropdown extends Dropdown {
 
 		this.toDispose.push(attachStylerCallback(this.themeService, { widgetShadow, editorWidgetBackground, inputBackground, inputForeground, inputBorder, editorBackground, contrastBorder }, colors => {
 			$form.style('background-color', colors.editorWidgetBackground);
-			$form.style('box-shadow', colors.widgetShadow ? `0 2px 8px ${colors.widgetShadow}` : null);
+			$form.style('box-shadow', colors.widgetShadow ? `0 5px 8px ${colors.widgetShadow}` : null);
 
 			if (this.feedbackDescriptionInput) {
 				this.feedbackDescriptionInput.style.backgroundColor = colors.inputBackground;
diff --git a/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts b/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts
index 5b0c9f18e33..31f02d3f73e 100644
--- a/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts
+++ b/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts
@@ -11,8 +11,8 @@ import { FeedbackDropdown, IFeedback, IFeedbackService, FEEDBACK_VISIBLE_CONFIG
 import { IContextViewService, IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import product from 'vs/platform/node/product';
-import { Themable, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_FOREGROUND } from 'vs/workbench/common/theme';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { Themable, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_FOREGROUND, STATUS_BAR_ITEM_HOVER_BACKGROUND } from 'vs/workbench/common/theme';
+import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import { IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
@@ -162,4 +162,11 @@ class HideAction extends Action {
 	public run(extensionId: string): TPromise<any> {
 		return this.configurationService.updateValue(FEEDBACK_VISIBLE_CONFIG, false);
 	}
-}
\ No newline at end of file
+}
+
+registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
+	const statusBarItemHoverBackground = theme.getColor(STATUS_BAR_ITEM_HOVER_BACKGROUND);
+	if (statusBarItemHoverBackground) {
+		collector.addRule(`.monaco-workbench > .part.statusbar > .statusbar-item .dropdown.send-feedback:hover { background-color: ${statusBarItemHoverBackground}; }`);
+	}
+});
diff --git a/src/vs/workbench/parts/feedback/electron-browser/media/feedback.css b/src/vs/workbench/parts/feedback/electron-browser/media/feedback.css
index 91b11dbaaba..8acbade2938 100644
--- a/src/vs/workbench/parts/feedback/electron-browser/media/feedback.css
+++ b/src/vs/workbench/parts/feedback/electron-browser/media/feedback.css
@@ -88,7 +88,6 @@
 	position: absolute;
 	top: 0;
 	right: 0;
-	margin: .5em 0 0 0;
 	padding: .5em;
 	width: 22px;
 	height: 22px;
diff --git a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
index 8550ae70748..1b3333b2d28 100644
--- a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
+++ b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
@@ -24,7 +24,6 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { CancelAction } from 'vs/platform/message/common/message';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
@@ -155,18 +154,13 @@ export class TextFileEditor extends BaseTextEditor {
 					return TPromise.wrapError<void>(errors.create(toErrorMessage(error), {
 						actions: [
 							new Action('workbench.files.action.createMissingFile', nls.localize('createFile', "Create File"), null, true, () => {
-								return this.fileService.updateContent(input.getResource(), '').then(() => {
-
-									// Open
-									return this.editorService.openEditor({
-										resource: input.getResource(),
-										options: {
-											pinned: true // new file gets pinned by default
-										}
-									});
-								});
-							}),
-							CancelAction
+								return this.fileService.updateContent(input.getResource(), '').then(() => this.editorService.openEditor({
+									resource: input.getResource(),
+									options: {
+										pinned: true // new file gets pinned by default
+									}
+								}));
+							})
 						]
 					}));
 				}
diff --git a/src/vs/workbench/parts/files/common/explorerModel.ts b/src/vs/workbench/parts/files/common/explorerModel.ts
index 60168c40f3b..a9813fe39f0 100644
--- a/src/vs/workbench/parts/files/common/explorerModel.ts
+++ b/src/vs/workbench/parts/files/common/explorerModel.ts
@@ -75,15 +75,17 @@ export class FileStat implements IFileStat {
 	public mtime: number;
 	public etag: string;
 	private _isDirectory: boolean;
+	private _isSymbolicLink: boolean;
 	public children: FileStat[];
 	public parent: FileStat;
 
 	public isDirectoryResolved: boolean;
 
-	constructor(resource: URI, public root: FileStat, isDirectory?: boolean, name: string = getPathLabel(resource), mtime?: number, etag?: string) {
+	constructor(resource: URI, public root: FileStat, isSymbolicLink?: boolean, isDirectory?: boolean, name: string = getPathLabel(resource), mtime?: number, etag?: string) {
 		this.resource = resource;
 		this.name = name;
 		this.isDirectory = !!isDirectory;
+		this._isSymbolicLink = !!isSymbolicLink;
 		this.etag = etag;
 		this.mtime = mtime;
 
@@ -94,6 +96,10 @@ export class FileStat implements IFileStat {
 		this.isDirectoryResolved = false;
 	}
 
+	public get isSymbolicLink(): boolean {
+		return this._isSymbolicLink;
+	}
+
 	public get isDirectory(): boolean {
 		return this._isDirectory;
 	}
@@ -123,7 +129,7 @@ export class FileStat implements IFileStat {
 	}
 
 	public static create(raw: IFileStat, root: FileStat, resolveTo?: URI[]): FileStat {
-		const stat = new FileStat(raw.resource, root, raw.isDirectory, raw.name, raw.mtime, raw.etag);
+		const stat = new FileStat(raw.resource, root, raw.isSymbolicLink, raw.isDirectory, raw.name, raw.mtime, raw.etag);
 
 		// Recursively add children if present
 		if (stat.isDirectory) {
@@ -316,7 +322,7 @@ export class NewStatPlaceholder extends FileStat {
 	private directoryPlaceholder: boolean;
 
 	constructor(isDirectory: boolean, root: FileStat) {
-		super(URI.file(''), root, false, '');
+		super(URI.file(''), root, false, false, '');
 
 		this.id = NewStatPlaceholder.ID++;
 		this.isDirectoryResolved = isDirectory;
diff --git a/src/vs/workbench/parts/files/common/files.ts b/src/vs/workbench/parts/files/common/files.ts
index 8924a1f2d1e..3147b323330 100644
--- a/src/vs/workbench/parts/files/common/files.ts
+++ b/src/vs/workbench/parts/files/common/files.ts
@@ -40,6 +40,7 @@ export interface IExplorerView {
  */
 const explorerViewletVisibleId = 'explorerViewletVisible';
 const filesExplorerFocusId = 'filesExplorerFocus';
+const openEditorsVisibleId = 'openEditorsVisible';
 const openEditorsFocusId = 'openEditorsFocus';
 const explorerViewletFocusId = 'explorerViewletFocus';
 const explorerResourceIsFolderId = 'explorerResourceIsFolder';
@@ -49,9 +50,11 @@ export const ExplorerViewletVisibleContext = new RawContextKey<boolean>(explorer
 export const ExplorerFolderContext = new RawContextKey<boolean>(explorerResourceIsFolderId, false);
 export const ExplorerRootContext = new RawContextKey<boolean>(explorerResourceIsRootId, false);
 export const FilesExplorerFocusedContext = new RawContextKey<boolean>(filesExplorerFocusId, true);
+export const OpenEditorsVisibleContext = new RawContextKey<boolean>(openEditorsVisibleId, false);
 export const OpenEditorsFocusedContext = new RawContextKey<boolean>(openEditorsFocusId, true);
 export const ExplorerFocusedContext = new RawContextKey<boolean>(explorerViewletFocusId, true);
 
+export const OpenEditorsVisibleCondition = ContextKeyExpr.has(openEditorsVisibleId);
 export const FilesExplorerFocusCondition = ContextKeyExpr.and(ContextKeyExpr.has(explorerViewletVisibleId), ContextKeyExpr.has(filesExplorerFocusId), ContextKeyExpr.not(InputFocusedContextKey));
 export const ExplorerFocusCondition = ContextKeyExpr.and(ContextKeyExpr.has(explorerViewletVisibleId), ContextKeyExpr.has(explorerViewletFocusId), ContextKeyExpr.not(InputFocusedContextKey));
 
diff --git a/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts b/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts
index df259646f71..7dd040a28c2 100644
--- a/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts
+++ b/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts
@@ -11,9 +11,9 @@ import { IActionRunner } from 'vs/base/common/actions';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as DOM from 'vs/base/browser/dom';
 import { Builder } from 'vs/base/browser/builder';
-import { VIEWLET_ID, ExplorerViewletVisibleContext, IFilesConfiguration, IExplorerViewlet } from 'vs/workbench/parts/files/common/files';
+import { VIEWLET_ID, ExplorerViewletVisibleContext, IFilesConfiguration, OpenEditorsVisibleContext, OpenEditorsVisibleCondition, IExplorerViewlet } from 'vs/workbench/parts/files/common/files';
 import { PersistentViewsViewlet, IViewletViewOptions, ViewsViewletPanel } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { ActionRunner, FileViewletState } from 'vs/workbench/parts/files/electron-browser/views/explorerViewer';
 import { ExplorerView, IExplorerViewOptions } from 'vs/workbench/parts/files/electron-browser/views/explorerView';
 import { EmptyView } from 'vs/workbench/parts/files/electron-browser/views/emptyView';
@@ -38,16 +38,23 @@ import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 
 export class ExplorerViewletViewsContribution extends Disposable implements IWorkbenchContribution {
 
+	private openEditorsVisibleContextKey: IContextKey<boolean>;
+
 	constructor(
 		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
+		@IConfigurationService private configurationService: IConfigurationService,
 		@IContextKeyService contextKeyService: IContextKeyService
 	) {
 		super();
 
 		this.registerViews();
 
+		this.openEditorsVisibleContextKey = OpenEditorsVisibleContext.bindTo(contextKeyService);
+		this.updateOpenEditorsVisibility();
+
 		this._register(workspaceContextService.onDidChangeWorkbenchState(() => this.registerViews()));
 		this._register(workspaceContextService.onDidChangeWorkspaceFolders(() => this.registerViews()));
+		this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(e)));
 	}
 
 	private registerViews(): void {
@@ -97,6 +104,7 @@ export class ExplorerViewletViewsContribution extends Disposable implements IWor
 			location: ViewLocation.Explorer,
 			ctor: OpenEditorsView,
 			order: 0,
+			when: OpenEditorsVisibleCondition,
 			canToggleVisibility: true
 		};
 	}
@@ -122,6 +130,16 @@ export class ExplorerViewletViewsContribution extends Disposable implements IWor
 			canToggleVisibility: false
 		};
 	}
+
+	private onConfigurationUpdated(e: IConfigurationChangeEvent): void {
+		if (e.affectsConfiguration('explorer.openEditors.visible')) {
+			this.updateOpenEditorsVisibility();
+		}
+	}
+
+	private updateOpenEditorsVisibility(): void {
+		this.openEditorsVisibleContextKey.set(this.workspaceContextService.getWorkbenchState() === WorkbenchState.EMPTY || this.configurationService.getValue('explorer.openEditors.visible') !== 0);
+	}
 }
 
 export class ExplorerViewlet extends PersistentViewsViewlet implements IExplorerViewlet {
@@ -159,6 +177,10 @@ export class ExplorerViewlet extends PersistentViewsViewlet implements IExplorer
 		DOM.addClass(el, 'explorer-viewlet');
 	}
 
+	private isOpenEditorsVisible(): boolean {
+		return this.contextService.getWorkbenchState() === WorkbenchState.EMPTY || this.configurationService.getValue('explorer.openEditors.visible') !== 0;
+	}
+
 	protected createView(viewDescriptor: IViewDescriptor, options: IViewletViewOptions): ViewsViewletPanel {
 		if (viewDescriptor.id === ExplorerView.ID) {
 			// Create a delegating editor service for the explorer to be able to delay the refresh in the opened
@@ -231,4 +253,13 @@ export class ExplorerViewlet extends PersistentViewsViewlet implements IExplorer
 	public getViewletState(): FileViewletState {
 		return this.viewletState;
 	}
-}
+
+	protected loadViewsStates(): void {
+		super.loadViewsStates();
+
+		// Remove the open editors view state if it is removed globally
+		if (!this.isOpenEditorsVisible()) {
+			this.viewsStates.delete(OpenEditorsView.ID);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.ts
index a7ffb1d52ab..24a519c554e 100644
--- a/src/vs/workbench/parts/files/electron-browser/fileActions.ts
+++ b/src/vs/workbench/parts/files/electron-browser/fileActions.ts
@@ -16,7 +16,6 @@ import URI from 'vs/base/common/uri';
 import errors = require('vs/base/common/errors');
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import strings = require('vs/base/common/strings');
-import severity from 'vs/base/common/severity';
 import diagnostics = require('vs/base/common/diagnostics');
 import { Action, IAction } from 'vs/base/common/actions';
 import { MessageType, IInputValidator } from 'vs/base/browser/ui/inputbox/inputBox';
@@ -36,8 +35,7 @@ import { IEditorGroupService } from 'vs/workbench/services/group/common/groupSer
 import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IUntitledResourceInput } from 'vs/platform/editor/common/editor';
-import { IInstantiationService, IConstructorSignature2, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IMessageService, IMessageWithAction, IConfirmation, Severity, CancelAction, IConfirmationResult, getConfirmMessage } from 'vs/platform/message/common/message';
+import { IInstantiationService, ServicesAccessor, IConstructorSignature2 } from 'vs/platform/instantiation/common/instantiation';
 import { ITextModel } from 'vs/editor/common/model';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { IWindowsService } from 'vs/platform/windows/common/windows';
@@ -53,6 +51,9 @@ import { IListService, ListWidget } from 'vs/platform/list/browser/listService';
 import { RawContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { distinctParents, basenameOrAuthority } from 'vs/base/common/resources';
 import { Schemas } from 'vs/base/common/network';
+import { IConfirmationService, IConfirmationResult, IConfirmation } from 'vs/platform/dialogs/common/dialogs';
+import { getConfirmMessage } from 'vs/workbench/services/dialogs/electron-browser/dialogs';
+import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 
 export interface IEditableData {
 	action: IAction;
@@ -86,13 +87,13 @@ export class BaseErrorReportingAction extends Action {
 	constructor(
 		id: string,
 		label: string,
-		private _messageService: IMessageService
+		private _notificationService: INotificationService
 	) {
 		super(id, label);
 	}
 
-	public get messageService() {
-		return this._messageService;
+	public get notificationService() {
+		return this._notificationService;
 	}
 
 	protected onError(error: any): void {
@@ -100,25 +101,23 @@ export class BaseErrorReportingAction extends Action {
 			error = error.message;
 		}
 
-		this._messageService.show(Severity.Error, toErrorMessage(error, false));
+		this._notificationService.error(toErrorMessage(error, false));
 	}
 
 	protected onErrorWithRetry(error: any, retry: () => TPromise<any>, extraAction?: Action): void {
 		const actions = [
 			new Action(this.id, nls.localize('retry', "Retry"), null, true, () => retry()),
-			CancelAction
 		];
 
 		if (extraAction) {
 			actions.unshift(extraAction);
 		}
 
-		const errorWithRetry: IMessageWithAction = {
-			actions,
-			message: toErrorMessage(error, false)
-		};
-
-		this._messageService.show(Severity.Error, errorWithRetry);
+		this._notificationService.notify({
+			severity: Severity.Error,
+			message: toErrorMessage(error, false),
+			actions: { primary: actions }
+		});
 	}
 }
 
@@ -129,10 +128,10 @@ export class BaseFileAction extends BaseErrorReportingAction {
 		id: string,
 		label: string,
 		@IFileService protected fileService: IFileService,
-		@IMessageService _messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@ITextFileService protected textFileService: ITextFileService
 	) {
-		super(id, label, _messageService);
+		super(id, label, notificationService);
 
 		this.enabled = false;
 	}
@@ -157,11 +156,11 @@ class TriggerRenameFileAction extends BaseFileAction {
 		tree: ITree,
 		element: FileStat,
 		@IFileService fileService: IFileService,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@ITextFileService textFileService: ITextFileService,
 		@IInstantiationService instantiationService: IInstantiationService
 	) {
-		super(TriggerRenameFileAction.ID, TRIGGER_RENAME_LABEL, fileService, messageService, textFileService);
+		super(TriggerRenameFileAction.ID, TRIGGER_RENAME_LABEL, fileService, notificationService, textFileService);
 
 		this.tree = tree;
 		this.element = element;
@@ -228,10 +227,10 @@ export abstract class BaseRenameAction extends BaseFileAction {
 		label: string,
 		element: FileStat,
 		@IFileService fileService: IFileService,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@ITextFileService textFileService: ITextFileService
 	) {
-		super(id, label, fileService, messageService, textFileService);
+		super(id, label, fileService, notificationService, textFileService);
 
 		this.element = element;
 	}
@@ -289,11 +288,11 @@ class RenameFileAction extends BaseRenameAction {
 	constructor(
 		element: FileStat,
 		@IFileService fileService: IFileService,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@ITextFileService textFileService: ITextFileService,
 		@IBackupFileService private backupFileService: IBackupFileService
 	) {
-		super(RenameFileAction.ID, nls.localize('rename', "Rename"), element, fileService, messageService, textFileService);
+		super(RenameFileAction.ID, nls.localize('rename', "Rename"), element, fileService, notificationService, textFileService);
 
 		this._updateEnablement();
 	}
@@ -354,10 +353,10 @@ export class BaseNewAction extends BaseFileAction {
 		editableAction: BaseRenameAction,
 		element: FileStat,
 		@IFileService fileService: IFileService,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@ITextFileService textFileService: ITextFileService
 	) {
-		super(id, label, fileService, messageService, textFileService);
+		super(id, label, fileService, notificationService, textFileService);
 
 		if (element) {
 			this.presetFolder = element.isDirectory ? element : element.parent;
@@ -443,11 +442,11 @@ export class NewFileAction extends BaseNewAction {
 		tree: ITree,
 		element: FileStat,
 		@IFileService fileService: IFileService,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@ITextFileService textFileService: ITextFileService,
 		@IInstantiationService instantiationService: IInstantiationService
 	) {
-		super('explorer.newFile', NEW_FILE_LABEL, tree, true, instantiationService.createInstance(CreateFileAction, element), null, fileService, messageService, textFileService);
+		super('explorer.newFile', NEW_FILE_LABEL, tree, true, instantiationService.createInstance(CreateFileAction, element), null, fileService, notificationService, textFileService);
 
 		this.class = 'explorer-action new-file';
 		this._updateEnablement();
@@ -461,66 +460,17 @@ export class NewFolderAction extends BaseNewAction {
 		tree: ITree,
 		element: FileStat,
 		@IFileService fileService: IFileService,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@ITextFileService textFileService: ITextFileService,
 		@IInstantiationService instantiationService: IInstantiationService
 	) {
-		super('explorer.newFolder', NEW_FOLDER_LABEL, tree, false, instantiationService.createInstance(CreateFolderAction, element), null, fileService, messageService, textFileService);
+		super('explorer.newFolder', NEW_FOLDER_LABEL, tree, false, instantiationService.createInstance(CreateFolderAction, element), null, fileService, notificationService, textFileService);
 
 		this.class = 'explorer-action new-folder';
 		this._updateEnablement();
 	}
 }
 
-export abstract class BaseGlobalNewAction extends Action {
-	private toDispose: Action;
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private viewletService: IViewletService,
-		@IInstantiationService private instantiationService: IInstantiationService,
-		@IMessageService private messageService: IMessageService
-	) {
-		super(id, label);
-	}
-
-	public run(): TPromise<any> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true).then((viewlet) => {
-			return TPromise.timeout(100).then(() => { // use a timeout to prevent the explorer from revealing the active file
-				viewlet.focus();
-
-				const explorer = <ExplorerViewlet>viewlet;
-				const explorerView = explorer.getExplorerView();
-
-				// Not having a folder opened
-				if (!explorerView) {
-					return this.messageService.show(Severity.Info, nls.localize('openFolderFirst', "Open a folder first to create files or folders within."));
-				}
-
-				if (!explorerView.isExpanded()) {
-					explorerView.setExpanded(true);
-				}
-
-				const action = this.toDispose = this.instantiationService.createInstance(this.getAction(), explorerView.getViewer(), null);
-
-				return explorer.getActionRunner().run(action);
-			});
-		});
-	}
-
-	protected abstract getAction(): IConstructorSignature2<ITree, IFileStat, Action>;
-
-	public dispose(): void {
-		super.dispose();
-
-		if (this.toDispose) {
-			this.toDispose.dispose();
-			this.toDispose = null;
-		}
-	}
-}
-
 /* Create new file from anywhere: Open untitled */
 export class GlobalNewUntitledFileAction extends Action {
 	public static readonly ID = 'workbench.action.files.newUntitledFile';
@@ -561,10 +511,10 @@ class CreateFileAction extends BaseCreateAction {
 		element: FileStat,
 		@IFileService fileService: IFileService,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@ITextFileService textFileService: ITextFileService
 	) {
-		super(CreateFileAction.ID, CreateFileAction.LABEL, element, fileService, messageService, textFileService);
+		super(CreateFileAction.ID, CreateFileAction.LABEL, element, fileService, notificationService, textFileService);
 
 		this._updateEnablement();
 	}
@@ -588,10 +538,10 @@ class CreateFolderAction extends BaseCreateAction {
 	constructor(
 		element: FileStat,
 		@IFileService fileService: IFileService,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@ITextFileService textFileService: ITextFileService
 	) {
-		super(CreateFolderAction.ID, CreateFolderAction.LABEL, null, fileService, messageService, textFileService);
+		super(CreateFolderAction.ID, CreateFolderAction.LABEL, null, fileService, notificationService, textFileService);
 
 		this._updateEnablement();
 	}
@@ -615,11 +565,12 @@ class BaseDeleteFileAction extends BaseFileAction {
 		private elements: FileStat[],
 		private useTrash: boolean,
 		@IFileService fileService: IFileService,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
+		@IConfirmationService private confirmationService: IConfirmationService,
 		@ITextFileService textFileService: ITextFileService,
 		@IConfigurationService private configurationService: IConfigurationService
 	) {
-		super('moveFileToTrash', MOVE_FILE_TO_TRASH_LABEL, fileService, messageService, textFileService);
+		super('moveFileToTrash', MOVE_FILE_TO_TRASH_LABEL, fileService, notificationService, textFileService);
 
 		this.tree = tree;
 		this.useTrash = useTrash && elements.every(e => !paths.isUNC(e.resource.fsPath)); // on UNC shares there is no trash
@@ -660,7 +611,7 @@ class BaseDeleteFileAction extends BaseFileAction {
 				message = nls.localize('dirtyMessageFileDelete', "You are deleting a file with unsaved changes. Do you want to continue?");
 			}
 
-			confirmDirtyPromise = this.messageService.confirm({
+			confirmDirtyPromise = this.confirmationService.confirm({
 				message,
 				type: 'warning',
 				detail: nls.localize('dirtyWarning', "Your changes will be lost if you don't save them."),
@@ -693,7 +644,7 @@ class BaseDeleteFileAction extends BaseFileAction {
 				const message = distinctElements.length > 1 ? getConfirmMessage(nls.localize('confirmMoveTrashMessageMultiple', "Are you sure you want to delete the following {0} files?", distinctElements.length), distinctElements.map(e => e.resource))
 					: distinctElements[0].isDirectory ? nls.localize('confirmMoveTrashMessageFolder', "Are you sure you want to delete '{0}' and its contents?", distinctElements[0].name)
 						: nls.localize('confirmMoveTrashMessageFile', "Are you sure you want to delete '{0}'?", distinctElements[0].name);
-				confirmDeletePromise = this.messageService.confirmWithCheckbox({
+				confirmDeletePromise = this.confirmationService.confirmWithCheckbox({
 					message,
 					detail: isWindows ? nls.localize('undoBin', "You can restore from the recycle bin.") : nls.localize('undoTrash', "You can restore from the trash."),
 					primaryButton,
@@ -709,7 +660,7 @@ class BaseDeleteFileAction extends BaseFileAction {
 				const message = distinctElements.length > 1 ? getConfirmMessage(nls.localize('confirmDeleteMessageMultiple', "Are you sure you want to permanently delete the following {0} files?", distinctElements.length), distinctElements.map(e => e.resource))
 					: distinctElements[0].isDirectory ? nls.localize('confirmDeleteMessageFolder', "Are you sure you want to permanently delete '{0}' and its contents?", distinctElements[0].name)
 						: nls.localize('confirmDeleteMessageFile', "Are you sure you want to permanently delete '{0}'?", distinctElements[0].name);
-				confirmDeletePromise = this.messageService.confirmWithCheckbox({
+				confirmDeletePromise = this.confirmationService.confirmWithCheckbox({
 					message,
 					detail: nls.localize('irreversible', "This action is irreversible!"),
 					primaryButton,
@@ -769,10 +720,11 @@ export class ImportFileAction extends BaseFileAction {
 		clazz: string,
 		@IFileService fileService: IFileService,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
-		@IMessageService messageService: IMessageService,
+		@IConfirmationService private confirmationService: IConfirmationService,
+		@INotificationService notificationService: INotificationService,
 		@ITextFileService textFileService: ITextFileService
 	) {
-		super('workbench.files.action.importFile', nls.localize('importFiles', "Import Files"), fileService, messageService, textFileService);
+		super('workbench.files.action.importFile', nls.localize('importFiles', "Import Files"), fileService, notificationService, textFileService);
 
 		this.tree = tree;
 		this.element = element;
@@ -821,7 +773,7 @@ export class ImportFileAction extends BaseFileAction {
 							type: 'warning'
 						};
 
-						overwritePromise = this.messageService.confirm(confirm);
+						overwritePromise = this.confirmationService.confirm(confirm);
 					}
 
 					return overwritePromise.then(overwrite => {
@@ -881,12 +833,12 @@ class CopyFileAction extends BaseFileAction {
 		tree: ITree,
 		private elements: FileStat[],
 		@IFileService fileService: IFileService,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@ITextFileService textFileService: ITextFileService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IClipboardService private clipboardService: IClipboardService
 	) {
-		super('filesExplorer.copy', COPY_FILE_LABEL, fileService, messageService, textFileService);
+		super('filesExplorer.copy', COPY_FILE_LABEL, fileService, notificationService, textFileService);
 
 		this.tree = tree;
 		this._updateEnablement();
@@ -919,11 +871,11 @@ class PasteFileAction extends BaseFileAction {
 		tree: ITree,
 		element: FileStat,
 		@IFileService fileService: IFileService,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@ITextFileService textFileService: ITextFileService,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService
 	) {
-		super(PasteFileAction.ID, PASTE_FILE_LABEL, fileService, messageService, textFileService);
+		super(PasteFileAction.ID, PASTE_FILE_LABEL, fileService, notificationService, textFileService);
 
 		this.tree = tree;
 		this.element = element;
@@ -985,10 +937,10 @@ export class DuplicateFileAction extends BaseFileAction {
 		target: FileStat,
 		@IFileService fileService: IFileService,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@ITextFileService textFileService: ITextFileService
 	) {
-		super('workbench.files.action.duplicateFile', nls.localize('duplicateFile', "Duplicate"), fileService, messageService, textFileService);
+		super('workbench.files.action.duplicateFile', nls.localize('duplicateFile', "Duplicate"), fileService, notificationService, textFileService);
 
 		this.tree = tree;
 		this.element = fileToDuplicate;
@@ -1065,7 +1017,7 @@ export class GlobalCompareResourcesAction extends Action {
 		label: string,
 		@IQuickOpenService private quickOpenService: IQuickOpenService,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IEditorGroupService private editorGroupService: IEditorGroupService
 	) {
 		super(id, label);
@@ -1094,7 +1046,7 @@ export class GlobalCompareResourcesAction extends Action {
 				unbind.dispose(); // make sure to unbind if quick open is closing
 			});
 		} else {
-			this.messageService.show(Severity.Info, nls.localize('openFileToCompare', "Open a file first to compare it with another file."));
+			this.notificationService.info(nls.localize('openFileToCompare', "Open a file first to compare it with another file."));
 		}
 
 		return TPromise.as(true);
@@ -1119,9 +1071,9 @@ export abstract class BaseSaveAllAction extends BaseErrorReportingAction {
 		@ITextFileService private textFileService: ITextFileService,
 		@IUntitledEditorService private untitledEditorService: IUntitledEditorService,
 		@ICommandService protected commandService: ICommandService,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 	) {
-		super(id, label, messageService);
+		super(id, label, notificationService);
 
 		this.toDispose = [];
 		this.lastIsDirty = this.textFileService.isDirty();
@@ -1260,7 +1212,7 @@ export class ShowActiveFileInExplorer extends Action {
 		id: string,
 		label: string,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@ICommandService private commandService: ICommandService
 	) {
 		super(id, label);
@@ -1271,7 +1223,7 @@ export class ShowActiveFileInExplorer extends Action {
 		if (resource) {
 			this.commandService.executeCommand(REVEAL_IN_EXPLORER_COMMAND_ID, resource);
 		} else {
-			this.messageService.show(severity.Info, nls.localize('openFileToShow', "Open a file first to show it in the explorer"));
+			this.notificationService.info(nls.localize('openFileToShow', "Open a file first to show it in the explorer"));
 		}
 
 		return TPromise.as(true);
@@ -1339,7 +1291,7 @@ export class ShowOpenedFileInNewWindow extends Action {
 		label: string,
 		@IWindowsService private windowsService: IWindowsService,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
-		@IMessageService private messageService: IMessageService
+		@INotificationService private notificationService: INotificationService,
 	) {
 		super(id, label);
 	}
@@ -1349,7 +1301,7 @@ export class ShowOpenedFileInNewWindow extends Action {
 		if (fileResource) {
 			this.windowsService.openWindow([fileResource.fsPath], { forceNewWindow: true, forceOpenWorkspaceAsFile: true });
 		} else {
-			this.messageService.show(severity.Info, nls.localize('openFileToShowInNewWindow', "Open a file first to open in new window"));
+			this.notificationService.info(nls.localize('openFileToShowInNewWindow', "Open a file first to open in new window"));
 		}
 
 		return TPromise.as(true);
@@ -1374,6 +1326,7 @@ export class CopyPathAction extends Action {
 	}
 }
 
+
 export function validateFileName(parent: IFileStat, name: string, allowOverwriting: boolean = false): string {
 
 	// Produce a well formed file name
@@ -1384,21 +1337,29 @@ export function validateFileName(parent: IFileStat, name: string, allowOverwriti
 		return nls.localize('emptyFileNameError', "A file or folder name must be provided.");
 	}
 
+	const names: string[] = name.split(/[\\/]/).filter(part => !!part);
+
 	// Do not allow to overwrite existing file
 	if (!allowOverwriting) {
-		if (parent.children && parent.children.some((c) => {
-			if (isLinux) {
-				return c.name === name;
-			}
+		let p = parent;
+		const alreadyExisting = names.every((folderName) => {
+			let { exists, child } = alreadyExists(p, folderName);
 
-			return c.name.toLowerCase() === name.toLowerCase();
-		})) {
+			if (!exists) {
+				return false;
+			} else {
+				p = child;
+				return true;
+			}
+		});
+
+		if (alreadyExisting) {
 			return nls.localize('fileNameExistsError', "A file or folder **{0}** already exists at this location. Please choose a different name.", name);
 		}
 	}
 
 	// Invalid File name
-	if (!paths.isValidBasename(name)) {
+	if (names.some((folderName) => !paths.isValidBasename(folderName))) {
 		return nls.localize('invalidFileNameError', "The name **{0}** is not valid as a file or folder name. Please choose a different name.", trimLongName(name));
 	}
 
@@ -1413,6 +1374,28 @@ export function validateFileName(parent: IFileStat, name: string, allowOverwriti
 	return null;
 }
 
+function alreadyExists(parent: IFileStat, name: string): { exists: boolean, child: IFileStat | undefined } {
+	let duplicateChild: IFileStat;
+
+	if (parent.children) {
+		let exists: boolean = parent.children.some((c) => {
+			let found: boolean;
+			if (isLinux) {
+				found = c.name === name;
+			} else {
+				found = c.name.toLowerCase() === name.toLowerCase();
+			}
+			if (found) {
+				duplicateChild = c;
+			}
+			return found;
+		});
+		return { exists, child: duplicateChild };
+	}
+
+	return { exists: false, child: undefined };
+}
+
 function trimLongName(name: string): string {
 	if (name && name.length > 255) {
 		return `${name.substr(0, 255)}...`;
@@ -1525,7 +1508,7 @@ function getContext(listWidget: ListWidget, viewletService: IViewletService): IE
 
 // TODO@isidor these commands are calling into actions due to the complex inheritance action structure.
 // It should be the other way around, that actions call into commands.
-function openExplorerAndRunAction(accessor: ServicesAccessor, isFolderAction: boolean): TPromise<any> {
+function openExplorerAndRunAction(accessor: ServicesAccessor, constructor: IConstructorSignature2<ITree, IFileStat, Action>): TPromise<any> {
 	const instantationService = accessor.get(IInstantiationService);
 	const listService = accessor.get(IListService);
 	const viewletService = accessor.get(IViewletService);
@@ -1540,7 +1523,6 @@ function openExplorerAndRunAction(accessor: ServicesAccessor, isFolderAction: bo
 		if (explorerView && explorerView.isVisible() && explorerView.isExpanded()) {
 			explorerView.focus();
 			const explorerContext = getContext(listService.lastFocusedList, viewletService);
-			const constructor = isFolderAction ? NewFolderAction : NewFileAction;
 			const action = instantationService.createInstance(constructor, listService.lastFocusedList, explorerContext.stat);
 
 			return action.run(explorerContext);
@@ -1553,14 +1535,14 @@ function openExplorerAndRunAction(accessor: ServicesAccessor, isFolderAction: bo
 CommandsRegistry.registerCommand({
 	id: NEW_FILE_COMMAND_ID,
 	handler: (accessor) => {
-		return openExplorerAndRunAction(accessor, false);
+		return openExplorerAndRunAction(accessor, NewFileAction);
 	}
 });
 
 CommandsRegistry.registerCommand({
 	id: NEW_FOLDER_COMMAND_ID,
 	handler: (accessor) => {
-		return openExplorerAndRunAction(accessor, true);
+		return openExplorerAndRunAction(accessor, NewFolderAction);
 	}
 });
 
diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts
index 4f96e279b46..efbd0483277 100644
--- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts
+++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts
@@ -7,7 +7,6 @@
 
 import nls = require('vs/nls');
 import paths = require('vs/base/common/paths');
-import severity from 'vs/base/common/severity';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as labels from 'vs/base/common/labels';
 import URI from 'vs/base/common/uri';
@@ -21,7 +20,6 @@ import { ExplorerFocusCondition, FileOnDiskContentProvider, VIEWLET_ID } from 'v
 import { ExplorerViewlet } from 'vs/workbench/parts/files/electron-browser/explorerViewlet';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { basename } from 'vs/base/common/paths';
@@ -43,6 +41,7 @@ import { getResourceForCommand, getMultiSelectedResources } from 'vs/workbench/p
 import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
 import { getMultiSelectedEditorContexts } from 'vs/workbench/browser/parts/editor/editorCommands';
 import { Schemas } from 'vs/base/common/network';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 // Commands
 
@@ -244,12 +243,13 @@ CommandsRegistry.registerCommand({
 	handler: (accessor, resource: URI) => {
 		const editorService = accessor.get(IWorkbenchEditorService);
 		const textFileService = accessor.get(ITextFileService);
-		const messageService = accessor.get(IMessageService);
-		const resources = getMultiSelectedResources(resource, accessor.get(IListService), editorService);
+		const notificationService = accessor.get(INotificationService);
+		const resources = getMultiSelectedResources(resource, accessor.get(IListService), editorService)
+			.filter(resource => resource.scheme !== Schemas.untitled);
 
-		if (resource && resource.scheme !== Schemas.untitled) {
+		if (resources.length) {
 			return textFileService.revertAll(resources, { force: true }).then(null, error => {
-				messageService.show(Severity.Error, nls.localize('genericRevertError', "Failed to revert '{0}': {1}", basename(resource.fsPath), toErrorMessage(error, false)));
+				notificationService.error(nls.localize('genericRevertError', "Failed to revert '{0}': {1}", resources.map(r => basename(r.fsPath)).join(', '), toErrorMessage(error, false)));
 			});
 		}
 
@@ -386,11 +386,11 @@ CommandsRegistry.registerCommand({
 	}
 });
 
-function revealResourcesInOS(resources: URI[], windowsService: IWindowsService, messageService: IMessageService): void {
+function revealResourcesInOS(resources: URI[], windowsService: IWindowsService, notificationService: INotificationService): void {
 	if (resources.length) {
 		sequence(resources.map(r => () => windowsService.showItemInFolder(paths.normalize(r.fsPath, true))));
 	} else {
-		messageService.show(severity.Info, nls.localize('openFileToReveal', "Open a file first to reveal"));
+		notificationService.info(nls.localize('openFileToReveal', "Open a file first to reveal"));
 	}
 }
 KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -403,7 +403,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	},
 	handler: (accessor: ServicesAccessor, resource: URI) => {
 		const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService));
-		revealResourcesInOS(resources, accessor.get(IWindowsService), accessor.get(IMessageService));
+		revealResourcesInOS(resources, accessor.get(IWindowsService), accessor.get(INotificationService));
 	}
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -415,17 +415,17 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		const editorService = accessor.get(IWorkbenchEditorService);
 		const activeInput = editorService.getActiveEditorInput();
 		const resources = activeInput && activeInput.getResource() ? [activeInput.getResource()] : [];
-		revealResourcesInOS(resources, accessor.get(IWindowsService), accessor.get(IMessageService));
+		revealResourcesInOS(resources, accessor.get(IWindowsService), accessor.get(INotificationService));
 	}
 });
 
-function resourcesToClipboard(resources: URI[], clipboardService: IClipboardService, messageService: IMessageService): void {
+function resourcesToClipboard(resources: URI[], clipboardService: IClipboardService, notificationService: INotificationService): void {
 	if (resources.length) {
 		const lineDelimiter = isWindows ? '\r\n' : '\n';
 		const text = resources.map(r => r.scheme === Schemas.file ? labels.getPathLabel(r) : r.toString()).join(lineDelimiter);
 		clipboardService.writeText(text);
 	} else {
-		messageService.show(severity.Info, nls.localize('openFileToCopy', "Open a file first to copy its path"));
+		notificationService.info(nls.localize('openFileToCopy', "Open a file first to copy its path"));
 	}
 }
 KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -438,7 +438,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: COPY_PATH_COMMAND_ID,
 	handler: (accessor, resource: URI) => {
 		const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService));
-		resourcesToClipboard(resources, accessor.get(IClipboardService), accessor.get(IMessageService));
+		resourcesToClipboard(resources, accessor.get(IClipboardService), accessor.get(INotificationService));
 	}
 });
 
@@ -451,7 +451,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		const editorService = accessor.get(IWorkbenchEditorService);
 		const activeInput = editorService.getActiveEditorInput();
 		const resources = activeInput && activeInput.getResource() ? [activeInput.getResource()] : [];
-		resourcesToClipboard(resources, accessor.get(IClipboardService), accessor.get(IMessageService));
+		resourcesToClipboard(resources, accessor.get(IClipboardService), accessor.get(INotificationService));
 	}
 });
 
diff --git a/src/vs/workbench/parts/files/electron-browser/media/explorerviewlet.css b/src/vs/workbench/parts/files/electron-browser/media/explorerviewlet.css
index eb657380a67..9cd2408fa2c 100644
--- a/src/vs/workbench/parts/files/electron-browser/media/explorerviewlet.css
+++ b/src/vs/workbench/parts/files/electron-browser/media/explorerviewlet.css
@@ -109,6 +109,7 @@
 .monaco-workbench.linux .explorer-viewlet .explorer-item .monaco-inputbox,
 .monaco-workbench.mac .explorer-viewlet .explorer-item .monaco-inputbox {
 	height: 22px;
+	margin-left: -1px;
 }
 
 .explorer-viewlet .explorer-item .monaco-inputbox > .wrapper > .input {
diff --git a/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts b/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
index 3a0864e2ea7..85305c7d53a 100644
--- a/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
+++ b/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
@@ -12,11 +12,9 @@ import paths = require('vs/base/common/paths');
 import { Action } from 'vs/base/common/actions';
 import URI from 'vs/base/common/uri';
 import { FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { ITextFileService, ISaveErrorHandler, ITextFileEditorModel } from 'vs/workbench/services/textfile/common/textfiles';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IMessageService, IMessageWithAction, Severity, CancelAction } from 'vs/platform/message/common/message';
+import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
@@ -29,34 +27,40 @@ import { IContextKeyService, IContextKey, RawContextKey } from 'vs/platform/cont
 import { FileOnDiskContentProvider } from 'vs/workbench/parts/files/common/files';
 import { FileEditorInput } from 'vs/workbench/parts/files/common/editors/fileEditorInput';
 import { IModelService } from 'vs/editor/common/services/modelService';
-import { ICommandService } from 'vs/platform/commands/common/commands';
 import { SAVE_FILE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL } from 'vs/workbench/parts/files/electron-browser/fileCommands';
 import { createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
+import { INotificationService, INotificationHandle, INotificationActions, Severity } from 'vs/platform/notification/common/notification';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { ExecuteCommandAction } from 'vs/platform/actions/common/actions';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
 export const CONFLICT_RESOLUTION_CONTEXT = 'saveConflictResolutionContext';
 export const CONFLICT_RESOLUTION_SCHEME = 'conflictResolution';
 
-const conflictEditorHelp = nls.localize('userGuide', "Use the actions in the editor tool bar to the right to either **undo** your changes or **overwrite** the content on disk with your changes");
+const LEARN_MORE_DIRTY_WRITE_IGNORE_KEY = 'learnMoreDirtyWriteError';
+
+const conflictEditorHelp = nls.localize('userGuide', "Use the actions in the editor tool bar to either undo your changes or overwrite the content on disk with your changes.");
 
 // A handler for save error happening with conflict resolution actions
 export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContribution {
-	private messages: ResourceMap<() => void>;
+	private messages: ResourceMap<INotificationHandle>;
 	private toUnbind: IDisposable[];
 	private conflictResolutionContext: IContextKey<boolean>;
 	private activeConflictResolutionResource: URI;
 
 	constructor(
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@ITextFileService private textFileService: ITextFileService,
-		@IInstantiationService private instantiationService: IInstantiationService,
 		@IEditorGroupService private editorGroupService: IEditorGroupService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
 		@ITextModelService textModelService: ITextModelService,
-		@ICommandService private commandService: ICommandService
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IStorageService private storageService: IStorageService
 	) {
 		this.toUnbind = [];
-		this.messages = new ResourceMap<() => void>();
+		this.messages = new ResourceMap<INotificationHandle>();
 		this.conflictResolutionContext = new RawContextKey<boolean>(CONFLICT_RESOLUTION_CONTEXT, false).bindTo(contextKeyService);
 
 		const provider = instantiationService.createInstance(FileOnDiskContentProvider);
@@ -95,105 +99,85 @@ export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContributi
 	}
 
 	private onFileSavedOrReverted(resource: URI): void {
-		const hideMessage = this.messages.get(resource);
-		if (hideMessage) {
-			hideMessage();
+		const messageHandle = this.messages.get(resource);
+		if (messageHandle) {
+			messageHandle.dispose();
 			this.messages.delete(resource);
 		}
 	}
 
 	public onSaveError(error: any, model: ITextFileEditorModel): void {
-		let message: IMessageWithAction | string;
-
 		const fileOperationError = error as FileOperationError;
 		const resource = model.getResource();
 
+		let message: string;
+		const actions: INotificationActions = { primary: [], secondary: [] };
+
 		// Dirty write prevention
 		if (fileOperationError.fileOperationResult === FileOperationResult.FILE_MODIFIED_SINCE) {
 
 			// If the user tried to save from the opened conflict editor, show its message again
-			// Otherwise show the message that will lead the user into the save conflict editor.
 			if (this.activeConflictResolutionResource && this.activeConflictResolutionResource.toString() === model.getResource().toString()) {
+				if (this.storageService.getBoolean(LEARN_MORE_DIRTY_WRITE_IGNORE_KEY)) {
+					return; // return if this message is ignored
+				}
+
 				message = conflictEditorHelp;
-			} else {
-				message = this.instantiationService.createInstance(ResolveSaveConflictMessage, model, null);
+
+				actions.primary.push(this.instantiationService.createInstance(ResolveConflictLearnMoreAction));
+				actions.secondary.push(this.instantiationService.createInstance(DoNotShowResolveConflictLearnMoreAction));
+			}
+
+			// Otherwise show the message that will lead the user into the save conflict editor.
+			else {
+				message = nls.localize('staleSaveError', "Failed to save '{0}': The content on disk is newer. Please compare your version with the one on disk.", paths.basename(resource.fsPath));
+
+				actions.primary.push(this.instantiationService.createInstance(ResolveSaveConflictAction, model));
 			}
 		}
 
 		// Any other save error
 		else {
-			const actions: Action[] = [];
-
 			const isReadonly = fileOperationError.fileOperationResult === FileOperationResult.FILE_READ_ONLY;
 			const triedToMakeWriteable = isReadonly && fileOperationError.options && fileOperationError.options.overwriteReadonly;
 			const isPermissionDenied = fileOperationError.fileOperationResult === FileOperationResult.FILE_PERMISSION_DENIED;
 
 			// Save Elevated
 			if (isPermissionDenied || triedToMakeWriteable) {
-				actions.push(new Action('workbench.files.action.saveElevated', triedToMakeWriteable ? nls.localize('overwriteElevated', "Overwrite as Admin...") : nls.localize('saveElevated', "Retry as Admin..."), null, true, () => {
-					if (!model.isDisposed()) {
-						model.save({
-							writeElevated: true,
-							overwriteReadonly: triedToMakeWriteable
-						}).done(null, errors.onUnexpectedError);
-					}
-
-					return TPromise.as(true);
-				}));
+				actions.primary.push(this.instantiationService.createInstance(SaveElevatedAction, model, triedToMakeWriteable));
 			}
 
 			// Overwrite
 			else if (isReadonly) {
-				actions.push(new Action('workbench.files.action.overwrite', nls.localize('overwrite', "Overwrite"), null, true, () => {
-					if (!model.isDisposed()) {
-						model.save({ overwriteReadonly: true }).done(null, errors.onUnexpectedError);
-					}
-
-					return TPromise.as(true);
-				}));
+				actions.primary.push(this.instantiationService.createInstance(OverwriteReadonlyAction, model));
 			}
 
 			// Retry
 			else {
-				actions.push(new Action('workbench.files.action.retry', nls.localize('retry', "Retry"), null, true, () => {
-					return this.commandService.executeCommand(SAVE_FILE_COMMAND_ID, resource);
-				}));
+				actions.primary.push(this.instantiationService.createInstance(ExecuteCommandAction, SAVE_FILE_COMMAND_ID, nls.localize('retry', "Retry")));
 			}
 
 			// Save As
-			actions.push(new Action('workbench.files.action.saveAs', SAVE_FILE_AS_LABEL, null, true, () => {
-				return this.commandService.executeCommand(SAVE_FILE_AS_COMMAND_ID, resource);
-			}));
+			actions.primary.push(this.instantiationService.createInstance(ExecuteCommandAction, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL));
 
 			// Discard
-			actions.push(new Action('workbench.files.action.discard', nls.localize('discard', "Discard"), null, true, () => {
-				return this.commandService.executeCommand(REVERT_FILE_COMMAND_ID, resource);
-			}));
+			actions.primary.push(this.instantiationService.createInstance(ExecuteCommandAction, REVERT_FILE_COMMAND_ID, nls.localize('discard', "Discard")));
 
-			// Cancel
-			actions.push(CancelAction);
-
-			let errorMessage: string;
 			if (isReadonly) {
 				if (triedToMakeWriteable) {
-					errorMessage = nls.localize('readonlySaveErrorAdmin', "Failed to save '{0}': File is write protected. Select 'Overwrite as Admin' to retry as administrator.", paths.basename(resource.fsPath));
+					message = nls.localize('readonlySaveErrorAdmin', "Failed to save '{0}': File is write protected. Select 'Overwrite as Admin' to retry as administrator.", paths.basename(resource.fsPath));
 				} else {
-					errorMessage = nls.localize('readonlySaveError', "Failed to save '{0}': File is write protected. Select 'Overwrite' to attempt to remove protection.", paths.basename(resource.fsPath));
+					message = nls.localize('readonlySaveError', "Failed to save '{0}': File is write protected. Select 'Overwrite' to attempt to remove protection.", paths.basename(resource.fsPath));
 				}
 			} else if (isPermissionDenied) {
-				errorMessage = nls.localize('permissionDeniedSaveError', "Failed to save '{0}': Insufficient permissions. Select 'Retry as Admin' to retry as administrator.", paths.basename(resource.fsPath));
+				message = nls.localize('permissionDeniedSaveError', "Failed to save '{0}': Insufficient permissions. Select 'Retry as Admin' to retry as administrator.", paths.basename(resource.fsPath));
 			} else {
-				errorMessage = nls.localize('genericSaveError', "Failed to save '{0}': {1}", paths.basename(resource.fsPath), toErrorMessage(error, false));
+				message = nls.localize('genericSaveError', "Failed to save '{0}': {1}", paths.basename(resource.fsPath), toErrorMessage(error, false));
 			}
-
-			message = {
-				message: errorMessage,
-				actions
-			};
 		}
 
 		// Show message and keep function to hide in case the file gets saved/reverted
-		this.messages.set(model.getResource(), typeof message === 'string' ? this.messageService.show(Severity.Error, message) : this.messageService.show(Severity.Error, message));
+		this.messages.set(model.getResource(), this.notificationService.notify({ severity: Severity.Error, message, actions }));
 	}
 
 	public dispose(): void {
@@ -203,52 +187,124 @@ export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContributi
 	}
 }
 
-const pendingResolveSaveConflictMessages: Function[] = [];
+const pendingResolveSaveConflictMessages: INotificationHandle[] = [];
 function clearPendingResolveSaveConflictMessages(): void {
 	while (pendingResolveSaveConflictMessages.length > 0) {
-		pendingResolveSaveConflictMessages.pop()();
+		pendingResolveSaveConflictMessages.pop().dispose();
 	}
 }
 
-// A message with action to resolve a save conflict
-class ResolveSaveConflictMessage implements IMessageWithAction {
-	public message: string;
-	public actions: Action[];
-
-	private model: ITextFileEditorModel;
+class ResolveConflictLearnMoreAction extends Action {
 
 	constructor(
-		model: ITextFileEditorModel,
-		message: string,
-		@IMessageService private messageService: IMessageService,
+		@IOpenerService private openerService: IOpenerService
+	) {
+		super('workbench.files.action.resolveConflictLearnMore', nls.localize('learnMore', "Learn More"));
+	}
+
+	public run(): TPromise<any> {
+		return this.openerService.open(URI.parse('https://go.microsoft.com/fwlink/?linkid=868264'));
+	}
+}
+
+class DoNotShowResolveConflictLearnMoreAction extends Action {
+
+	constructor(
+		@IStorageService private storageService: IStorageService
+	) {
+		super('workbench.files.action.resolveConflictLearnMoreDoNotShowAgain', nls.localize('dontShowAgain', "Don't Show Again"));
+	}
+
+	public run(notification: IDisposable): TPromise<any> {
+		this.storageService.store(LEARN_MORE_DIRTY_WRITE_IGNORE_KEY, true);
+
+		// Hide notification
+		notification.dispose();
+
+		return TPromise.as(void 0);
+	}
+}
+
+class ResolveSaveConflictAction extends Action {
+
+	constructor(
+		private model: ITextFileEditorModel,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
+		@INotificationService private notificationService: INotificationService,
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IStorageService private storageService: IStorageService,
 		@IEnvironmentService private environmentService: IEnvironmentService
 	) {
-		this.model = model;
+		super('workbench.files.action.resolveConflict', nls.localize('compareChanges', "Compare"));
+	}
 
-		const resource = model.getResource();
-		if (message) {
-			this.message = message;
-		} else {
-			this.message = nls.localize('staleSaveError', "Failed to save '{0}': The content on disk is newer. Click on **Compare** to compare your version with the one on disk.", paths.basename(resource.fsPath));
-		}
+	public run(): TPromise<any> {
+		if (!this.model.isDisposed()) {
+			const resource = this.model.getResource();
+			const name = paths.basename(resource.fsPath);
+			const editorLabel = nls.localize('saveConflictDiffLabel', "{0} (on disk) ↔ {1} (in {2}) - Resolve save conflict", name, name, this.environmentService.appNameLong);
 
-		this.actions = [
-			new Action('workbench.files.action.resolveConflict', nls.localize('compareChanges', "Compare"), null, true, () => {
-				if (!this.model.isDisposed()) {
-					const name = paths.basename(resource.fsPath);
-					const editorLabel = nls.localize('saveConflictDiffLabel', "{0} (on disk) ↔ {1} (in {2}) - Resolve save conflict", name, name, this.environmentService.appNameLong);
-
-					return this.editorService.openEditor({ leftResource: URI.from({ scheme: CONFLICT_RESOLUTION_SCHEME, path: resource.fsPath }), rightResource: resource, label: editorLabel, options: { pinned: true } }).then(() => {
-
-						// Inform user
-						pendingResolveSaveConflictMessages.push(this.messageService.show(Severity.Info, conflictEditorHelp));
-					});
+			return this.editorService.openEditor(
+				{
+					leftResource: URI.from({ scheme: CONFLICT_RESOLUTION_SCHEME, path: resource.fsPath }),
+					rightResource: resource,
+					label: editorLabel,
+					options: { pinned: true }
+				}
+			).then(() => {
+				if (this.storageService.getBoolean(LEARN_MORE_DIRTY_WRITE_IGNORE_KEY)) {
+					return; // return if this message is ignored
 				}
 
-				return TPromise.as(true);
-			})
-		];
+				// Show additional help how to resolve the save conflict
+				const actions: INotificationActions = { primary: [], secondary: [] };
+				actions.primary.push(this.instantiationService.createInstance(ResolveConflictLearnMoreAction));
+				actions.secondary.push(this.instantiationService.createInstance(DoNotShowResolveConflictLearnMoreAction));
+
+				const handle = this.notificationService.notify({ severity: Severity.Info, message: conflictEditorHelp, actions });
+				pendingResolveSaveConflictMessages.push(handle);
+			});
+		}
+
+		return TPromise.as(true);
+	}
+}
+
+class SaveElevatedAction extends Action {
+
+	constructor(
+		private model: ITextFileEditorModel,
+		private triedToMakeWriteable: boolean
+	) {
+		super('workbench.files.action.saveElevated', triedToMakeWriteable ? nls.localize('overwriteElevated', "Overwrite as Admin...") : nls.localize('saveElevated', "Retry as Admin..."));
+	}
+
+	public run(): TPromise<any> {
+		if (!this.model.isDisposed()) {
+			this.model.save({
+				writeElevated: true,
+				overwriteReadonly: this.triedToMakeWriteable
+			}).done(null, errors.onUnexpectedError);
+		}
+
+		return TPromise.as(true);
+	}
+}
+
+class OverwriteReadonlyAction extends Action {
+
+	constructor(
+		private model: ITextFileEditorModel
+	) {
+		super('workbench.files.action.overwrite', nls.localize('overwrite', "Overwrite"));
+	}
+
+	public run(): TPromise<any> {
+		if (!this.model.isDisposed()) {
+			this.model.save({ overwriteReadonly: true }).done(null, errors.onUnexpectedError);
+		}
+
+		return TPromise.as(true);
 	}
 }
 
diff --git a/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts b/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts
index 8a89c8f3511..88a6e367512 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts
@@ -25,7 +25,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 
 export class EmptyView extends ViewsViewletPanel {
 
-	public static ID: string = 'workbench.explorer.emptyView';
+	public static readonly ID: string = 'workbench.explorer.emptyView';
 	public static readonly NAME = nls.localize('noWorkspace', "No Folder Opened");
 
 	private button: Button;
diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.ts
index 38b6e7d6f3e..c60da660e48 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.ts
@@ -31,7 +31,7 @@ export class ExplorerDecorationsProvider implements IDecorationsProvider {
 	}
 
 	provideDecorations(resource: URI): IDecorationData {
-		const fileStat = this.model.roots.filter(r => r.resource.toString() === resource.toString()).pop();
+		const fileStat = this.model.findClosest(resource);
 		if (fileStat && fileStat.nonexistentRoot) {
 			return {
 				tooltip: localize('canNotResolve', "Can not resolve workspace folder"),
@@ -39,6 +39,12 @@ export class ExplorerDecorationsProvider implements IDecorationsProvider {
 				color: listInvalidItemForeground,
 			};
 		}
+		if (fileStat && fileStat.isSymbolicLink) {
+			return {
+				tooltip: localize('symbolicLlink', "Symbolic Link"),
+				letter: '\u2937'
+			};
+		}
 
 		return undefined;
 	}
diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
index 4c1612cbf09..86fb50aebd0 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
@@ -35,7 +35,6 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { ResourceContextKey } from 'vs/workbench/common/resources';
 import { ResourceGlobMatcher } from 'vs/workbench/electron-browser/resources';
@@ -44,6 +43,7 @@ import { IDecorationsService } from 'vs/workbench/services/decorations/browser/d
 import { WorkbenchTree } from 'vs/platform/list/browser/listService';
 import { DelayedDragHandler } from 'vs/base/browser/dnd';
 import { Schemas } from 'vs/base/common/network';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export interface IExplorerViewOptions extends IViewletViewOptions {
 	viewletState: FileViewletState;
@@ -51,7 +51,7 @@ export interface IExplorerViewOptions extends IViewletViewOptions {
 
 export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView {
 
-	public static ID: string = 'workbench.explorer.fileView';
+	public static readonly ID: string = 'workbench.explorer.fileView';
 	private static readonly EXPLORER_FILE_CHANGES_REACT_DELAY = 500; // delay in ms to react to file changes to give our internal events a chance to react first
 	private static readonly EXPLORER_FILE_CHANGES_REFRESH_DELAY = 100; // delay in ms to refresh the explorer from disk file changes
 
@@ -82,7 +82,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 
 	constructor(
 		options: IExplorerViewOptions,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IEditorGroupService private editorGroupService: IEditorGroupService,
@@ -928,7 +928,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 			// Select and Reveal
 			return this.explorerViewer.refresh(root).then(() => this.doSelect(root.find(resource), reveal));
 
-		}, e => { this.messageService.show(Severity.Error, e); });
+		}, e => { this.notificationService.error(e); });
 	}
 
 	private hasSingleSelection(resource: URI): FileStat {
diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
index 55174406507..e4d632d5b27 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
@@ -16,7 +16,7 @@ import resources = require('vs/base/common/resources');
 import errors = require('vs/base/common/errors');
 import { IAction, ActionRunner as BaseActionRunner, IActionRunner } from 'vs/base/common/actions';
 import comparers = require('vs/base/common/comparers');
-import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
+import { InputBox, MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
 import { isMacintosh, isLinux } from 'vs/base/common/platform';
 import glob = require('vs/base/common/glob');
 import { FileLabel, IFileLabelOptions } from 'vs/workbench/browser/labels';
@@ -38,7 +38,6 @@ import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configur
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IContextViewService, IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IMessageService, IConfirmation, Severity, IConfirmationResult, getConfirmMessage } from 'vs/platform/message/common/message';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { KeyCode } from 'vs/base/common/keyCodes';
@@ -57,11 +56,15 @@ import { WorkbenchTree, WorkbenchTreeController } from 'vs/platform/list/browser
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { DataTransfers } from 'vs/base/browser/dnd';
 import { Schemas } from 'vs/base/common/network';
+import { IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
+import { IConfirmationService, IConfirmationResult, IConfirmation } from 'vs/platform/dialogs/common/dialogs';
+import { getConfirmMessage } from 'vs/workbench/services/dialogs/electron-browser/dialogs';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class FileDataSource implements IDataSource {
 	constructor(
 		@IProgressService private progressService: IProgressService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IFileService private fileService: IFileService,
 		@IPartService private partService: IPartService
 	) { }
@@ -106,7 +109,7 @@ export class FileDataSource implements IDataSource {
 
 				return stat.children;
 			}, (e: any) => {
-				this.messageService.show(Severity.Error, e);
+				this.notificationService.error(e);
 
 				return []; // we could not resolve any children because of an error
 			});
@@ -195,7 +198,9 @@ export class FileRenderer implements IRenderer {
 		@IContextViewService private contextViewService: IContextViewService,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IThemeService private themeService: IThemeService,
-		@IConfigurationService private configurationService: IConfigurationService
+		@IConfigurationService private configurationService: IConfigurationService,
+		@IWorkspaceContextService private contextService: IWorkspaceContextService
+
 	) {
 		this.state = state;
 		this.config = this.configurationService.getValue<IFilesConfiguration>();
@@ -307,6 +312,14 @@ export class FileRenderer implements IRenderer {
 					done(false, false);
 				}
 			}),
+			DOM.addStandardDisposableListener(inputBox.inputElement, DOM.EventType.KEY_UP, (e: IKeyboardEvent) => {
+				const initialRelPath: string = relative(stat.root.resource.fsPath, stat.parent.resource.fsPath);
+				let projectFolderName: string = '';
+				if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
+					projectFolderName = paths.basename(stat.root.resource.fsPath);	// show root folder name in multi-folder project
+				}
+				this.displayCurrentPath(inputBox, initialRelPath, fileKind, projectFolderName);
+			}),
 			DOM.addDisposableListener(inputBox.inputElement, DOM.EventType.BLUR, () => {
 				done(inputBox.isInputValid(), true);
 			}),
@@ -314,6 +327,23 @@ export class FileRenderer implements IRenderer {
 			styler
 		];
 	}
+
+	private displayCurrentPath(inputBox: InputBox, initialRelPath: string, fileKind: FileKind, projectFolderName?: string) {
+		if (inputBox.validate()) {
+			const value = inputBox.value;
+			if (value && value.search(/[\\/]/) !== -1) {	// only show if there's a slash
+
+				const newPath = paths.normalize(paths.join(projectFolderName, initialRelPath, value), true);
+				const fileType: string = FileKind[fileKind].toLowerCase();
+
+				inputBox.showMessage({
+					type: MessageType.INFO,
+					content: nls.localize('constructedPath', "Create {0} in **{1}**", fileType, newPath),
+					formatContent: true
+				});
+			}
+		}
+	}
 }
 
 // Explorer Accessibility Provider
@@ -682,7 +712,8 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 	private dropEnabled: boolean;
 
 	constructor(
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
+		@IConfirmationService private confirmationService: IConfirmationService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IFileService private fileService: IFileService,
 		@IConfigurationService private configurationService: IConfigurationService,
@@ -782,8 +813,8 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 					return true; // NewStatPlaceholders can not be moved
 				}
 
-				if (source.isRoot) {
-					return true; // Root folder can not be moved
+				if (source.isRoot && (sources.length > 1 || target instanceof FileStat && !target.isRoot)) {
+					return true; // Root folder can not be moved to a non root file stat. Do not allow root folder move when multi selection drag.
 				}
 
 				if (source.resource.toString() === target.resource.toString()) {
@@ -857,7 +888,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 				// If we are in no-workspace context, ask for confirmation to create a workspace
 				let confirmedPromise = TPromise.wrap(true);
 				if (this.contextService.getWorkbenchState() !== WorkbenchState.WORKSPACE) {
-					confirmedPromise = this.messageService.confirm({
+					confirmedPromise = this.confirmationService.confirm({
 						message: folders.length > 1 ? nls.localize('dropFolders', "Do you want to add the folders to the workspace?") : nls.localize('dropFolder', "Do you want to add the folder to the workspace?"),
 						type: 'question',
 						primaryButton: folders.length > 1 ? nls.localize('addFolders', "&&Add Folders") : nls.localize('addFolder', "&&Add Folder")
@@ -893,7 +924,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 		// Handle confirm setting
 		const confirmDragAndDrop = !isCopy && this.configurationService.getValue<boolean>(FileDragAndDrop.CONFIRM_DND_SETTING_KEY);
 		if (confirmDragAndDrop) {
-			confirmPromise = this.messageService.confirmWithCheckbox({
+			confirmPromise = this.confirmationService.confirmWithCheckbox({
 				message: sources.length > 1 ? getConfirmMessage(nls.localize('confirmMultiMove', "Are you sure you want to move the following {0} files?", sources.length), sources.map(s => s.resource))
 					: nls.localize('confirmMove', "Are you sure you want to move '{0}'?", sources[0].name),
 				checkbox: {
@@ -916,7 +947,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 
 			return updateConfirmSettingsPromise.then(() => {
 				if (confirmation.confirmed) {
-					return TPromise.join(sources.map(source => this.doHandleExplorerDrop(tree, data, source, target, isCopy))).then(() => void 0);
+					return TPromise.join(sources.map(source => this.doHandleExplorerDrop(tree, source, target, isCopy))).then(() => void 0);
 				}
 
 				return TPromise.as(void 0);
@@ -924,8 +955,37 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 		});
 	}
 
-	private doHandleExplorerDrop(tree: ITree, data: IDragAndDropData, source: FileStat, target: FileStat, isCopy: boolean): TPromise<void> {
+	private doHandleExplorerDrop(tree: ITree, source: FileStat, target: FileStat, isCopy: boolean): TPromise<void> {
 		return tree.expand(target).then(() => {
+			if (source.isRoot) {
+				const folders = this.contextService.getWorkspace().folders;
+				let sourceIndex: number;
+				let targetIndex: number;
+				const workspaceCreationData: IWorkspaceFolderCreationData[] = [];
+
+				for (let index = 0; index < folders.length; index++) {
+					if (folders[index].uri.toString() === source.resource.toString()) {
+						sourceIndex = index;
+					}
+					if (folders[index].uri.toString() === target.resource.toString()) {
+						targetIndex = index;
+					}
+					workspaceCreationData.push({
+						name: folders[index].name,
+						uri: folders[index].uri
+					});
+
+					if (sourceIndex && targetIndex) {
+						break;
+					}
+				}
+
+				const swap = workspaceCreationData[sourceIndex];
+				workspaceCreationData[sourceIndex] = workspaceCreationData[targetIndex];
+				workspaceCreationData[targetIndex] = swap;
+
+				return this.workspaceEditingService.updateFolders(Math.min(sourceIndex, targetIndex), workspaceCreationData.length, workspaceCreationData);
+			}
 
 			// Reuse duplicate action if user copies
 			if (isCopy) {
@@ -939,7 +999,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 			const onSuccess = () => TPromise.join(dirtyMoved.map(t => this.textFileService.models.loadOrCreate(t)));
 			const onError = (error?: Error, showError?: boolean) => {
 				if (showError) {
-					this.messageService.show(Severity.Error, error);
+					this.notificationService.error(error);
 				}
 
 				return TPromise.join(dirtyMoved.map(d => this.backupFileService.discardResourceBackup(d)));
@@ -986,7 +1046,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 							};
 
 							// Move with overwrite if the user confirms
-							return this.messageService.confirm(confirm).then(confirmed => {
+							return this.confirmationService.confirm(confirm).then(confirmed => {
 								if (confirmed) {
 									const targetDirty = this.textFileService.getDirty().filter(d => resources.isEqualOrParent(d, targetResource, !isLinux /* ignorecase */));
 
diff --git a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts
index 545a0d341a2..86978daa821 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts
@@ -396,7 +396,7 @@ export class OpenEditorsView extends ViewsViewletPanel {
 	}
 
 	private computeMinExpandedBodySize(visibleOpenEditors = OpenEditorsView.DEFAULT_VISIBLE_OPEN_EDITORS): number {
-		const itemsToShow = Math.min(Math.max(visibleOpenEditors, 0), this.elementCount);
+		const itemsToShow = Math.min(Math.max(visibleOpenEditors, 1), this.elementCount);
 		return itemsToShow * OpenEditorsDelegate.ITEM_HEIGHT;
 	}
 
diff --git a/src/vs/workbench/parts/files/test/electron-browser/explorerModel.test.ts b/src/vs/workbench/parts/files/test/electron-browser/explorerModel.test.ts
index 9bf052609fd..00a980ba42e 100644
--- a/src/vs/workbench/parts/files/test/electron-browser/explorerModel.test.ts
+++ b/src/vs/workbench/parts/files/test/electron-browser/explorerModel.test.ts
@@ -14,7 +14,7 @@ import { validateFileName } from 'vs/workbench/parts/files/electron-browser/file
 import { FileStat } from 'vs/workbench/parts/files/common/explorerModel';
 
 function createStat(path: string, name: string, isFolder: boolean, hasChildren: boolean, size: number, mtime: number): FileStat {
-	return new FileStat(toResource(path), undefined, isFolder, name, mtime);
+	return new FileStat(toResource(path), undefined, false, isFolder, name, mtime);
 }
 
 function toResource(path) {
@@ -194,8 +194,12 @@ suite('Files - View Model', () => {
 		assert(validateFileName(s, '') !== null);
 		assert(validateFileName(s, '  ') !== null);
 		assert(validateFileName(s, 'Read Me') === null, 'name containing space');
-		assert(validateFileName(s, 'foo/bar') !== null);
-		assert(validateFileName(s, 'foo\\bar') !== null);
+		assert(validateFileName(s, 'foo/bar') === null);
+		assert(validateFileName(s, 'foo\\bar') === null);
+		assert(validateFileName(s, 'all/slashes/are/same') === null);
+		assert(validateFileName(s, 'theres/one/different\\slash') === null);
+		assert(validateFileName(s, '/slashAtBeginning') === null);
+
 		if (isWindows) {
 			assert(validateFileName(s, 'foo:bar') !== null);
 			assert(validateFileName(s, 'foo*bar') !== null);
@@ -235,20 +239,20 @@ suite('Files - View Model', () => {
 	test('Merge Local with Disk', function () {
 		const d = new Date().toUTCString();
 
-		const merge1 = new FileStat(URI.file(join('C:\\', '/path/to')), undefined, true, 'to', Date.now(), d);
-		const merge2 = new FileStat(URI.file(join('C:\\', '/path/to')), undefined, true, 'to', Date.now(), new Date(0).toUTCString());
+		const merge1 = new FileStat(URI.file(join('C:\\', '/path/to')), undefined, false, true, 'to', Date.now(), d);
+		const merge2 = new FileStat(URI.file(join('C:\\', '/path/to')), undefined, false, true, 'to', Date.now(), new Date(0).toUTCString());
 
 		// Merge Properties
 		FileStat.mergeLocalWithDisk(merge2, merge1);
 		assert.strictEqual(merge1.mtime, merge2.mtime);
 
 		// Merge Child when isDirectoryResolved=false is a no-op
-		merge2.addChild(new FileStat(URI.file(join('C:\\', '/path/to/foo.html')), undefined, true, 'foo.html', Date.now(), d));
+		merge2.addChild(new FileStat(URI.file(join('C:\\', '/path/to/foo.html')), undefined, false, true, 'foo.html', Date.now(), d));
 		FileStat.mergeLocalWithDisk(merge2, merge1);
 		assert.strictEqual(merge1.children.length, 0);
 
 		// Merge Child with isDirectoryResolved=true
-		const child = new FileStat(URI.file(join('C:\\', '/path/to/foo.html')), undefined, true, 'foo.html', Date.now(), d);
+		const child = new FileStat(URI.file(join('C:\\', '/path/to/foo.html')), undefined, false, true, 'foo.html', Date.now(), d);
 		merge2.removeChild(child);
 		merge2.addChild(child);
 		merge2.isDirectoryResolved = true;
@@ -262,4 +266,4 @@ suite('Files - View Model', () => {
 		FileStat.mergeLocalWithDisk(merge2, merge1);
 		assert.ok(existingChild === merge1.children[0]);
 	});
-});
\ No newline at end of file
+});
diff --git a/src/vs/workbench/parts/html/browser/html.contribution.ts b/src/vs/workbench/parts/html/browser/html.contribution.ts
index cebedb5d247..6316766624e 100644
--- a/src/vs/workbench/parts/html/browser/html.contribution.ts
+++ b/src/vs/workbench/parts/html/browser/html.contribution.ts
@@ -20,6 +20,8 @@ import { MenuRegistry } from 'vs/platform/actions/common/actions';
 import { IExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/common/extensions';
 import { IEditorRegistry, EditorDescriptor, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
 
+import './webview.contribution';
+
 function getActivePreviewsForResource(accessor: ServicesAccessor, resource: URI | string) {
 	const uri = resource instanceof URI ? resource : URI.parse(resource);
 	return accessor.get(IWorkbenchEditorService).getVisibleEditors()
@@ -92,27 +94,6 @@ CommandsRegistry.registerCommand('_workbench.htmlPreview.postMessage', function
 	return activePreviews.length > 0;
 });
 
-CommandsRegistry.registerCommand('_workbench.htmlPreview.updateOptions', function (
-	accessor: ServicesAccessor,
-	resource: URI | string,
-	options: HtmlInputOptions
-) {
-
-	const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
-	const inputOptions: HtmlInputOptions = options;
-	const allowedBadgeProviders = extensionsWorkbenchService.allowedBadgeProviders;
-	inputOptions.svgWhiteList = allowedBadgeProviders;
-
-	const uri = resource instanceof URI ? resource : URI.parse(resource);
-	const activePreviews = getActivePreviewsForResource(accessor, resource);
-	for (const preview of activePreviews) {
-		if (preview.input && preview.input instanceof HtmlInput) {
-			const input = accessor.get(IInstantiationService).createInstance(HtmlInput, preview.input.getName(), '', uri, options);
-			preview.setInput(input);
-		}
-	}
-});
-
 CommandsRegistry.registerCommand('_webview.openDevTools', function () {
 	const elements = document.querySelectorAll('webview.ready');
 	for (let i = 0; i < elements.length; i++) {
diff --git a/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts b/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts
index edee199e773..60894b14c39 100644
--- a/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts
+++ b/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts
@@ -22,10 +22,11 @@ import { Parts, IPartService } from 'vs/workbench/services/part/common/partServi
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
-import Webview, { WebviewOptions } from './webview';
+import { Webview, WebviewOptions } from './webview';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { WebviewEditor } from './webviewEditor';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 
 
 /**
@@ -33,7 +34,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
  */
 export class HtmlPreviewPart extends WebviewEditor {
 
-	static ID: string = 'workbench.editor.htmlPreviewPart';
+	static readonly ID: string = 'workbench.editor.htmlPreviewPart';
 	static class: string = 'htmlPreviewPart';
 
 	private _webviewDisposables: IDisposable[];
@@ -54,7 +55,8 @@ export class HtmlPreviewPart extends WebviewEditor {
 		@IOpenerService private readonly openerService: IOpenerService,
 		@IPartService private readonly partService: IPartService,
 		@IContextViewService private readonly _contextViewService: IContextViewService,
-		@IEnvironmentService private readonly _environmentService: IEnvironmentService
+		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
+		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService
 	) {
 		super(HtmlPreviewPart.ID, telemetryService, themeService, storageService, contextKeyService);
 	}
@@ -86,7 +88,17 @@ export class HtmlPreviewPart extends WebviewEditor {
 				webviewOptions = this.input.options;
 			}
 
-			this._webview = new Webview(this.content, this.partService.getContainer(Parts.EDITOR_PART), this._environmentService, this._contextViewService, this.contextKey, this.findInputFocusContextKey, webviewOptions, true);
+			this._webview = new Webview(
+				this.content,
+				this.partService.getContainer(Parts.EDITOR_PART),
+				this._environmentService,
+				this._contextService,
+				this._contextViewService,
+				this.contextKey,
+				this.findInputFocusContextKey,
+				webviewOptions,
+				true);
+
 			if (this.input && this.input instanceof HtmlInput) {
 				const state = this.loadViewState(this.input.getResource());
 				this.scrollYPercentage = state ? state.scrollYPercentage : 0;
@@ -131,8 +143,8 @@ export class HtmlPreviewPart extends WebviewEditor {
 			this._themeChangeSubscription = this.themeService.onThemeChange(this.onThemeChange.bind(this));
 
 			if (this._hasValidModel()) {
-				this._modelChangeSubscription = this.model.onDidChangeContent(() => this.webview.contents = this.model.getLinesContent());
-				this.webview.contents = this.model.getLinesContent();
+				this._modelChangeSubscription = this.model.onDidChangeContent(() => this.webview.contents = this.model.getLinesContent().join('\n'));
+				this.webview.contents = this.model.getLinesContent().join('\n');
 			}
 		}
 	}
@@ -222,14 +234,14 @@ export class HtmlPreviewPart extends WebviewEditor {
 				this._modelChangeSubscription = this.model.onDidChangeContent(() => {
 					if (this.model) {
 						this.scrollYPercentage = 0;
-						this.webview.contents = this.model.getLinesContent();
+						this.webview.contents = this.model.getLinesContent().join('\n');
 					}
 				});
 				const state = this.loadViewState(resourceUri);
 				this.scrollYPercentage = state ? state.scrollYPercentage : 0;
 				this.webview.baseUrl = resourceUri.toString(true);
 				this.webview.options = input.options;
-				this.webview.contents = this.model.getLinesContent();
+				this.webview.contents = this.model.getLinesContent().join('\n');
 				this.webview.initialScrollProgress = this.scrollYPercentage;
 				return undefined;
 			});
diff --git a/src/vs/workbench/parts/html/browser/webview-pre.js b/src/vs/workbench/parts/html/browser/webview-pre.js
index 17c09cdc32f..5331fa75e39 100644
--- a/src/vs/workbench/parts/html/browser/webview-pre.js
+++ b/src/vs/workbench/parts/html/browser/webview-pre.js
@@ -12,6 +12,7 @@
 	var firstLoad = true;
 	var loadTimeout;
 	var pendingMessages = [];
+	var enableWrappedPostMessage = false;
 
 	const initData = {
 		initialScrollProgress: undefined
@@ -125,7 +126,9 @@
 		// update iframe-contents
 		ipcRenderer.on('content', function (_event, data) {
 			const options = data.options;
-			const text = data.contents.join('\n');
+			enableWrappedPostMessage = options && options.enableWrappedPostMessage;
+
+			const text = data.contents;
 			const newDocument = new DOMParser().parseFromString(text, 'text/html');
 
 			newDocument.querySelectorAll('a').forEach(a => {
@@ -145,7 +148,7 @@
 			const defaultStyles = newDocument.createElement('style');
 			defaultStyles.id = '_defaultStyles';
 
-			const vars = Object.keys(initData.styles).map(function (variable) {
+			const vars = Object.keys(initData.styles || {}).map(function (variable) {
 				return `--${variable}: ${initData.styles[variable]};`;
 			});
 			defaultStyles.innerHTML = `
@@ -181,14 +184,35 @@
 				width: 10px;
 				height: 10px;
 			}
+
 			::-webkit-scrollbar-thumb {
-				background-color: var(--scrollbar-thumb);
+				background-color: rgba(121, 121, 121, 0.4);
 			}
+			body.vscode-light::-webkit-scrollbar-thumb {
+				background-color: rgba(100, 100, 100, 0.4);
+			}
+			body.vscode-high-contrast::-webkit-scrollbar-thumb {
+				background-color: rgba(111, 195, 223, 0.3);
+			}
+
 			::-webkit-scrollbar-thumb:hover {
-				background-color: var(--scrollbar-thumb-hover);
+				background-color: rgba(100, 100, 100, 0.7);
 			}
+			body.vscode-light::-webkit-scrollbar-thumb:hover {
+				background-color: rgba(100, 100, 100, 0.7);
+			}
+			body.vscode-high-contrast::-webkit-scrollbar-thumb:hover {
+				background-color: rgba(111, 195, 223, 0.8);
+			}
+
 			::-webkit-scrollbar-thumb:active {
-				background-color: var(--scrollbar-thumb-active);
+				background-color: rgba(85, 85, 85, 0.8);
+			}
+			body.vscode-light::-webkit-scrollbar-thumb:active {
+				background-color: rgba(0, 0, 0, 0.6);
+			}
+			body.vscode-high-contrast::-webkit-scrollbar-thumb:active {
+				background-color: rgba(111, 195, 223, 0.8);
 			}
 			`;
 			if (newDocument.head.hasChildNodes()) {
@@ -312,9 +336,15 @@
 			initData.initialScrollProgress = progress;
 		});
 
-		// forward messages from the embedded iframe
+		// Forward messages from the embedded iframe
 		window.onmessage = function (message) {
-			ipcRenderer.sendToHost(message.data.command, message.data.data);
+			if (enableWrappedPostMessage) {
+				// Modern webview. Forward wrapped message
+				ipcRenderer.sendToHost('onmessage', message.data);
+			} else {
+				// Old school webview. Forward exact message
+				ipcRenderer.sendToHost(message.data.command, message.data.data);
+			}
 		};
 
 		// signal ready
diff --git a/src/vs/workbench/parts/html/browser/webview.contribution.ts b/src/vs/workbench/parts/html/browser/webview.contribution.ts
new file mode 100644
index 00000000000..a1a41b33605
--- /dev/null
+++ b/src/vs/workbench/parts/html/browser/webview.contribution.ts
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
+import { ContextKeyExpr, } from 'vs/platform/contextkey/common/contextkey';
+import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+
+import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
+import { KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from './webviewEditor';
+import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { ShowWebViewEditorFindWidgetAction, ShowWebViewEditorFindTermCommand, HideWebViewEditorFindCommand } from './webviewCommands';
+
+
+const category = 'Webview';
+const actionRegistry = <IWorkbenchActionRegistry>Registry.as(ActionExtensions.WorkbenchActions);
+
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ShowWebViewEditorFindWidgetAction, ShowWebViewEditorFindWidgetAction.ID, ShowWebViewEditorFindWidgetAction.LABEL, {
+	primary: KeyMod.CtrlCmd | KeyCode.KEY_F
+}, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS),
+	'Webview: Focus Find Widget', category);
+
+
+const showNextFindTermCommand = new ShowWebViewEditorFindTermCommand({
+	id: 'editor.action.webvieweditor.showNextFindTerm',
+	precondition: KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED,
+	kbOpts: {
+		primary: KeyMod.Alt | KeyCode.DownArrow
+	}
+}, true);
+KeybindingsRegistry.registerCommandAndKeybindingRule(showNextFindTermCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
+
+const showPreviousFindTermCommand = new ShowWebViewEditorFindTermCommand({
+	id: 'editor.action.webvieweditor.showPreviousFindTerm',
+	precondition: KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED,
+	kbOpts: {
+		primary: KeyMod.Alt | KeyCode.UpArrow
+	}
+}, false);
+KeybindingsRegistry.registerCommandAndKeybindingRule(showPreviousFindTermCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
+
+
+const hideCommand = new HideWebViewEditorFindCommand({
+	id: 'editor.action.webvieweditor.hideFind',
+	precondition: ContextKeyExpr.and(
+		KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS,
+		KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE),
+	kbOpts: {
+		primary: KeyCode.Escape
+	}
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule(hideCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
diff --git a/src/vs/workbench/parts/html/browser/webview.ts b/src/vs/workbench/parts/html/browser/webview.ts
index 4010801932e..65c4376fc92 100644
--- a/src/vs/workbench/parts/html/browser/webview.ts
+++ b/src/vs/workbench/parts/html/browser/webview.ts
@@ -17,38 +17,19 @@ import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { normalize, nativeSep } from 'vs/base/common/paths';
 import { startsWith } from 'vs/base/common/strings';
-
-export interface WebviewElementFindInPageOptions {
-	forward?: boolean;
-	findNext?: boolean;
-	matchCase?: boolean;
-	wordStart?: boolean;
-	medialCapitalAsWordStart?: boolean;
-}
-
-export interface FoundInPageResults {
-	requestId: number;
-	activeMatchOrdinal: number;
-	matches: number;
-	selectionArea: any;
-}
-
-type ApiThemeClassName = 'vscode-light' | 'vscode-dark' | 'vscode-high-contrast';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 
 export interface WebviewOptions {
-	allowScripts?: boolean;
-	allowSvgs?: boolean;
-	svgWhiteList?: string[];
+	readonly allowScripts?: boolean;
+	readonly allowSvgs?: boolean;
+	readonly svgWhiteList?: string[];
+	readonly enableWrappedPostMessage?: boolean;
 }
 
-export default class Webview {
+export class Webview {
 	private readonly _webview: Electron.WebviewTag;
 	private _ready: Promise<this>;
 	private _disposables: IDisposable[] = [];
-	private _onDidClickLink = new Emitter<URI>();
-
-	private _onDidScroll = new Emitter<{ scrollYPercentage: number }>();
-	private _onFoundInPageResults = new Emitter<FoundInPageResults>();
 
 	private _webviewFindWidget: WebviewFindWidget;
 	private _findStarted: boolean = false;
@@ -57,6 +38,7 @@ export default class Webview {
 		private readonly parent: HTMLElement,
 		private readonly _styleElement: Element,
 		private readonly _environmentService: IEnvironmentService,
+		private readonly _contextService: IWorkspaceContextService,
 		private readonly _contextViewService: IContextViewService,
 		private readonly _contextKey: IContextKey<boolean>,
 		private readonly _findInputContextKey: IContextKey<boolean>,
@@ -101,9 +83,8 @@ export default class Webview {
 				loaded = true;
 
 				const contents = this._webview.getWebContents();
-				if (contents && !contents.isDestroyed()) {
-					registerFileProtocol(contents, 'vscode-core-resource', [this._environmentService.appRoot]);
-				}
+				this.registerFileProtocols(contents);
+
 			}));
 		}
 
@@ -157,6 +138,12 @@ export default class Webview {
 			}),
 			addDisposableListener(this._webview, 'ipc-message', (event) => {
 				switch (event.channel) {
+					case 'onmessage':
+						if (this._options.enableWrappedPostMessage && event.args && event.args.length) {
+							this._onMessage.fire(event.args[0]);
+						}
+						return;
+
 					case 'did-click-link':
 						let [uri] = event.args;
 						this._onDidClickLink.fire(URI.parse(uri));
@@ -180,11 +167,13 @@ export default class Webview {
 				if (this._contextKey) {
 					this._contextKey.set(true);
 				}
+				this._onFocus.fire();
 			}),
 			addDisposableListener(this._webview, 'blur', () => {
 				if (this._contextKey) {
 					this._contextKey.reset();
 				}
+				this._onBlur.fire();
 			}),
 			addDisposableListener(this._webview, 'found-in-page', (event) => {
 				this._onFoundInPageResults.fire(event.result);
@@ -223,17 +212,23 @@ export default class Webview {
 		}
 	}
 
-	get onDidClickLink(): Event<URI> {
-		return this._onDidClickLink.event;
-	}
+	private readonly _onDidClickLink = new Emitter<URI>();
+	public readonly onDidClickLink: Event<URI> = this._onDidClickLink.event;
 
-	get onDidScroll(): Event<{ scrollYPercentage: number }> {
-		return this._onDidScroll.event;
-	}
+	private readonly _onDidScroll = new Emitter<{ scrollYPercentage: number }>();
+	public readonly onDidScroll: Event<{ scrollYPercentage: number }> = this._onDidScroll.event;
 
-	get onFindResults(): Event<FoundInPageResults> {
-		return this._onFoundInPageResults.event;
-	}
+	private readonly _onFoundInPageResults = new Emitter<Electron.FoundInPageResult>();
+	public readonly onFindResults: Event<Electron.FoundInPageResult> = this._onFoundInPageResults.event;
+
+	private readonly _onMessage = new Emitter<any>();
+	public readonly onMessage: Event<any> = this._onMessage.event;
+
+	private readonly _onFocus = new Emitter<void>();
+	public readonly onFocus: Event<void> = this._onFocus.event;
+
+	private readonly _onBlur = new Emitter<void>();
+	public readonly onBlur: Event<void> = this._onBlur.event;
 
 	private _send(channel: string, ...args: any[]): void {
 		this._ready
@@ -249,7 +244,7 @@ export default class Webview {
 		this._options = value;
 	}
 
-	set contents(value: string[]) {
+	set contents(value: string) {
 		this._send('content', {
 			contents: value,
 			options: this._options
@@ -287,24 +282,7 @@ export default class Webview {
 			'link-color': theme.getColor(textLinkForeground).toString()
 		};
 
-		let activeTheme: ApiThemeClassName;
-		if (theme.type === LIGHT) {
-			styles['scrollbar-thumb'] = 'rgba(100, 100, 100, 0.4)';
-			styles['scrollbar-thumb-hover'] = 'rgba(100, 100, 100, 0.7)';
-			styles['scrollbar-thumb-active'] = 'rgba(0, 0, 0, 0.6)';
-			activeTheme = 'vscode-light';
-		} else if (theme.type === DARK) {
-			styles['scrollbar-thumb'] = 'rgba(121, 121, 121, 0.4)';
-			styles['scrollbar-thumb-hover'] = 'rgba(100, 100, 100, 0.7)';
-			styles['scrollbar-thumb-active'] = 'rgba(85, 85, 85, 0.8)';
-			activeTheme = 'vscode-dark';
-		} else {
-			styles['scrollbar-thumb'] = 'rgba(111, 195, 223, 0.3)';
-			styles['scrollbar-thumb-hover'] = 'rgba(111, 195, 223, 0.8)';
-			styles['scrollbar-thumb-active'] = 'rgba(111, 195, 223, 0.8)';
-			activeTheme = 'vscode-high-contrast';
-		}
-
+		const activeTheme = ApiThemeClassName.fromTheme(theme);
 		this._send('styles', styles, activeTheme);
 
 		this._webviewFindWidget.updateTheme(theme);
@@ -347,7 +325,25 @@ export default class Webview {
 		return false;
 	}
 
-	public startFind(value: string, options?: WebviewElementFindInPageOptions) {
+	private registerFileProtocols(contents: Electron.WebContents) {
+		if (!contents || contents.isDestroyed()) {
+			return;
+		}
+
+		registerFileProtocol(contents, 'vscode-core-resource', [
+			this._environmentService.appRoot
+		]);
+		registerFileProtocol(contents, 'vscode-extension-resource', [
+			this._environmentService.extensionsPath,
+			this._environmentService.appRoot,
+			this._environmentService.extensionDevelopmentPath
+		]);
+		registerFileProtocol(contents, 'vscode-workspace-resource',
+			this._contextService.getWorkspace().folders.map(folder => folder.uri.fsPath)
+		);
+	}
+
+	public startFind(value: string, options?: Electron.FindInPageOptions) {
 		if (!value) {
 			return;
 		}
@@ -356,7 +352,7 @@ export default class Webview {
 		options = options || {};
 
 		// FindNext must be false for a first request
-		const findOptions: WebviewElementFindInPageOptions = {
+		const findOptions: Electron.FindInPageOptions = {
 			forward: options.forward,
 			findNext: false,
 			matchCase: options.matchCase,
@@ -373,12 +369,10 @@ export default class Webview {
 	 * Successive calls to find will move forward or backward through onFindResults
 	 * depending on the supplied options.
 	 *
-	 * @param {string} value The string to search for. Empty strings are ignored.
-	 * @param {WebviewElementFindInPageOptions} [options]
-	 *
-	 * @memberOf Webview
+	 * @param value The string to search for. Empty strings are ignored.
+	 * @param options
 	 */
-	public find(value: string, options?: WebviewElementFindInPageOptions): void {
+	public find(value: string, options?: Electron.FindInPageOptions): void {
 		// Searching with an empty value will throw an exception
 		if (!value) {
 			return;
@@ -414,6 +408,25 @@ export default class Webview {
 	}
 }
 
+
+enum ApiThemeClassName {
+	light = 'vscode-light',
+	dark = 'vscode-dark',
+	highContrast = 'vscode-high-contrast'
+}
+
+namespace ApiThemeClassName {
+	export function fromTheme(theme: ITheme): ApiThemeClassName {
+		if (theme.type === LIGHT) {
+			return ApiThemeClassName.light;
+		} else if (theme.type === DARK) {
+			return ApiThemeClassName.dark;
+		} else {
+			return ApiThemeClassName.highContrast;
+		}
+	}
+}
+
 function registerFileProtocol(
 	contents: Electron.WebContents,
 	protocol: string,
@@ -427,6 +440,7 @@ function registerFileProtocol(
 				callback({ path: normalizedPath });
 				return;
 			}
+
 		}
 		callback({ error: 'Cannot load resource outside of protocol root' });
 	}, (error) => {
diff --git a/src/vs/workbench/parts/html/browser/webviewCommands.ts b/src/vs/workbench/parts/html/browser/webviewCommands.ts
new file mode 100644
index 00000000000..01c0ce9a775
--- /dev/null
+++ b/src/vs/workbench/parts/html/browser/webviewCommands.ts
@@ -0,0 +1,84 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as nls from 'vs/nls';
+
+import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { Command, ICommandOptions } from 'vs/editor/browser/editorExtensions';
+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { Action } from 'vs/base/common/actions';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { WebviewEditor } from './webviewEditor';
+
+export class ShowWebViewEditorFindWidgetAction extends Action {
+	public static readonly ID = 'editor.action.webvieweditor.showFind';
+	public static readonly LABEL = nls.localize('editor.action.webvieweditor.showFind', "Focus Find Widget");
+
+	public constructor(
+		id: string,
+		label: string,
+		@IWorkbenchEditorService private workbenchEditorService: IWorkbenchEditorService
+	) {
+		super(id, label);
+	}
+
+	public run(): TPromise<any> {
+		const webViewEditor = this.getWebViewEditor();
+		if (webViewEditor) {
+			webViewEditor.showFind();
+		}
+		return null;
+	}
+
+	private getWebViewEditor(): WebviewEditor {
+		const activeEditor = this.workbenchEditorService.getActiveEditor() as WebviewEditor;
+		if (activeEditor.isWebviewEditor) {
+			return activeEditor;
+		}
+		return null;
+	}
+}
+
+export class HideWebViewEditorFindCommand extends Command {
+	public runCommand(accessor: ServicesAccessor, args: any): void {
+		const webViewEditor = this.getWebViewEditor(accessor);
+		if (webViewEditor) {
+			webViewEditor.hideFind();
+		}
+	}
+
+	private getWebViewEditor(accessor: ServicesAccessor): WebviewEditor {
+		const activeEditor = accessor.get(IWorkbenchEditorService).getActiveEditor() as WebviewEditor;
+		if (activeEditor.isWebviewEditor) {
+			return activeEditor;
+		}
+		return null;
+	}
+}
+
+export class ShowWebViewEditorFindTermCommand extends Command {
+	constructor(opts: ICommandOptions, private _next: boolean) {
+		super(opts);
+	}
+
+	public runCommand(accessor: ServicesAccessor, args: any): void {
+		const webViewEditor = this.getWebViewEditor(accessor);
+		if (webViewEditor) {
+			if (this._next) {
+				webViewEditor.showNextFindTerm();
+			} else {
+				webViewEditor.showPreviousFindTerm();
+			}
+		}
+	}
+
+	private getWebViewEditor(accessor: ServicesAccessor): WebviewEditor {
+		const activeEditor = accessor.get(IWorkbenchEditorService).getActiveEditor() as WebviewEditor;
+		if (activeEditor.isWebviewEditor) {
+			return activeEditor;
+		}
+		return null;
+	}
+}
diff --git a/src/vs/workbench/parts/html/browser/webviewEditor.ts b/src/vs/workbench/parts/html/browser/webviewEditor.ts
index 1b7a5536e61..9021b5f7725 100644
--- a/src/vs/workbench/parts/html/browser/webviewEditor.ts
+++ b/src/vs/workbench/parts/html/browser/webviewEditor.ts
@@ -2,40 +2,23 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
+
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { BaseWebviewEditor } from 'vs/workbench/browser/parts/editor/webviewEditor';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { Command, ICommandOptions } from 'vs/editor/browser/editorExtensions';
-import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { ContextKeyExpr, IContextKey, RawContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { IContextKey, RawContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
-import WebView from './webview';
+import { Webview } from './webview';
 import { Builder } from 'vs/base/browser/builder';
 
-export interface HtmlPreviewEditorViewState {
-	scrollYPercentage: number;
-}
-
 /**  A context key that is set when a webview editor has focus. */
 export const KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS = new RawContextKey<boolean>('webviewEditorFocus', false);
-/**  A context key that is set when a webview editor does not have focus. */
-export const KEYBINDING_CONTEXT_WEBVIEWEDITOR_NOT_FOCUSED: ContextKeyExpr = KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS.toNegated();
 /**  A context key that is set when the find widget find input in webview editor webview is focused. */
 export const KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED = new RawContextKey<boolean>('webviewEditorFindWidgetInputFocused', false);
-/**  A context key that is set when the find widget find input in webview editor webview is not focused. */
-export const KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_NOT_FOCUSED: ContextKeyExpr = KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED.toNegated();
-
 /**  A context key that is set when the find widget in a webview is visible. */
 export const KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE = new RawContextKey<boolean>('webviewFindWidgetVisible', false);
-/**  A context key that is set when the find widget in a webview  is not visible. */
-export const KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_NOT_VISIBLE: ContextKeyExpr = KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE.toNegated();
-
 
 /**
  * This class is only intended to be subclassed and not instantiated.
@@ -43,10 +26,10 @@ export const KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_NOT_VISIBLE: ContextKeyExpr
 export abstract class WebviewEditor extends BaseWebviewEditor {
 
 	protected _webviewFocusContextKey: IContextKey<boolean>;
-	protected _webview: WebView;
+	protected _webview: Webview;
 	protected content: HTMLElement;
 	protected contextKey: IContextKey<boolean>;
-	private findWidgetVisible: IContextKey<boolean>;
+	protected findWidgetVisible: IContextKey<boolean>;
 	protected findInputFocusContextKey: IContextKey<boolean>;
 
 	constructor(
@@ -104,97 +87,3 @@ export abstract class WebviewEditor extends BaseWebviewEditor {
 	protected abstract createEditor(parent: Builder): void;
 }
 
-class ShowWebViewEditorFindCommand extends Command {
-	public runCommand(accessor: ServicesAccessor, args: any): void {
-		const webViewEditor = this.getWebViewEditor(accessor);
-		if (webViewEditor) {
-			webViewEditor.showFind();
-		}
-	}
-
-	private getWebViewEditor(accessor: ServicesAccessor): WebviewEditor {
-		const activeEditor = accessor.get(IWorkbenchEditorService).getActiveEditor() as WebviewEditor;
-		if (activeEditor.isWebviewEditor) {
-			return activeEditor;
-		}
-		return null;
-	}
-}
-const showFindCommand = new ShowWebViewEditorFindCommand({
-	id: 'editor.action.webvieweditor.showFind',
-	precondition: KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS,
-	kbOpts: {
-		primary: KeyMod.CtrlCmd | KeyCode.KEY_F
-	}
-});
-KeybindingsRegistry.registerCommandAndKeybindingRule(showFindCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
-
-class HideWebViewEditorFindCommand extends Command {
-	public runCommand(accessor: ServicesAccessor, args: any): void {
-		const webViewEditor = this.getWebViewEditor(accessor);
-		if (webViewEditor) {
-			webViewEditor.hideFind();
-		}
-	}
-
-	private getWebViewEditor(accessor: ServicesAccessor): WebviewEditor {
-		const activeEditor = accessor.get(IWorkbenchEditorService).getActiveEditor() as WebviewEditor;
-		if (activeEditor.isWebviewEditor) {
-			return activeEditor;
-		}
-		return null;
-	}
-}
-const hideCommand = new HideWebViewEditorFindCommand({
-	id: 'editor.action.webvieweditor.hideFind',
-	precondition: ContextKeyExpr.and(
-		KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS,
-		KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE),
-	kbOpts: {
-		primary: KeyCode.Escape
-	}
-});
-KeybindingsRegistry.registerCommandAndKeybindingRule(hideCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
-
-class ShowWebViewEditorFindTermCommand extends Command {
-	constructor(opts: ICommandOptions, private _next: boolean) {
-		super(opts);
-	}
-
-	public runCommand(accessor: ServicesAccessor, args: any): void {
-		const webViewEditor = this.getWebViewEditor(accessor);
-		if (webViewEditor) {
-			if (this._next) {
-				webViewEditor.showNextFindTerm();
-			} else {
-				webViewEditor.showPreviousFindTerm();
-			}
-		}
-	}
-
-	private getWebViewEditor(accessor: ServicesAccessor): WebviewEditor {
-		const activeEditor = accessor.get(IWorkbenchEditorService).getActiveEditor() as WebviewEditor;
-		if (activeEditor.isWebviewEditor) {
-			return activeEditor;
-		}
-		return null;
-	}
-}
-
-const showNextFindTermCommand = new ShowWebViewEditorFindTermCommand({
-	id: 'editor.action.webvieweditor.showNextFindTerm',
-	precondition: KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED,
-	kbOpts: {
-		primary: KeyMod.Alt | KeyCode.DownArrow
-	}
-}, true);
-KeybindingsRegistry.registerCommandAndKeybindingRule(showNextFindTermCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
-
-const showPreviousFindTermCommand = new ShowWebViewEditorFindTermCommand({
-	id: 'editor.action.webvieweditor.showPreviousFindTerm',
-	precondition: KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED,
-	kbOpts: {
-		primary: KeyMod.Alt | KeyCode.UpArrow
-	}
-}, false);
-KeybindingsRegistry.registerCommandAndKeybindingRule(showPreviousFindTermCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
diff --git a/src/vs/workbench/parts/html/browser/webviewFindWidget.ts b/src/vs/workbench/parts/html/browser/webviewFindWidget.ts
index 28b438e3acf..f304d2f56eb 100644
--- a/src/vs/workbench/parts/html/browser/webviewFindWidget.ts
+++ b/src/vs/workbench/parts/html/browser/webviewFindWidget.ts
@@ -5,24 +5,20 @@
 
 import { SimpleFindWidget } from 'vs/editor/contrib/find/simpleFindWidget';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import Webview from './webview';
+import { Webview } from './webview';
 
 export class WebviewFindWidget extends SimpleFindWidget {
 
 	constructor(
-		@IContextViewService _contextViewService: IContextViewService,
-		private webview: Webview
+		@IContextViewService contextViewService: IContextViewService,
+		private readonly webview: Webview
 	) {
-		super(_contextViewService);
-
-		this.find = this.find.bind(this);
-		this.hide = this.hide.bind(this);
-		this.onInputChanged = this.onInputChanged.bind(this);
+		super(contextViewService);
 	}
 
 	public find(previous: boolean) {
-		let val = this.inputValue;
-		if (this.webview !== null && val) {
+		const val = this.inputValue;
+		if (val) {
 			this.webview.find(val, { findNext: true, forward: !previous });
 		}
 	}
@@ -34,11 +30,7 @@ export class WebviewFindWidget extends SimpleFindWidget {
 	}
 
 	public onInputChanged() {
-		if (!this.webview) {
-			return;
-		}
-
-		let val = this.inputValue;
+		const val = this.inputValue;
 		if (val) {
 			this.webview.startFind(val);
 		} else {
diff --git a/src/vs/workbench/parts/markers/browser/markersFileDecorations.ts b/src/vs/workbench/parts/markers/browser/markersFileDecorations.ts
index 447a5f43abf..e2b8e12034c 100644
--- a/src/vs/workbench/parts/markers/browser/markersFileDecorations.ts
+++ b/src/vs/workbench/parts/markers/browser/markersFileDecorations.ts
@@ -60,9 +60,9 @@ class MarkersFileDecorations implements IWorkbenchContribution {
 	private _enabled: boolean;
 
 	constructor(
-		@IMarkerService private _markerService: IMarkerService,
-		@IDecorationsService private _decorationsService: IDecorationsService,
-		@IConfigurationService private _configurationService: IConfigurationService
+		@IMarkerService private readonly _markerService: IMarkerService,
+		@IDecorationsService private readonly _decorationsService: IDecorationsService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService
 	) {
 		//
 		this._disposables = [
diff --git a/src/vs/workbench/parts/markers/browser/markersPanelActions.ts b/src/vs/workbench/parts/markers/browser/markersPanelActions.ts
index cf62c96da0f..09247771346 100644
--- a/src/vs/workbench/parts/markers/browser/markersPanelActions.ts
+++ b/src/vs/workbench/parts/markers/browser/markersPanelActions.ts
@@ -64,7 +64,7 @@ export class CollapseAllAction extends TreeCollapseAction {
 
 export class FilterAction extends Action {
 
-	public static ID: string = 'workbench.actions.problems.filter';
+	public static readonly ID: string = 'workbench.actions.problems.filter';
 
 	constructor() {
 		super(FilterAction.ID, Messages.MARKERS_PANEL_ACTION_TOOLTIP_FILTER, 'markers-panel-action-filter', true);
diff --git a/src/vs/workbench/parts/markers/browser/markersTreeController.ts b/src/vs/workbench/parts/markers/browser/markersTreeController.ts
index 548b3fb7b6b..8c6d21f3e6a 100644
--- a/src/vs/workbench/parts/markers/browser/markersTreeController.ts
+++ b/src/vs/workbench/parts/markers/browser/markersTreeController.ts
@@ -21,7 +21,7 @@ export class Controller extends WorkbenchTreeController {
 	constructor(
 		@IContextMenuService private contextMenuService: IContextMenuService,
 		@IMenuService private menuService: IMenuService,
-		@IKeybindingService private _keybindingService: IKeybindingService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@IConfigurationService configurationService: IConfigurationService
 	) {
 		super({}, configurationService);
diff --git a/src/vs/workbench/parts/performance/electron-browser/startupProfiler.ts b/src/vs/workbench/parts/performance/electron-browser/startupProfiler.ts
index e8108e6af6c..d6b5d0a7ef8 100644
--- a/src/vs/workbench/parts/performance/electron-browser/startupProfiler.ts
+++ b/src/vs/workbench/parts/performance/electron-browser/startupProfiler.ts
@@ -8,7 +8,6 @@
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IExtensionService } from 'vs/platform/extensions/common/extensions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { IWindowsService } from 'vs/platform/windows/common/windows';
 import { IWorkbenchContributionsRegistry, IWorkbenchContribution, Extensions } from 'vs/workbench/common/contributions';
@@ -19,12 +18,13 @@ import { join, dirname } from 'path';
 import { localize } from 'vs/nls';
 import { readdir, del, readFile } from 'vs/base/node/pfs';
 import { basename } from 'vs/base/common/paths';
+import { IConfirmationService } from 'vs/platform/dialogs/common/dialogs';
 
 class StartupProfiler implements IWorkbenchContribution {
 
 	constructor(
 		@IWindowsService private readonly _windowsService: IWindowsService,
-		@IMessageService private readonly _messageService: IMessageService,
+		@IConfirmationService private readonly _confirmationService: IConfirmationService,
 		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@ILifecycleService lifecycleService: ILifecycleService,
@@ -59,7 +59,7 @@ class StartupProfiler implements IWorkbenchContribution {
 		}).then(files => {
 			const profileFiles = files.reduce((prev, cur) => `${prev}${join(dir, cur)}\n`, '\n');
 
-			return this._messageService.confirm({
+			return this._confirmationService.confirm({
 				type: 'info',
 				message: localize('prof.message', "Successfully created profiles."),
 				detail: localize('prof.detail', "Please create an issue and manually attach the following files:\n{0}", profileFiles),
@@ -73,7 +73,7 @@ class StartupProfiler implements IWorkbenchContribution {
 						action.run(`:warning: Make sure to **attach** these files from your *home*-directory: :warning:\n${files.map(file => `-\`${file}\``).join('\n')}`)
 					]).then(() => {
 						// keep window stable until restart is selected
-						return this._messageService.confirm({
+						return this._confirmationService.confirm({
 							type: 'info',
 							message: localize('prof.thanks', "Thanks for helping us."),
 							detail: localize('prof.detail.restart', "A final restart is required to continue to use '{0}'. Again, thank you for your contribution.", this._environmentService.appNameLong),
diff --git a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
index 68b0c733cce..424b1d1acb1 100644
--- a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
@@ -34,19 +34,19 @@ import { List } from 'vs/base/browser/ui/list/listWidget';
 import { IDelegate, IRenderer, IListContextMenuEvent, IListEvent } from 'vs/base/browser/ui/list/list';
 import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode, ResolvedKeybinding } from 'vs/base/common/keyCodes';
 import { listHighlightForeground } from 'vs/platform/theme/common/colorRegistry';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
 import { WorkbenchList } from 'vs/platform/list/browser/listService';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 let $ = DOM.$;
 
 export class KeybindingsEditorInput extends EditorInput {
 
-	public static ID: string = 'workbench.input.keybindings';
+	public static readonly ID: string = 'workbench.input.keybindings';
 	public readonly keybindingsModel: KeybindingsEditorModel;
 
 	constructor( @IInstantiationService instantiationService: IInstantiationService) {
@@ -73,7 +73,7 @@ export class KeybindingsEditorInput extends EditorInput {
 
 export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor {
 
-	public static ID: string = 'workbench.editor.keybindings';
+	public static readonly ID: string = 'workbench.editor.keybindings';
 
 	private keybindingsEditorModel: KeybindingsEditorModel;
 
@@ -105,7 +105,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 		@IPreferencesService private preferencesService: IPreferencesService,
 		@IKeybindingEditingService private keybindingEditingService: IKeybindingEditingService,
 		@IContextKeyService private contextKeyService: IContextKeyService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IClipboardService private clipboardService: IClipboardService,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService
@@ -574,7 +574,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 	}
 
 	private onKeybindingEditingError(error: any): void {
-		this.messageService.show(Severity.Error, typeof error === 'string' ? error : localize('error', "Error '{0}' while editing keybinding. Please open 'keybindings.json' file and check.", `${error}`));
+		this.notificationService.error(typeof error === 'string' ? error : localize('error', "Error '{0}' while editing the keybinding. Please open 'keybindings.json' file and check for errors.", `${error}`));
 	}
 }
 
diff --git a/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.ts b/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.ts
index b1bf80c1496..806ac0f38fa 100644
--- a/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.ts
+++ b/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.ts
@@ -48,7 +48,7 @@ export class DefineKeybindingController extends Disposable implements editorComm
 
 	constructor(
 		private _editor: ICodeEditor,
-		@IInstantiationService private _instantiationService: IInstantiationService
+		@IInstantiationService private readonly _instantiationService: IInstantiationService
 	) {
 		super();
 
@@ -125,7 +125,7 @@ export class KeybindingWidgetRenderer extends Disposable {
 
 	constructor(
 		private _editor: ICodeEditor,
-		@IInstantiationService private _instantiationService: IInstantiationService
+		@IInstantiationService private readonly _instantiationService: IInstantiationService
 	) {
 		super();
 		this._launchWidget = this._register(this._instantiationService.createInstance(FloatingClickWidget, this._editor, NLS_LAUNCH_MESSAGE, DefineKeybindingCommand.ID));
@@ -171,7 +171,7 @@ export class KeybindingEditorDecorationsRenderer extends Disposable {
 
 	constructor(
 		private _editor: ICodeEditor,
-		@IKeybindingService private _keybindingService: IKeybindingService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 	) {
 		super();
 
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index 49d0798d3bf..6cb354478fd 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -64,7 +64,7 @@ import { IProgressService } from 'vs/platform/progress/common/progress';
 import { ILogService } from 'vs/platform/log/common/log';
 
 export class PreferencesEditorInput extends SideBySideEditorInput {
-	public static ID: string = 'workbench.editorinputs.preferencesEditorInput';
+	public static readonly ID: string = 'workbench.editorinputs.preferencesEditorInput';
 
 	getTypeId(): string {
 		return PreferencesEditorInput.ID;
@@ -105,7 +105,7 @@ export class DefaultPreferencesEditorInput extends ResourceEditorInput {
 
 export class PreferencesEditor extends BaseEditor {
 
-	public static ID: string = 'workbench.editor.preferencesEditor';
+	public static readonly ID: string = 'workbench.editor.preferencesEditor';
 
 	private defaultSettingsEditorContextKey: IContextKey<boolean>;
 	private focusSettingsContextKey: IContextKey<boolean>;
@@ -618,7 +618,7 @@ class PreferencesRenderersController extends Disposable {
 				} else {
 					/* __GDPR__
 						"defaultSettings.searchError" : {
-							"message": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+							"message": { "classification": "CallstackOrException", "purpose": "FeatureInsight" },
 							"filter": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 						}
 					*/
@@ -974,7 +974,7 @@ class SideBySidePreferencesWidget extends Widget {
 
 export class DefaultPreferencesEditor extends BaseTextEditor {
 
-	public static ID: string = 'workbench.editor.defaultPreferences';
+	public static readonly ID: string = 'workbench.editor.defaultPreferences';
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -1150,7 +1150,7 @@ abstract class AbstractSettingsEditorContribution extends Disposable implements
 
 class DefaultSettingsEditorContribution extends AbstractSettingsEditorContribution implements ISettingsEditorContribution {
 
-	static ID: string = 'editor.contrib.defaultsettings';
+	static readonly ID: string = 'editor.contrib.defaultsettings';
 
 	getId(): string {
 		return DefaultSettingsEditorContribution.ID;
@@ -1171,7 +1171,7 @@ class DefaultSettingsEditorContribution extends AbstractSettingsEditorContributi
 
 class SettingsEditorContribution extends AbstractSettingsEditorContribution implements ISettingsEditorContribution {
 
-	static ID: string = 'editor.contrib.settings';
+	static readonly ID: string = 'editor.contrib.settings';
 
 	constructor(editor: ICodeEditor,
 		@IInstantiationService instantiationService: IInstantiationService,
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
index 805bbbd8eba..35ef624a3a8 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
@@ -21,12 +21,11 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IPreferencesService, ISettingsGroup, ISetting, IPreferencesEditorModel, IFilterResult, ISettingsEditorModel, IWorkbenchSettingsConfiguration, IExtensionSetting, IScoredResults } from 'vs/workbench/parts/preferences/common/preferences';
 import { SettingsEditorModel, DefaultSettingsEditorModel, WorkspaceConfigurationEditorModel } from 'vs/workbench/parts/preferences/common/preferencesModels';
 import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
-import { IContextMenuService, ContextSubMenu } from 'vs/platform/contextview/browser/contextView';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { SettingsGroupTitleWidget, EditPreferenceWidget, SettingsHeaderWidget, DefaultSettingsHeaderWidget, FloatingClickWidget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { RangeHighlightDecorations } from 'vs/workbench/browser/parts/editor/rangeDecorations';
 import { IMarkerService, IMarkerData } from 'vs/platform/markers/common/markers';
-import { Severity, IMessageService } from 'vs/platform/message/common/message';
 import { ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
@@ -41,6 +40,8 @@ import { IssueType, ISettingsSearchIssueReporterData, ISettingSearchResult } fro
 import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { IWorkbenchIssueService } from 'vs/workbench/services/issue/common/issue';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { ContextSubMenu } from 'vs/base/browser/contextmenu';
 
 export interface IPreferencesRenderer<T> extends IDisposable {
 	readonly preferencesModel: IPreferencesEditorModel<T>;
@@ -604,7 +605,7 @@ export class FeedbackWidgetRenderer extends Disposable {
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
 		@ITelemetryService private telemetryService: ITelemetryService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@IConfigurationService private configurationService: IConfigurationService
 	) {
@@ -630,7 +631,7 @@ export class FeedbackWidgetRenderer extends Disposable {
 
 	private getFeedback(): void {
 		if (!this.telemetryService.isOptedIn && this.environmentService.appQuality) {
-			this.messageService.show(Severity.Error, 'Can\'t send feedback, user is opted out of telemetry');
+			this.notificationService.error('Can\'t send feedback, user is opted out of telemetry');
 			return;
 		}
 
@@ -669,9 +670,9 @@ export class FeedbackWidgetRenderer extends Disposable {
 			this._register(sendFeedbackWidget.onClick(() => {
 				this.sendFeedback(feedbackEditor.getControl() as ICodeEditor, result, actualResults).then(() => {
 					sendFeedbackWidget.dispose();
-					this.messageService.show(Severity.Info, 'Feedback sent successfully');
+					this.notificationService.info('Feedback sent successfully');
 				}, err => {
-					this.messageService.show(Severity.Error, 'Error sending feedback: ' + err.message);
+					this.notificationService.error('Error sending feedback: ' + err.message);
 				});
 			}));
 		});
@@ -940,11 +941,11 @@ export class HighlightMatchesRenderer extends Disposable {
 	public render(matches: IRange[]): void {
 		const model = this.editor.getModel();
 		this.editor.changeDecorations(changeAccessor => {
-			this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, []);
+			this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, []) || [];
 		});
 		if (matches.length) {
 			this.editor.changeDecorations(changeAccessor => {
-				this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, matches.map(match => this.createDecoration(match, model)));
+				this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, matches.map(match => this.createDecoration(match, model))) || [];
 			});
 		}
 	}
@@ -965,7 +966,7 @@ export class HighlightMatchesRenderer extends Disposable {
 		if (this.decorationIds) {
 			this.decorationIds = this.editor.changeDecorations(changeAccessor => {
 				return changeAccessor.deltaDecorations(this.decorationIds, []);
-			});
+			}) || [];
 		}
 		super.dispose();
 	}
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesService.ts b/src/vs/workbench/parts/preferences/browser/preferencesService.ts
index c553d684820..af60bbb773f 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesService.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesService.ts
@@ -20,7 +20,6 @@ import { Position as EditorPosition, IEditor, IEditorOptions } from 'vs/platform
 import { ITextModel } from 'vs/editor/common/model';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import { IFileService, FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IPreferencesService, IPreferencesEditorModel, ISetting, getSettingsTargetName, FOLDER_SETTINGS_PATH, DEFAULT_SETTINGS_EDITOR_SETTING } from 'vs/workbench/parts/preferences/common/preferences';
@@ -40,6 +39,7 @@ import { ConfigurationTarget } from 'vs/platform/configuration/common/configurat
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { parse } from 'vs/base/common/json';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 const emptyEditableSettingsContent = '{\n}';
 
@@ -61,7 +61,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		@IEditorGroupService private editorGroupService: IEditorGroupService,
 		@IFileService private fileService: IFileService,
 		@IWorkspaceConfigurationService private configurationService: IWorkspaceConfigurationService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
@@ -185,7 +185,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 
 	openWorkspaceSettings(options?: IEditorOptions, position?: EditorPosition): TPromise<IEditor> {
 		if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
-			this.messageService.show(Severity.Info, nls.localize('openFolderFirst', "Open a folder first to create workspace settings"));
+			this.notificationService.info(nls.localize('openFolderFirst', "Open a folder first to create workspace settings"));
 			return TPromise.as(null);
 		}
 		return this.doOpenSettings(ConfigurationTarget.WORKSPACE, this.workspaceSettingsResource, options, position);
@@ -197,8 +197,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 
 	switchSettings(target: ConfigurationTarget, resource: URI): TPromise<void> {
 		const activeEditor = this.editorService.getActiveEditor();
-		const activeEditorInput = activeEditor.input;
-		if (activeEditorInput instanceof PreferencesEditorInput) {
+		if (activeEditor && activeEditor.input instanceof PreferencesEditorInput) {
 			return this.getOrCreateEditableSettingsEditorInput(target, this.getEditableSettingsURI(target, resource))
 				.then(toInput => {
 					const replaceWith = new PreferencesEditorInput(this.getPreferencesEditorInputName(target, resource), toInput.getDescription(), this.instantiationService.createInstance(DefaultPreferencesEditorInput, this.getDefaultSettingsResource(target)), toInput);
diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts b/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts
index df56f2f288b..50c0e829378 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts
@@ -10,13 +10,13 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
 import { EditorInput, IEditorInputFactory, IEditorInputFactoryRegistry, Extensions as EditorInputExtensions } from 'vs/workbench/common/editor';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { DefaultPreferencesEditorInput, PreferencesEditor, PreferencesEditorInput } from 'vs/workbench/parts/preferences/browser/preferencesEditor';
 import { KeybindingsEditor, KeybindingsEditorInput } from 'vs/workbench/parts/preferences/browser/keybindingsEditor';
-import { OpenRawDefaultSettingsAction, OpenGlobalSettingsAction, OpenGlobalKeybindingsAction, OpenGlobalKeybindingsFileAction, OpenWorkspaceSettingsAction, OpenFolderSettingsAction, ConfigureLanguageBasedSettingsAction, OPEN_FOLDER_SETTINGS_COMMAND } from 'vs/workbench/parts/preferences/browser/preferencesActions';
+import { OpenRawDefaultSettingsAction, OpenGlobalSettingsAction, OpenGlobalKeybindingsFileAction, OpenWorkspaceSettingsAction, OpenFolderSettingsAction, ConfigureLanguageBasedSettingsAction, OPEN_FOLDER_SETTINGS_COMMAND, OpenGlobalKeybindingsAction } from 'vs/workbench/parts/preferences/browser/preferencesActions';
 import {
 	IPreferencesService, IKeybindingsEditor, IPreferencesSearchService, CONTEXT_KEYBINDING_FOCUS, CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_SEARCH,
 	KEYBINDINGS_EDITOR_COMMAND_COPY, KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR, KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS
@@ -25,7 +25,7 @@ import { PreferencesService } from 'vs/workbench/parts/preferences/browser/prefe
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { PreferencesContribution } from 'vs/workbench/parts/preferences/common/preferencesContribution';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IEditorRegistry, EditorDescriptor, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
@@ -166,8 +166,6 @@ const category = nls.localize('preferences', "Preferences");
 const registry = Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions);
 registry.registerWorkbenchAction(new SyncActionDescriptor(OpenRawDefaultSettingsAction, OpenRawDefaultSettingsAction.ID, OpenRawDefaultSettingsAction.LABEL), 'Preferences: Open Raw Default Settings', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(OpenGlobalSettingsAction, OpenGlobalSettingsAction.ID, OpenGlobalSettingsAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.US_COMMA }), 'Preferences: Open User Settings', category);
-registry.registerWorkbenchAction(new SyncActionDescriptor(OpenWorkspaceSettingsAction, OpenWorkspaceSettingsAction.ID, OpenWorkspaceSettingsAction.LABEL), 'Preferences: Open Workspace Settings', category);
-registry.registerWorkbenchAction(new SyncActionDescriptor(OpenFolderSettingsAction, OpenFolderSettingsAction.ID, OpenFolderSettingsAction.LABEL), 'Preferences: Open Folder Settings', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(OpenGlobalKeybindingsAction, OpenGlobalKeybindingsAction.ID, OpenGlobalKeybindingsAction.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_S) }), 'Preferences: Open Keyboard Shortcuts', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(OpenGlobalKeybindingsFileAction, OpenGlobalKeybindingsFileAction.ID, OpenGlobalKeybindingsFileAction.LABEL, { primary: null }), 'Preferences: Open Keyboard Shortcuts File', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ConfigureLanguageBasedSettingsAction, ConfigureLanguageBasedSettingsAction.ID, ConfigureLanguageBasedSettingsAction.LABEL), 'Preferences: Configure Language Specific Settings...', category);
@@ -277,3 +275,25 @@ CommandsRegistry.registerCommand(OPEN_FOLDER_SETTINGS_COMMAND, function (accesso
 	const preferencesService = accessor.get(IPreferencesService);
 	return preferencesService.openFolderSettings(resource);
 });
+
+CommandsRegistry.registerCommand(OpenFolderSettingsAction.ID, serviceAccessor => {
+	serviceAccessor.get(IInstantiationService).createInstance(OpenFolderSettingsAction, OpenFolderSettingsAction.ID, OpenFolderSettingsAction.LABEL).run();
+});
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+	command: {
+		id: OpenFolderSettingsAction.ID,
+		title: `${category}: ${OpenFolderSettingsAction.LABEL}`,
+	},
+	when: new RawContextKey<string>('workbenchState', '').isEqualTo('workspace')
+});
+
+CommandsRegistry.registerCommand(OpenWorkspaceSettingsAction.ID, serviceAccessor => {
+	serviceAccessor.get(IInstantiationService).createInstance(OpenWorkspaceSettingsAction, OpenWorkspaceSettingsAction.ID, OpenWorkspaceSettingsAction.LABEL).run();
+});
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+	command: {
+		id: OpenWorkspaceSettingsAction.ID,
+		title: `${category}: ${OpenWorkspaceSettingsAction.LABEL}`,
+	},
+	when: new RawContextKey<string>('workbenchState', '').notEqualsTo('empty')
+});
\ No newline at end of file
diff --git a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
index 461b6f6cdec..790798ffc3c 100644
--- a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
@@ -11,7 +11,6 @@ import arrays = require('vs/base/common/arrays');
 import types = require('vs/base/common/types');
 import { language, LANGUAGE_DEFAULT } from 'vs/base/common/platform';
 import { Action } from 'vs/base/common/actions';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { Mode, IEntryRunContext, IAutoFocus, IModel, IQuickNavigateConfiguration } from 'vs/base/parts/quickopen/common/quickOpen';
 import { QuickOpenEntryGroup, IHighlight, QuickOpenModel, QuickOpenEntry } from 'vs/base/parts/quickopen/browser/quickOpenModel';
 import { IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
@@ -21,7 +20,6 @@ import { IEditorAction, IEditor } from 'vs/editor/common/editorCommon';
 import { matchesWords, matchesPrefix, matchesContiguousSubString, or } from 'vs/base/common/filters';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IMessageService, Severity, IMessageWithAction } from 'vs/platform/message/common/message';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
@@ -35,6 +33,7 @@ import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export const ALL_COMMANDS_PREFIX = '>';
 
@@ -222,7 +221,7 @@ abstract class BaseCommandEntry extends QuickOpenEntryGroup {
 		alias: string,
 		highlights: { label: IHighlight[], alias: IHighlight[] },
 		private onBeforeRun: (commandId: string) => void,
-		@IMessageService protected messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@ITelemetryService protected telemetryService: ITelemetryService
 	) {
 		super();
@@ -275,21 +274,6 @@ abstract class BaseCommandEntry extends QuickOpenEntryGroup {
 		return nls.localize('entryAriaLabel', "{0}, commands", this.getLabel());
 	}
 
-	private onError(error?: Error): void;
-	private onError(messagesWithAction?: IMessageWithAction): void;
-	private onError(arg1?: any): void {
-		if (isPromiseCanceledError(arg1)) {
-			return;
-		}
-
-		const messagesWithAction: IMessageWithAction = arg1;
-		if (messagesWithAction && typeof messagesWithAction.message === 'string' && Array.isArray(messagesWithAction.actions)) {
-			this.messageService.show(Severity.Error, messagesWithAction);
-		} else {
-			this.messageService.show(Severity.Error, !arg1 ? nls.localize('canNotRun', "Command '{0}' can not be run from here.", this.label) : toErrorMessage(arg1));
-		}
-	}
-
 	public run(mode: Mode, context: IEntryRunContext): boolean {
 		if (mode === Mode.OPEN) {
 			this.runAction(this.getAction());
@@ -327,10 +311,18 @@ abstract class BaseCommandEntry extends QuickOpenEntryGroup {
 					this.onError(error);
 				}
 			} else {
-				this.messageService.show(Severity.Info, nls.localize('actionNotEnabled', "Command '{0}' is not enabled in the current context.", this.getLabel()));
+				this.notificationService.info(nls.localize('actionNotEnabled', "Command '{0}' is not enabled in the current context.", this.getLabel()));
 			}
 		}, err => this.onError(err));
 	}
+
+	private onError(error?: Error): void {
+		if (isPromiseCanceledError(error)) {
+			return;
+		}
+
+		this.notificationService.error(error || nls.localize('canNotRun', "Command '{0}' resulted in an error.", this.label));
+	}
 }
 
 class EditorActionCommandEntry extends BaseCommandEntry {
@@ -343,10 +335,10 @@ class EditorActionCommandEntry extends BaseCommandEntry {
 		highlights: { label: IHighlight[], alias: IHighlight[] },
 		private action: IEditorAction,
 		onBeforeRun: (commandId: string) => void,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@ITelemetryService telemetryService: ITelemetryService
 	) {
-		super(commandId, keybinding, label, meta, highlights, onBeforeRun, messageService, telemetryService);
+		super(commandId, keybinding, label, meta, highlights, onBeforeRun, notificationService, telemetryService);
 	}
 
 	protected getAction(): Action | IEditorAction {
@@ -364,10 +356,10 @@ class ActionCommandEntry extends BaseCommandEntry {
 		highlights: { label: IHighlight[], alias: IHighlight[] },
 		private action: Action,
 		onBeforeRun: (commandId: string) => void,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@ITelemetryService telemetryService: ITelemetryService
 	) {
-		super(commandId, keybinding, label, alias, highlights, onBeforeRun, messageService, telemetryService);
+		super(commandId, keybinding, label, alias, highlights, onBeforeRun, notificationService, telemetryService);
 	}
 
 	protected getAction(): Action | IEditorAction {
diff --git a/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.ts b/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.ts
index 11e9bae353a..3e547c61637 100644
--- a/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.ts
+++ b/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.ts
@@ -8,7 +8,6 @@
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IWorkbenchContributionsRegistry, IWorkbenchContribution, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { IWindowsService, IWindowService, IWindowsConfiguration } from 'vs/platform/windows/common/windows';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { localize } from 'vs/nls';
@@ -20,6 +19,7 @@ import URI from 'vs/base/common/uri';
 import { isEqual } from 'vs/base/common/resources';
 import { isLinux } from 'vs/base/common/platform';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { IConfirmationService } from 'vs/platform/dialogs/common/dialogs';
 
 interface IConfiguration extends IWindowsConfiguration {
 	update: { channel: string; };
@@ -47,7 +47,7 @@ export class SettingsChangeRelauncher implements IWorkbenchContribution {
 		@IWindowService private windowService: IWindowService,
 		@IConfigurationService private configurationService: IConfigurationService,
 		@IEnvironmentService private envService: IEnvironmentService,
-		@IMessageService private messageService: IMessageService,
+		@IConfirmationService private confirmationService: IConfirmationService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IExtensionService private extensionService: IExtensionService
 	) {
@@ -146,7 +146,7 @@ export class SettingsChangeRelauncher implements IWorkbenchContribution {
 	private doConfirm(message: string, detail: string, primaryButton: string, confirmed: () => void): void {
 		this.windowService.isFocused().then(focused => {
 			if (focused) {
-				return this.messageService.confirm({
+				return this.confirmationService.confirm({
 					type: 'info',
 					message,
 					detail,
diff --git a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts
index bd82579039d..2baa8cc1358 100644
--- a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts
+++ b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts
@@ -15,7 +15,6 @@ import Event, { Emitter, anyEvent as anyEvent, filterEvent, once } from 'vs/base
 import * as ext from 'vs/workbench/common/contributions';
 import { CodeEditor } from 'vs/editor/browser/codeEditor';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService';
@@ -54,6 +53,7 @@ import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService
 import { ISplice } from 'vs/base/common/sequence';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { createStyleSheet } from '../../../../base/browser/dom';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 // TODO@Joao
 // Need to subclass MenuItemActionItem in order to respect
@@ -66,7 +66,7 @@ class DiffMenuItemActionItem extends MenuItemActionItem {
 		event.stopPropagation();
 
 		this.actionRunner.run(this._commandAction, this._context)
-			.done(undefined, err => this._messageService.show(Severity.Error, err));
+			.done(undefined, err => this._notificationService.error(err));
 	}
 }
 
@@ -198,7 +198,7 @@ class DirtyDiffWidget extends PeekViewWidget {
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IMenuService menuService: IMenuService,
 		@IKeybindingService private keybindingService: IKeybindingService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IContextMenuService private contextMenuService: IContextMenuService
 	) {
@@ -291,7 +291,7 @@ class DirtyDiffWidget extends PeekViewWidget {
 			return undefined;
 		}
 
-		return new DiffMenuItemActionItem(action, this.keybindingService, this.messageService, this.contextMenuService);
+		return new DiffMenuItemActionItem(action, this.keybindingService, this.notificationService, this.contextMenuService);
 	}
 
 	protected _fillBody(container: HTMLElement): void {
@@ -790,8 +790,8 @@ class DirtyDiffDecorator {
 
 		if (options.overview) {
 			decorationOptions.overviewRuler = {
-				color: themeColorFromId(overviewRulerModifiedForeground),
-				darkColor: themeColorFromId(overviewRulerModifiedForeground),
+				color: themeColorFromId(foregroundColor),
+				darkColor: themeColorFromId(foregroundColor),
 				position: OverviewRulerLane.Left
 			};
 		}
diff --git a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
index 2ebc0f2cf79..7f179fcb8df 100644
--- a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
+++ b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
@@ -30,7 +30,6 @@ import { IContextViewService, IContextMenuService } from 'vs/platform/contextvie
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { MenuItemAction, IMenuService, MenuId } from 'vs/platform/actions/common/actions';
 import { IAction, Action, IActionItem, ActionRunner } from 'vs/base/common/actions';
 import { fillInActions, ContextAwareMenuItemActionItem } from 'vs/platform/actions/browser/menuItemActionItem';
@@ -57,6 +56,7 @@ import { firstIndex } from 'vs/base/common/arrays';
 import { WorkbenchList } from 'vs/platform/list/browser/listService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ThrottledDelayer } from 'vs/base/common/async';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export interface ISpliceEvent<T> {
 	index: number;
@@ -746,7 +746,7 @@ export class RepositoryPanel extends ViewletPanel {
 		@IContextMenuService protected contextMenuService: IContextMenuService,
 		@IContextViewService protected contextViewService: IContextViewService,
 		@ICommandService protected commandService: ICommandService,
-		@IMessageService protected messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IWorkbenchEditorService protected editorService: IWorkbenchEditorService,
 		@IEditorGroupService protected editorGroupService: IEditorGroupService,
 		@IInstantiationService protected instantiationService: IInstantiationService,
@@ -935,7 +935,7 @@ export class RepositoryPanel extends ViewletPanel {
 			return undefined;
 		}
 
-		return new ContextAwareMenuItemActionItem(action, this.keybindingService, this.messageService, this.contextMenuService);
+		return new ContextAwareMenuItemActionItem(action, this.keybindingService, this.notificationService, this.contextMenuService);
 	}
 
 	getActionsContext(): any {
@@ -1053,7 +1053,7 @@ export class SCMViewlet extends PanelViewlet implements IViewModel {
 		@IContextViewService protected contextViewService: IContextViewService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IKeybindingService protected keybindingService: IKeybindingService,
-		@IMessageService protected messageService: IMessageService,
+		@INotificationService protected notificationService: INotificationService,
 		@IContextMenuService private contextMenuService: IContextMenuService,
 		@IThemeService protected themeService: IThemeService,
 		@ICommandService protected commandService: ICommandService,
@@ -1207,7 +1207,7 @@ export class SCMViewlet extends PanelViewlet implements IViewModel {
 			return undefined;
 		}
 
-		return new ContextAwareMenuItemActionItem(action, this.keybindingService, this.messageService, this.contextMenuService);
+		return new ContextAwareMenuItemActionItem(action, this.keybindingService, this.notificationService, this.contextMenuService);
 	}
 
 	layout(dimension: Dimension): void {
diff --git a/src/vs/workbench/parts/search/browser/openAnythingHandler.ts b/src/vs/workbench/parts/search/browser/openAnythingHandler.ts
index 7827ddfed6a..66d1bbec1ba 100644
--- a/src/vs/workbench/parts/search/browser/openAnythingHandler.ts
+++ b/src/vs/workbench/parts/search/browser/openAnythingHandler.ts
@@ -15,7 +15,6 @@ import { QuickOpenEntry, QuickOpenModel, QuickOpenItemAccessor } from 'vs/base/p
 import { QuickOpenHandler } from 'vs/workbench/browser/quickopen';
 import { FileEntry, OpenFileHandler, FileQuickOpenModel } from 'vs/workbench/parts/search/browser/openFileHandler';
 import * as openSymbolHandler from 'vs/workbench/parts/search/browser/openSymbolHandler';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IWorkbenchSearchConfiguration } from 'vs/workbench/parts/search/common/search';
@@ -23,6 +22,8 @@ import { IRange } from 'vs/editor/common/core/range';
 import { compareItemsByScore, scoreItem, ScorerCache, prepareQuery } from 'vs/base/parts/quickopen/common/quickOpenScorer';
 
 export import OpenSymbolHandler = openSymbolHandler.OpenSymbolHandler; // OpenSymbolHandler is used from an extension and must be in the main bundle file so it can load
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { isPromiseCanceledError } from 'vs/base/common/errors';
 
 interface ISearchWithRange {
 	search: string;
@@ -49,7 +50,7 @@ export class OpenAnythingHandler extends QuickOpenHandler {
 	private includeSymbols: boolean;
 
 	constructor(
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IConfigurationService private configurationService: IConfigurationService
 	) {
@@ -90,15 +91,14 @@ export class OpenAnythingHandler extends QuickOpenHandler {
 		this.cancelPendingSearch();
 		this.isClosed = false; // Treat this call as the handler being in use
 
-		// Prepare search for scoring
-		const query = prepareQuery(searchValue);
-
-		const searchWithRange = this.extractRange(query.value); // Find a suitable range from the pattern looking for ":" and "#"
+		// Find a suitable range from the pattern looking for ":" and "#"
+		const searchWithRange = this.extractRange(searchValue);
 		if (searchWithRange) {
-			query.value = searchWithRange.search; // ignore range portion in query
-			query.lowercase = query.value.toLowerCase();
+			searchValue = searchWithRange.search; // ignore range portion in query
 		}
 
+		// Prepare search for scoring
+		const query = prepareQuery(searchValue);
 		if (!query.value) {
 			return TPromise.as(new QuickOpenModel()); // Respond directly to empty search
 		}
@@ -143,13 +143,17 @@ export class OpenAnythingHandler extends QuickOpenHandler {
 				});
 
 				return TPromise.as<QuickOpenModel>(new QuickOpenModel(viewResults));
-			}, (error: Error[]) => {
+			}, error => {
 				this.pendingSearch = null;
-				if (error && error[0] && error[0].message) {
-					this.messageService.show(Severity.Error, error[0].message.replace(/[\*_\[\]]/g, '\\$&'));
-				} else {
-					this.messageService.show(Severity.Error, error);
+
+				if (!isPromiseCanceledError(error)) {
+					if (error && error[0] && error[0].message) {
+						this.notificationService.error(error[0].message.replace(/[\*_\[\]]/g, '\\$&'));
+					} else {
+						this.notificationService.error(error);
+					}
 				}
+
 				return null;
 			});
 
diff --git a/src/vs/workbench/parts/search/browser/openSymbolHandler.ts b/src/vs/workbench/parts/search/browser/openSymbolHandler.ts
index 88401644d73..4f1a912594e 100644
--- a/src/vs/workbench/parts/search/browser/openSymbolHandler.ts
+++ b/src/vs/workbench/parts/search/browser/openSymbolHandler.ts
@@ -34,10 +34,10 @@ class SymbolEntry extends EditorQuickOpenEntry {
 	constructor(
 		private _bearing: SymbolInformation,
 		private _provider: IWorkspaceSymbolProvider,
-		@IConfigurationService private _configurationService: IConfigurationService,
-		@IWorkspaceContextService private _contextService: IWorkspaceContextService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
 		@IWorkbenchEditorService editorService: IWorkbenchEditorService,
-		@IEnvironmentService private _environmentService: IEnvironmentService
+		@IEnvironmentService private readonly _environmentService: IEnvironmentService
 	) {
 		super(editorService);
 	}
diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts
index ffd61a26620..d1695740015 100644
--- a/src/vs/workbench/parts/search/browser/searchActions.ts
+++ b/src/vs/workbench/parts/search/browser/searchActions.ts
@@ -297,7 +297,7 @@ export abstract class SearchAction extends Action {
 
 export class RefreshAction extends SearchAction {
 
-	static ID: string = 'search.action.refreshSearchResults';
+	static readonly ID: string = 'search.action.refreshSearchResults';
 	static LABEL: string = nls.localize('RefreshAction.label', "Refresh");
 
 	constructor(id: string, label: string, @IViewletService viewletService: IViewletService) {
@@ -322,7 +322,7 @@ export class RefreshAction extends SearchAction {
 
 export class CollapseDeepestExpandedLevelAction extends SearchAction {
 
-	static ID: string = 'search.action.collapseSearchResults';
+	static readonly ID: string = 'search.action.collapseSearchResults';
 	static LABEL: string = nls.localize('CollapseDeepestExpandedLevelAction.label', "Collapse All");
 
 	constructor(id: string, label: string, @IViewletService viewletService: IViewletService) {
@@ -356,7 +356,7 @@ export class CollapseDeepestExpandedLevelAction extends SearchAction {
 
 export class ClearSearchResultsAction extends SearchAction {
 
-	static ID: string = 'search.action.clearSearchResults';
+	static readonly ID: string = 'search.action.clearSearchResults';
 	static LABEL: string = nls.localize('ClearSearchResultsAction.label', "Clear");
 
 	constructor(id: string, label: string, @IViewletService viewletService: IViewletService) {
@@ -381,7 +381,7 @@ export class ClearSearchResultsAction extends SearchAction {
 
 export class CancelSearchAction extends SearchAction {
 
-	static ID: string = 'search.action.cancelSearch';
+	static readonly ID: string = 'search.action.cancelSearch';
 	static LABEL: string = nls.localize('CancelSearchAction.label', "Cancel Search");
 
 	constructor(id: string, label: string, @IViewletService viewletService: IViewletService) {
diff --git a/src/vs/workbench/parts/search/browser/searchViewlet.ts b/src/vs/workbench/parts/search/browser/searchViewlet.ts
index 2bdf4b6c125..173957be352 100644
--- a/src/vs/workbench/parts/search/browser/searchViewlet.ts
+++ b/src/vs/workbench/parts/search/browser/searchViewlet.ts
@@ -36,7 +36,6 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IMessageService, IConfirmation } from 'vs/platform/message/common/message';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
@@ -47,18 +46,19 @@ import { SearchRenderer, SearchDataSource, SearchSorter, SearchAccessibilityProv
 import { SearchWidget, ISearchWidgetOptions } from 'vs/workbench/parts/search/browser/searchWidget';
 import { RefreshAction, CollapseDeepestExpandedLevelAction, ClearSearchResultsAction, SearchAction, CancelSearchAction } from 'vs/workbench/parts/search/browser/searchActions';
 import { IReplaceService } from 'vs/workbench/parts/search/common/replace';
-import Severity from 'vs/base/common/severity';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { OpenFolderAction, OpenFileFolderAction } from 'vs/workbench/browser/actions/workspaceActions';
 import * as Constants from 'vs/workbench/parts/search/common/constants';
 import { IThemeService, ITheme, ICssStyleCollector, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { editorFindMatchHighlight, diffInserted, diffRemoved, diffInsertedOutline, diffRemovedOutline, activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
+import { editorFindMatchHighlight, diffInserted, diffRemoved, diffInsertedOutline, diffRemovedOutline, editorFindMatchHighlightBorder } from 'vs/platform/theme/common/colorRegistry';
 import { getOutOfWorkspaceEditorResources } from 'vs/workbench/parts/search/common/search';
 import { PreferencesEditor } from 'vs/workbench/parts/preferences/browser/preferencesEditor';
 import { isDiffEditor, isCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { TreeResourceNavigator, WorkbenchTree } from 'vs/platform/list/browser/listService';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { SimpleFileResourceDragAndDrop } from 'vs/workbench/browser/dnd';
+import { IConfirmation, IConfirmationService } from 'vs/platform/dialogs/common/dialogs';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class SearchViewlet extends Viewlet {
 
@@ -108,7 +108,8 @@ export class SearchViewlet extends Viewlet {
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
 		@IEditorGroupService private editorGroupService: IEditorGroupService,
 		@IProgressService private progressService: IProgressService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
+		@IConfirmationService private confirmationService: IConfirmationService,
 		@IStorageService private storageService: IStorageService,
 		@IContextViewService private contextViewService: IContextViewService,
 		@IInstantiationService private instantiationService: IInstantiationService,
@@ -395,7 +396,7 @@ export class SearchViewlet extends Viewlet {
 			type: 'question'
 		};
 
-		this.messageService.confirm(confirmation).then(confirmed => {
+		this.confirmationService.confirm(confirmation).then(confirmed => {
 			if (confirmed) {
 				this.searchWidget.setReplaceAllActionState(false);
 				this.viewModel.searchResult.replaceAll(progressRunner).then(() => {
@@ -405,7 +406,7 @@ export class SearchViewlet extends Viewlet {
 				}, (error) => {
 					progressRunner.done();
 					errors.isPromiseCanceledError(error);
-					this.messageService.show(Severity.Error, error);
+					this.notificationService.error(error);
 				});
 			}
 		});
@@ -1519,10 +1520,8 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 		collector.addRule(`.monaco-workbench .search-viewlet .replace.findInFileMatch { border: 1px dashed ${diffRemovedOutlineColor}; }`);
 	}
 
-	const activeContrastBorderColor = theme.getColor(activeContrastBorder);
-	if (activeContrastBorderColor) {
-		collector.addRule(`
-			.monaco-workbench .search-viewlet .findInFileMatch { border: 1px dashed ${activeContrastBorderColor}; }
-		`);
+	const findMatchHighlightBorder = theme.getColor(editorFindMatchHighlightBorder);
+	if (findMatchHighlightBorder) {
+		collector.addRule(`.monaco-workbench .search-viewlet .findInFileMatch { border: 1px dashed ${findMatchHighlightBorder}; }`);
 	}
 });
diff --git a/src/vs/workbench/parts/search/browser/searchWidget.ts b/src/vs/workbench/parts/search/browser/searchWidget.ts
index efecc40aa67..118941a1652 100644
--- a/src/vs/workbench/parts/search/browser/searchWidget.ts
+++ b/src/vs/workbench/parts/search/browser/searchWidget.ts
@@ -44,7 +44,7 @@ export interface ISearchWidgetOptions {
 class ReplaceAllAction extends Action {
 
 	private static fgInstance: ReplaceAllAction = null;
-	public static ID: string = 'search.action.replaceAll';
+	public static readonly ID: string = 'search.action.replaceAll';
 
 	static get INSTANCE(): ReplaceAllAction {
 		if (ReplaceAllAction.fgInstance === null) {
diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts
index f1695bc6c63..722ba217562 100644
--- a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts
+++ b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts
@@ -298,8 +298,8 @@ export class SnippetSuggestion implements ISuggestion {
 export class SnippetSuggestProvider implements ISuggestSupport {
 
 	constructor(
-		@IModeService private _modeService: IModeService,
-		@ISnippetsService private _snippets: ISnippetsService
+		@IModeService private readonly _modeService: IModeService,
+		@ISnippetsService private readonly _snippets: ISnippetsService
 	) {
 		//
 	}
diff --git a/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.ts b/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.ts
index b18bfe895e1..ebd52903f20 100644
--- a/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.ts
+++ b/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.ts
@@ -6,13 +6,10 @@
 'use strict';
 
 import * as nls from 'vs/nls';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { Action } from 'vs/base/common/actions';
 import { language } from 'vs/base/common/platform';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IWorkbenchContributionsRegistry, IWorkbenchContribution, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { FileChangeType, IFileService } from 'vs/platform/files/common/files';
@@ -20,6 +17,8 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
 import pkg from 'vs/platform/node/package';
 import product, { ISurveyData } from 'vs/platform/node/product';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { IChoiceService, Choice } from 'vs/platform/dialogs/common/dialogs';
+import { Severity } from 'vs/platform/notification/common/notification';
 
 class LanguageSurvey {
 
@@ -27,7 +26,7 @@ class LanguageSurvey {
 		data: ISurveyData,
 		instantiationService: IInstantiationService,
 		storageService: IStorageService,
-		messageService: IMessageService,
+		choiceService: IChoiceService,
 		telemetryService: ITelemetryService,
 		fileService: IFileService,
 		modelService: IModelService
@@ -86,37 +85,31 @@ class LanguageSurvey {
 			return;
 		}
 
-		const message = nls.localize('helpUs', "Help us improve our support for {0}", data.languageId);
-
-		const takeSurveyAction = new Action('takeSurvey', nls.localize('takeShortSurvey', "Take Short Survey"), '', true, () => {
-			// __GDPR__TODO__ Need to move away from dynamic event names as those cannot be registered statically
-			telemetryService.publicLog(`${data.surveyId}.survey/takeShortSurvey`);
-			return telemetryService.getTelemetryInfo().then(info => {
-				window.open(`${data.surveyUrl}?o=${encodeURIComponent(process.platform)}&v=${encodeURIComponent(pkg.version)}&m=${encodeURIComponent(info.machineId)}`);
-				storageService.store(IS_CANDIDATE_KEY, false, StorageScope.GLOBAL);
-				storageService.store(SKIP_VERSION_KEY, pkg.version, StorageScope.GLOBAL);
-			});
-		});
-
-		const remindMeLaterAction = new Action('later', nls.localize('remindLater', "Remind Me later"), '', true, () => {
-			// __GDPR__TODO__ Need to move away from dynamic event names as those cannot be registered statically
-			telemetryService.publicLog(`${data.surveyId}.survey/remindMeLater`);
-			storageService.store(SESSION_COUNT_KEY, sessionCount - 3, StorageScope.GLOBAL);
-			return TPromise.as(null);
-		});
-
-		const neverAgainAction = new Action('never', nls.localize('neverAgain', "Don't Show Again"), '', true, () => {
-			// __GDPR__TODO__ Need to move away from dynamic event names as those cannot be registered statically
-			telemetryService.publicLog(`${data.surveyId}.survey/dontShowAgain`);
-			storageService.store(IS_CANDIDATE_KEY, false, StorageScope.GLOBAL);
-			storageService.store(SKIP_VERSION_KEY, pkg.version, StorageScope.GLOBAL);
-			return TPromise.as(null);
-		});
-
-		const actions = [neverAgainAction, remindMeLaterAction, takeSurveyAction];
 		// __GDPR__TODO__ Need to move away from dynamic event names as those cannot be registered statically
 		telemetryService.publicLog(`${data.surveyId}.survey/userAsked`);
-		messageService.show(Severity.Info, { message, actions });
+
+		const choices: Choice[] = [nls.localize('takeShortSurvey', "Take Short Survey"), nls.localize('remindLater', "Remind Me later"), { label: nls.localize('neverAgain', "Don't Show Again") }];
+		choiceService.choose(Severity.Info, nls.localize('helpUs', "Help us improve our support for {0}", data.languageId), choices).then(choice => {
+			switch (choice) {
+				case 0 /* Take Survey */:
+					telemetryService.publicLog(`${data.surveyId}.survey/takeShortSurvey`);
+					telemetryService.getTelemetryInfo().then(info => {
+						window.open(`${data.surveyUrl}?o=${encodeURIComponent(process.platform)}&v=${encodeURIComponent(pkg.version)}&m=${encodeURIComponent(info.machineId)}`);
+						storageService.store(IS_CANDIDATE_KEY, false, StorageScope.GLOBAL);
+						storageService.store(SKIP_VERSION_KEY, pkg.version, StorageScope.GLOBAL);
+					});
+					break;
+				case 1 /* Remind Later */:
+					telemetryService.publicLog(`${data.surveyId}.survey/remindMeLater`);
+					storageService.store(SESSION_COUNT_KEY, sessionCount - 3, StorageScope.GLOBAL);
+					break;
+				case 2 /* Never show again */:
+					telemetryService.publicLog(`${data.surveyId}.survey/dontShowAgain`);
+					storageService.store(IS_CANDIDATE_KEY, false, StorageScope.GLOBAL);
+					storageService.store(SKIP_VERSION_KEY, pkg.version, StorageScope.GLOBAL);
+					break;
+			}
+		});
 	}
 
 }
@@ -126,13 +119,13 @@ class LanguageSurveysContribution implements IWorkbenchContribution {
 	constructor(
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IStorageService storageService: IStorageService,
-		@IMessageService messageService: IMessageService,
+		@IChoiceService choiceService: IChoiceService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IFileService fileService: IFileService,
 		@IModelService modelService: IModelService
 	) {
 		product.surveys.filter(surveyData => surveyData.surveyId && surveyData.editCount && surveyData.languageId && surveyData.surveyUrl && surveyData.userProbability).map(surveyData =>
-			new LanguageSurvey(surveyData, instantiationService, storageService, messageService, telemetryService, fileService, modelService));
+			new LanguageSurvey(surveyData, instantiationService, storageService, choiceService, telemetryService, fileService, modelService));
 	}
 }
 
diff --git a/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.ts b/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.ts
index b3b3e2c083c..698016ef6d4 100644
--- a/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.ts
+++ b/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.ts
@@ -6,18 +6,17 @@
 'use strict';
 
 import * as nls from 'vs/nls';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { Action } from 'vs/base/common/actions';
 import { language } from 'vs/base/common/platform';
 import { IWorkbenchContributionsRegistry, IWorkbenchContribution, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import pkg from 'vs/platform/node/package';
 import product from 'vs/platform/node/product';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { IChoiceService, Choice } from 'vs/platform/dialogs/common/dialogs';
+import { Severity } from 'vs/platform/notification/common/notification';
 
 const PROBABILITY = 0.15;
 const SESSION_COUNT_KEY = 'nps/sessionCount';
@@ -30,7 +29,7 @@ class NPSContribution implements IWorkbenchContribution {
 	constructor(
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IStorageService storageService: IStorageService,
-		@IMessageService messageService: IMessageService,
+		@IChoiceService choiceService: IChoiceService,
 		@ITelemetryService telemetryService: ITelemetryService
 	) {
 		const skipVersion = storageService.get(SKIP_VERSION_KEY, StorageScope.GLOBAL, '');
@@ -64,30 +63,25 @@ class NPSContribution implements IWorkbenchContribution {
 			return;
 		}
 
-		const message = nls.localize('surveyQuestion', "Do you mind taking a quick feedback survey?");
-
-		const takeSurveyAction = new Action('nps.takeSurvey', nls.localize('takeSurvey', "Take Survey"), '', true, () => {
-			return telemetryService.getTelemetryInfo().then(info => {
-				window.open(`${product.npsSurveyUrl}?o=${encodeURIComponent(process.platform)}&v=${encodeURIComponent(pkg.version)}&m=${encodeURIComponent(info.machineId)}`);
-				storageService.store(IS_CANDIDATE_KEY, false, StorageScope.GLOBAL);
-				storageService.store(SKIP_VERSION_KEY, pkg.version, StorageScope.GLOBAL);
-			});
+		const choices: Choice[] = [nls.localize('takeSurvey', "Take Survey"), nls.localize('remindLater', "Remind Me later"), { label: nls.localize('neverAgain', "Don't Show Again") }];
+		choiceService.choose(Severity.Info, nls.localize('surveyQuestion', "Do you mind taking a quick feedback survey?"), choices).then(choice => {
+			switch (choice) {
+				case 0 /* Take Survey */:
+					telemetryService.getTelemetryInfo().then(info => {
+						window.open(`${product.npsSurveyUrl}?o=${encodeURIComponent(process.platform)}&v=${encodeURIComponent(pkg.version)}&m=${encodeURIComponent(info.machineId)}`);
+						storageService.store(IS_CANDIDATE_KEY, false, StorageScope.GLOBAL);
+						storageService.store(SKIP_VERSION_KEY, pkg.version, StorageScope.GLOBAL);
+					});
+					break;
+				case 1 /* Remind Later */:
+					storageService.store(SESSION_COUNT_KEY, sessionCount - 3, StorageScope.GLOBAL);
+					break;
+				case 2 /* Never show again */:
+					storageService.store(IS_CANDIDATE_KEY, false, StorageScope.GLOBAL);
+					storageService.store(SKIP_VERSION_KEY, pkg.version, StorageScope.GLOBAL);
+					break;
+			}
 		});
-
-		const remindMeLaterAction = new Action('nps.later', nls.localize('remindLater', "Remind Me later"), '', true, () => {
-			storageService.store(SESSION_COUNT_KEY, sessionCount - 3, StorageScope.GLOBAL);
-			return TPromise.as(null);
-		});
-
-		const neverAgainAction = new Action('nps.never', nls.localize('neverAgain', "Don't Show Again"), '', true, () => {
-			storageService.store(IS_CANDIDATE_KEY, false, StorageScope.GLOBAL);
-			storageService.store(SKIP_VERSION_KEY, pkg.version, StorageScope.GLOBAL);
-			return TPromise.as(null);
-		});
-
-		const actions = [neverAgainAction, remindMeLaterAction, takeSurveyAction];
-
-		messageService.show(Severity.Info, { message, actions });
 	}
 }
 
diff --git a/src/vs/workbench/parts/tasks/common/taskTemplates.ts b/src/vs/workbench/parts/tasks/common/taskTemplates.ts
index 4bb5ee8a833..e19cfd42648 100644
--- a/src/vs/workbench/parts/tasks/common/taskTemplates.ts
+++ b/src/vs/workbench/parts/tasks/common/taskTemplates.ts
@@ -124,10 +124,16 @@ const maven: TaskEntry = {
 	].join('\n')
 };
 
-export let templates: TaskEntry[] = [dotnetBuild, msbuild, maven].sort((a, b) => {
-	return (a.sort || a.label).localeCompare(b.sort || b.label);
-});
-templates.push(command);
+let _templates: TaskEntry[] = null;
+export function getTemplates(): TaskEntry[] {
+	if (!_templates) {
+		_templates = [dotnetBuild, msbuild, maven].sort((a, b) => {
+			return (a.sort || a.label).localeCompare(b.sort || b.label);
+		});
+		_templates.push(command);
+	}
+	return _templates;
+}
 
 
 /** Version 1.0 templates
diff --git a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
index 7354af78892..1e5315ee64f 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
@@ -32,7 +32,6 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { MenuRegistry } from 'vs/platform/actions/common/actions';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IMessageService, IChoiceService } from 'vs/platform/message/common/message';
 import { IMarkerService, MarkerStatistics } from 'vs/platform/markers/common/markers';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
@@ -46,6 +45,8 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
 import { IProgressService2, IProgressOptions, ProgressLocation } from 'vs/platform/progress/common/progress';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IWindowService } from 'vs/platform/windows/common/windows';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IConfirmationService, IChoiceService } from 'vs/platform/dialogs/common/dialogs';
 
 import { IModelService } from 'vs/editor/common/services/modelService';
 
@@ -72,7 +73,7 @@ import { ITerminalService } from 'vs/workbench/parts/terminal/common/terminal';
 import { ITaskSystem, ITaskResolver, ITaskSummary, TaskExecuteKind, TaskError, TaskErrors, TaskTerminateResponse } from 'vs/workbench/parts/tasks/common/taskSystem';
 import { Task, CustomTask, ConfiguringTask, ContributedTask, InMemoryTask, TaskEvent, TaskEventKind, TaskSet, TaskGroup, GroupType, ExecutionEngine, JsonSchemaVersion, TaskSourceKind, TaskIdentifier, TaskSorter } from 'vs/workbench/parts/tasks/common/tasks';
 import { ITaskService, ITaskProvider, RunOptions, CustomizationProperties } from 'vs/workbench/parts/tasks/common/taskService';
-import { templates as taskTemplates } from 'vs/workbench/parts/tasks/common/taskTemplates';
+import { getTemplates as getTaskTemplates } from 'vs/workbench/parts/tasks/common/taskTemplates';
 
 import * as TaskConfig from '../node/taskConfiguration';
 import { ProcessTaskSystem } from 'vs/workbench/parts/tasks/node/processTaskSystem';
@@ -83,8 +84,6 @@ import { QuickOpenActionContributor } from '../browser/quickOpen';
 import { Themable, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_FOREGROUND } from 'vs/workbench/common/theme';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 
-import { ReloadWindowAction } from 'vs/workbench/electron-browser/actions';
-
 let $ = Builder.$;
 let tasksCategory = nls.localize('tasksCategory', "Tasks");
 
@@ -93,24 +92,6 @@ namespace ConfigureTaskAction {
 	export const TEXT = nls.localize('ConfigureTaskRunnerAction.label', "Configure Task");
 }
 
-class CloseMessageAction extends Action {
-
-	public static readonly ID = 'workbench.action.build.closeMessage';
-	public static readonly TEXT = nls.localize('CloseMessageAction.label', 'Close');
-
-	public closeFunction: () => void;
-
-	constructor() {
-		super(CloseMessageAction.ID, CloseMessageAction.TEXT);
-	}
-	public run(): TPromise<void> {
-		if (this.closeFunction) {
-			this.closeFunction();
-		}
-		return TPromise.as(undefined);
-	}
-}
-
 class BuildStatusBarItem extends Themable implements IStatusbarItem {
 	private activeCount: number;
 	private icons: HTMLElement[];
@@ -454,20 +435,6 @@ class TaskService implements ITaskService {
 	public static OutputChannelId: string = 'tasks';
 	public static OutputChannelLabel: string = nls.localize('tasks', "Tasks");
 
-	private configurationService: IConfigurationService;
-	private markerService: IMarkerService;
-	private outputService: IOutputService;
-	private messageService: IMessageService;
-	private choiceService: IChoiceService;
-	private fileService: IFileService;
-	private telemetryService: ITelemetryService;
-	private editorService: IWorkbenchEditorService;
-	private contextService: IWorkspaceContextService;
-	private textFileService: ITextFileService;
-	private modelService: IModelService;
-	private extensionService: IExtensionService;
-	private quickOpenService: IQuickOpenService;
-
 	private _configHasErrors: boolean;
 	private __schemaVersion: JsonSchemaVersion;
 	private __executionEngine: ExecutionEngine;
@@ -486,36 +453,28 @@ class TaskService implements ITaskService {
 	private _onDidStateChange: Emitter<TaskEvent>;
 
 	constructor(
-		@IConfigurationService configurationService: IConfigurationService,
-		@IMarkerService markerService: IMarkerService, @IOutputService outputService: IOutputService,
-		@IMessageService messageService: IMessageService, @IChoiceService choiceService: IChoiceService,
-		@IWorkbenchEditorService editorService: IWorkbenchEditorService,
-		@IFileService fileService: IFileService, @IWorkspaceContextService contextService: IWorkspaceContextService,
-		@ITelemetryService telemetryService: ITelemetryService, @ITextFileService textFileService: ITextFileService,
+		@IConfigurationService private configurationService: IConfigurationService,
+		@IMarkerService private markerService: IMarkerService,
+		@IOutputService private outputService: IOutputService,
+		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
+		@IFileService private fileService: IFileService,
+		@IWorkspaceContextService private contextService: IWorkspaceContextService,
+		@ITelemetryService private telemetryService: ITelemetryService,
+		@ITextFileService private textFileService: ITextFileService,
 		@ILifecycleService lifecycleService: ILifecycleService,
-		@IModelService modelService: IModelService, @IExtensionService extensionService: IExtensionService,
-		@IQuickOpenService quickOpenService: IQuickOpenService,
+		@IModelService private modelService: IModelService,
+		@IExtensionService private extensionService: IExtensionService,
+		@IQuickOpenService private quickOpenService: IQuickOpenService,
 		@IConfigurationResolverService private configurationResolverService: IConfigurationResolverService,
 		@ITerminalService private terminalService: ITerminalService,
 		@IStorageService private storageService: IStorageService,
 		@IProgressService2 private progressService: IProgressService2,
 		@IOpenerService private openerService: IOpenerService,
-		@IWindowService private _windowServive: IWindowService
+		@IWindowService private readonly _windowService: IWindowService,
+		@IConfirmationService private confirmationService: IConfirmationService,
+		@INotificationService private notificationService: INotificationService,
+		@IChoiceService private choiceService: IChoiceService
 	) {
-		this.configurationService = configurationService;
-		this.markerService = markerService;
-		this.outputService = outputService;
-		this.messageService = messageService;
-		this.choiceService = choiceService;
-		this.editorService = editorService;
-		this.fileService = fileService;
-		this.contextService = contextService;
-		this.telemetryService = telemetryService;
-		this.textFileService = textFileService;
-		this.modelService = modelService;
-		this.extensionService = extensionService;
-		this.quickOpenService = quickOpenService;
-
 		this._configHasErrors = false;
 		this._workspaceTasksPromise = undefined;
 		this._taskSystem = undefined;
@@ -532,19 +491,14 @@ class TaskService implements ITaskService {
 			let folderSetup = this.computeWorkspaceFolderSetup();
 			if (this.executionEngine !== folderSetup[2]) {
 				if (this._taskSystem && this._taskSystem.getActiveTasks().length > 0) {
-					this.messageService.show(
-						Severity.Info,
-						{
-							message: nls.localize(
-								'TaskSystem.noHotSwap',
-								'Changing the task execution engine with an active task running requires to reload the Window'
-							),
-							actions: [
-								new ReloadWindowAction(ReloadWindowAction.ID, ReloadWindowAction.LABEL, this._windowServive),
-								new CloseMessageAction()
-							]
+					this.choiceService.choose(Severity.Info, nls.localize(
+						'TaskSystem.noHotSwap',
+						'Changing the task execution engine with an active task running requires to reload the Window'
+					), [nls.localize('reloadWindow', "Reload Window")]).then(choice => {
+						if (choice === 0) {
+							this._windowService.reloadWindow();
 						}
-					);
+					});
 					return;
 				} else {
 					this.disposeTaskSystemListeners();
@@ -957,7 +911,7 @@ class TaskService implements ITaskService {
 		}
 		let configuration = this.getConfiguration(workspaceFolder);
 		if (configuration.hasParseErrors) {
-			this.messageService.show(Severity.Warning, nls.localize('customizeParseErrors', 'The current task configuration has errors. Please fix the errors first before customizing a task.'));
+			this.notificationService.warn(nls.localize('customizeParseErrors', 'The current task configuration has errors. Please fix the errors first before customizing a task.'));
 			return TPromise.wrap<void>(undefined);
 		}
 
@@ -1194,9 +1148,9 @@ class TaskService implements ITaskService {
 					let active = executeResult.active;
 					if (active.same) {
 						if (active.background) {
-							this.messageService.show(Severity.Info, nls.localize('TaskSystem.activeSame.background', 'The task \'{0}\' is already active and in background mode. To terminate it use `Terminate Task...` from the Tasks menu.', Task.getQualifiedLabel(task)));
+							this.notificationService.info(nls.localize('TaskSystem.activeSame.background', 'The task \'{0}\' is already active and in background mode. To terminate it use \'Terminate Task...\' from the Tasks menu.', Task.getQualifiedLabel(task)));
 						} else {
-							this.messageService.show(Severity.Info, nls.localize('TaskSystem.activeSame.noBackground', 'The task \'{0}\' is already active. To terminate it use `Terminate Task...` from the Tasks menu.', Task.getQualifiedLabel(task)));
+							this.notificationService.info(nls.localize('TaskSystem.activeSame.noBackground', 'The task \'{0}\' is already active. To terminate it use \'Terminate Task...\' from the Tasks menu.', Task.getQualifiedLabel(task)));
 						}
 					} else {
 						throw new TaskError(Severity.Warning, nls.localize('TaskSystem.active', 'There is already a task running. Terminate it first before executing another task.'), TaskErrors.RunningTask);
@@ -1215,7 +1169,7 @@ class TaskService implements ITaskService {
 			if (response.success) {
 				this.run(task);
 			} else {
-				this.messageService.show(Severity.Warning, nls.localize('TaskSystem.restartFailed', 'Failed to terminate and restart task {0}', Types.isString(task) ? task : task.name));
+				this.notificationService.warn(nls.localize('TaskSystem.restartFailed', 'Failed to terminate and restart task {0}', Types.isString(task) ? task : task.name));
 			}
 			return response;
 		});
@@ -1671,7 +1625,7 @@ class TaskService implements ITaskService {
 		if (this._taskSystem.canAutoTerminate()) {
 			terminatePromise = TPromise.wrap(true);
 		} else {
-			terminatePromise = this.messageService.confirm({
+			terminatePromise = this.confirmationService.confirm({
 				message: nls.localize('TaskSystem.runningTask', 'There is a task running. Do you want to terminate it?'),
 				primaryButton: nls.localize({ key: 'TaskSystem.terminateTask', comment: ['&& denotes a mnemonic'] }, "&&Terminate Task"),
 				type: 'question'
@@ -1696,7 +1650,7 @@ class TaskService implements ITaskService {
 						this.disposeTaskSystemListeners();
 						return false; // no veto
 					} else if (code && code === TerminateResponseCode.ProcessNotFound) {
-						return this.messageService.confirm({
+						return this.confirmationService.confirm({
 							message: nls.localize('TaskSystem.noProcess', 'The launched task doesn\'t exist anymore. If the task spawned background processes exiting VS Code might result in orphaned processes. To avoid this start the last background process with a wait flag.'),
 							primaryButton: nls.localize({ key: 'TaskSystem.exitAnyways', comment: ['&& denotes a mnemonic'] }, "&&Exit Anyways"),
 							type: 'info'
@@ -1728,24 +1682,23 @@ class TaskService implements ITaskService {
 			let needsConfig = buildError.code === TaskErrors.NotConfigured || buildError.code === TaskErrors.NoBuildTask || buildError.code === TaskErrors.NoTestTask;
 			let needsTerminate = buildError.code === TaskErrors.RunningTask;
 			if (needsConfig || needsTerminate) {
-				let closeAction = new CloseMessageAction();
 				let action: Action = needsConfig
 					? this.getConfigureAction(buildError.code)
 					: new Action(
 						'workbench.action.tasks.terminate',
 						nls.localize('TerminateAction.label', "Terminate Task"),
 						undefined, true, () => { this.runTerminateCommand(); return TPromise.wrap<void>(undefined); });
-				closeAction.closeFunction = this.messageService.show(buildError.severity, { message: buildError.message, actions: [action, closeAction] });
+				this.notificationService.notify({ severity: buildError.severity, message: buildError.message, actions: { primary: [action] } });
 			} else {
-				this.messageService.show(buildError.severity, buildError.message);
+				this.notificationService.notify({ severity: buildError.severity, message: buildError.message });
 			}
 		} else if (err instanceof Error) {
 			let error = <Error>err;
-			this.messageService.show(Severity.Error, error.message);
+			this.notificationService.error(error.message);
 		} else if (Types.isString(err)) {
-			this.messageService.show(Severity.Error, <string>err);
+			this.notificationService.error(<string>err);
 		} else {
-			this.messageService.show(Severity.Error, nls.localize('TaskSystem.unknownError', 'An error has occurred while running a task. See task log for details.'));
+			this.notificationService.error(nls.localize('TaskSystem.unknownError', 'An error has occurred while running a task. See task log for details.'));
 		}
 		if (showOutput) {
 			this.outputService.showChannel(this._outputChannel.id, true);
@@ -1754,7 +1707,7 @@ class TaskService implements ITaskService {
 
 	private canRunCommand(): boolean {
 		if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
-			this.messageService.show(Severity.Info, nls.localize('TaskService.noWorkspace', 'Tasks are only available on a workspace folder.'));
+			this.notificationService.info(nls.localize('TaskService.noWorkspace', 'Tasks are only available on a workspace folder.'));
 			return false;
 		}
 		return true;
@@ -1875,23 +1828,24 @@ class TaskService implements ITaskService {
 		if (this.ignoredWorkspaceFolders.length === 0 || !this.showIgnoreMessage) {
 			return TPromise.as(undefined);
 		}
-		let message: string = nls.localize('TaskService.ignoredFolder', 'The following workspace folders are ignored since they use task version 0.1.0: ');
-		for (let i = 0; i < this.ignoredWorkspaceFolders.length; i++) {
-			message = message + this.ignoredWorkspaceFolders[i].name;
-			if (i < this.ignoredWorkspaceFolders.length - 1) {
-				message = message + ', ';
-			}
-		}
 
-		let notAgain = nls.localize('TaskService.notAgain', 'Don\'t Show Again');
-		let ok = nls.localize('TaskService.ok', 'OK');
-		return this.choiceService.choose(Severity.Info, message, [notAgain, ok], 0).then((choice) => {
-			if (choice === 0) {
-				this.storageService.store(TaskService.IgnoreTask010DonotShowAgain_key, true, StorageScope.WORKSPACE);
+		this.notificationService.notify({
+			severity: Severity.Info,
+			message: nls.localize('TaskService.ignoredFolder', 'The following workspace folders are ignored since they use task version 0.1.0: {0}', this.ignoredWorkspaceFolders.map(f => f.name).join(', ')),
+			actions: {
+				secondary: [new Action('dontShowAgain', nls.localize('TaskService.notAgain', 'Don\'t Show Again'), null, true, (notification: IDisposable) => {
+					this.storageService.store(TaskService.IgnoreTask010DonotShowAgain_key, true, StorageScope.WORKSPACE);
+					this.__showIgnoreMessage = false;
+
+					// Hide notification
+					notification.dispose();
+
+					return TPromise.as(true);
+				})]
 			}
-			this.__showIgnoreMessage = false;
-			return undefined;
-		}, () => undefined);
+		});
+
+		return TPromise.as(undefined);
 	}
 
 	private runTaskCommand(accessor: ServicesAccessor, arg: any): void {
@@ -2072,9 +2026,9 @@ class TaskService implements ITaskService {
 							return;
 						}
 						if (response.code && response.code === TerminateResponseCode.ProcessNotFound) {
-							this.messageService.show(Severity.Error, nls.localize('TerminateAction.noProcess', 'The launched process doesn\'t exist anymore. If the task spawned background tasks exiting VS Code might result in orphaned processes.'));
+							this.notificationService.error(nls.localize('TerminateAction.noProcess', 'The launched process doesn\'t exist anymore. If the task spawned background tasks exiting VS Code might result in orphaned processes.'));
 						} else {
-							this.messageService.show(Severity.Error, nls.localize('TerminateAction.failed', 'Failed to terminate running task'));
+							this.notificationService.error(nls.localize('TerminateAction.failed', 'Failed to terminate running task'));
 						}
 					});
 				}
@@ -2129,7 +2083,7 @@ class TaskService implements ITaskService {
 				if (stat) {
 					return stat.resource;
 				}
-				return this.quickOpenService.pick(taskTemplates, { placeHolder: nls.localize('TaskService.template', 'Select a Task Template') }).then((selection) => {
+				return this.quickOpenService.pick(getTaskTemplates(), { placeHolder: nls.localize('TaskService.template', 'Select a Task Template') }).then((selection) => {
 					if (!selection) {
 						return undefined;
 					}
@@ -2306,7 +2260,7 @@ class TaskService implements ITaskService {
 					}
 				}
 				if (defaultTask) {
-					this.messageService.show(Severity.Info, nls.localize('TaskService.defaultTestTaskExists', '{0} is already marked as the default test task.', Task.getQualifiedLabel(defaultTask)));
+					this.notificationService.info(nls.localize('TaskService.defaultTestTaskExists', '{0} is already marked as the default test task.', Task.getQualifiedLabel(defaultTask)));
 					return;
 				}
 				this.showIgnoredFoldersMessage().then(() => {
@@ -2418,6 +2372,5 @@ schema.definitions = {
 };
 schema.oneOf = [...schemaVersion2.oneOf, ...schemaVersion1.oneOf];
 
-
 let jsonRegistry = <jsonContributionRegistry.IJSONContributionRegistry>Registry.as(jsonContributionRegistry.Extensions.JSONContribution);
 jsonRegistry.registerSchema(schemaId, schema);
diff --git a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
index e6c5d2bc254..050a1052adb 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
@@ -435,7 +435,7 @@ export class TerminalTaskSystem implements ITaskSystem {
 					if (!shellSpecified) {
 						toAdd.push('-Command');
 					}
-				} else if (basename === 'bash.exe') {
+				} else if (basename === 'bash.exe' || basename === 'zsh.exe') {
 					windowsShellArgs = false;
 					if (!shellSpecified) {
 						toAdd.push('-c');
diff --git a/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.ts b/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.ts
index 14553747832..1ba6c79b538 100644
--- a/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.ts
+++ b/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.ts
@@ -109,7 +109,7 @@ export class TerminalPickerHandler extends QuickOpenHandler {
 	}
 
 	private getTerminals(): TerminalEntry[] {
-		const terminals = this.terminalService.getInstanceLabels();
+		const terminals = this.terminalService.getTabLabels();
 		const terminalEntries = terminals.map(terminal => {
 			return new TerminalEntry(terminal, this.terminalService);
 		});
diff --git a/src/vs/workbench/parts/terminal/common/terminal.ts b/src/vs/workbench/parts/terminal/common/terminal.ts
index 78bb4ad8a6f..6f330309063 100644
--- a/src/vs/workbench/parts/terminal/common/terminal.ts
+++ b/src/vs/workbench/parts/terminal/common/terminal.ts
@@ -6,7 +6,7 @@
 
 import Event from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import { RawContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { RawContextKey, ContextKeyExpr, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 
@@ -144,25 +144,31 @@ export interface IShellLaunchConfig {
 export interface ITerminalService {
 	_serviceBrand: any;
 
-	activeTerminalInstanceIndex: number;
+	activeTabIndex: number;
 	configHelper: ITerminalConfigHelper;
-	onActiveInstanceChanged: Event<string>;
+	onActiveTabChanged: Event<void>;
+	onTabDisposed: Event<ITerminalTab>;
 	onInstanceDisposed: Event<ITerminalInstance>;
 	onInstanceProcessIdReady: Event<ITerminalInstance>;
-	onInstancesChanged: Event<string>;
+	onInstancesChanged: Event<void>;
 	onInstanceTitleChanged: Event<string>;
 	terminalInstances: ITerminalInstance[];
+	terminalTabs: ITerminalTab[];
 
 	createInstance(shell?: IShellLaunchConfig, wasNewTerminalAction?: boolean): ITerminalInstance;
 	getInstanceFromId(terminalId: number): ITerminalInstance;
 	getInstanceFromIndex(terminalIndex: number): ITerminalInstance;
-	getInstanceLabels(): string[];
+	getTabLabels(): string[];
 	getActiveInstance(): ITerminalInstance;
 	setActiveInstance(terminalInstance: ITerminalInstance): void;
 	setActiveInstanceByIndex(terminalIndex: number): void;
-	setActiveInstanceToNext(): void;
-	setActiveInstanceToPrevious(): void;
 	getActiveOrCreateInstance(wasNewTerminalAction?: boolean): ITerminalInstance;
+	splitInstance(instance: ITerminalInstance): void;
+
+	getActiveTab(): ITerminalTab;
+	setActiveTabToNext(): void;
+	setActiveTabToPrevious(): void;
+	setActiveTabByIndex(tabIndex: number): void;
 
 	showPanel(focus?: boolean): TPromise<void>;
 	hidePanel(): void;
@@ -176,6 +182,31 @@ export interface ITerminalService {
 	setWorkspaceShellAllowed(isAllowed: boolean): void;
 }
 
+export const enum Direction {
+	Left = 0,
+	Right = 1,
+	Up = 2,
+	Down = 3
+}
+
+export interface ITerminalTab {
+	activeInstance: ITerminalInstance;
+	terminalInstances: ITerminalInstance[];
+	title: string;
+	onDisposed: Event<ITerminalTab>;
+	onInstancesChanged: Event<void>;
+
+	focusPreviousPane(): void;
+	focusNextPane(): void;
+	resizePane(direction: Direction): void;
+	setActiveInstanceByIndex(index: number): void;
+	attachToElement(element: HTMLElement): void;
+	setVisible(visible: boolean): void;
+	layout(width: number, height: number): void;
+	addDisposable(disposable: IDisposable): void;
+	split(terminalFocusContextKey: IContextKey<boolean>, configHelper: ITerminalConfigHelper, shellLaunchConfig: IShellLaunchConfig): ITerminalInstance;
+}
+
 export interface ITerminalInstance {
 	/**
 	 * The ID of the terminal instance, this is an arbitrary number only used to identify the
@@ -198,6 +229,10 @@ export interface ITerminalInstance {
 	 */
 	onDisposed: Event<ITerminalInstance>;
 
+	onFocused: Event<ITerminalInstance>;
+
+	onProcessIdReady: Event<ITerminalInstance>;
+
 	/**
 	 * The title of the terminal. This is either title or the process currently running or an
 	 * explicit name given to the terminal instance through the extension API.
@@ -389,4 +424,6 @@ export interface ITerminalInstance {
 	 * Sets the title of the terminal instance.
 	 */
 	setTitle(title: string, eventFromProcess: boolean): void;
+
+	addDisposable(disposable: IDisposable): void;
 }
diff --git a/src/vs/workbench/parts/terminal/common/terminalService.ts b/src/vs/workbench/parts/terminal/common/terminalService.ts
index c8da8c1253d..6f97e2f97fa 100644
--- a/src/vs/workbench/parts/terminal/common/terminalService.ts
+++ b/src/vs/workbench/parts/terminal/common/terminalService.ts
@@ -9,7 +9,7 @@ import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/c
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
-import { ITerminalService, ITerminalInstance, IShellLaunchConfig, ITerminalConfigHelper, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE, TERMINAL_PANEL_ID } from 'vs/workbench/parts/terminal/common/terminal';
+import { ITerminalService, ITerminalInstance, IShellLaunchConfig, ITerminalConfigHelper, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE, TERMINAL_PANEL_ID, ITerminalTab } from 'vs/workbench/parts/terminal/common/terminal';
 import { TPromise } from 'vs/base/common/winjs.base';
 
 export abstract class TerminalService implements ITerminalService {
@@ -19,46 +19,50 @@ export abstract class TerminalService implements ITerminalService {
 	protected _terminalFocusContextKey: IContextKey<boolean>;
 	protected _findWidgetVisible: IContextKey<boolean>;
 	protected _terminalContainer: HTMLElement;
-	protected _onInstancesChanged: Emitter<string>;
+	protected _onInstancesChanged: Emitter<void>;
+	protected _onTabDisposed: Emitter<ITerminalTab>;
 	protected _onInstanceDisposed: Emitter<ITerminalInstance>;
 	protected _onInstanceProcessIdReady: Emitter<ITerminalInstance>;
 	protected _onInstanceTitleChanged: Emitter<string>;
-	protected _terminalInstances: ITerminalInstance[];
+	protected _terminalTabs: ITerminalTab[];
+	protected abstract _terminalInstances: ITerminalInstance[];
 
-	private _activeTerminalInstanceIndex: number;
-	private _onActiveInstanceChanged: Emitter<string>;
+	private _activeTabIndex: number;
+	private _onActiveTabChanged: Emitter<void>;
 
-	public get activeTerminalInstanceIndex(): number { return this._activeTerminalInstanceIndex; }
-	public get onActiveInstanceChanged(): Event<string> { return this._onActiveInstanceChanged.event; }
+	public get activeTabIndex(): number { return this._activeTabIndex; }
+	public get onActiveTabChanged(): Event<void> { return this._onActiveTabChanged.event; }
+	public get onTabDisposed(): Event<ITerminalTab> { return this._onTabDisposed.event; }
 	public get onInstanceDisposed(): Event<ITerminalInstance> { return this._onInstanceDisposed.event; }
 	public get onInstanceProcessIdReady(): Event<ITerminalInstance> { return this._onInstanceProcessIdReady.event; }
 	public get onInstanceTitleChanged(): Event<string> { return this._onInstanceTitleChanged.event; }
-	public get onInstancesChanged(): Event<string> { return this._onInstancesChanged.event; }
+	public get onInstancesChanged(): Event<void> { return this._onInstancesChanged.event; }
 	public get terminalInstances(): ITerminalInstance[] { return this._terminalInstances; }
+	public get terminalTabs(): ITerminalTab[] { return this._terminalTabs; }
 
 	public abstract get configHelper(): ITerminalConfigHelper;
 
 	constructor(
-		@IContextKeyService private _contextKeyService: IContextKeyService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 		@IPanelService protected _panelService: IPanelService,
-		@IPartService private _partService: IPartService,
+		@IPartService private readonly _partService: IPartService,
 		@ILifecycleService lifecycleService: ILifecycleService
 	) {
-		this._terminalInstances = [];
-		this._activeTerminalInstanceIndex = 0;
+		this._activeTabIndex = 0;
 		this._isShuttingDown = false;
 
-		this._onActiveInstanceChanged = new Emitter<string>();
+		this._onActiveTabChanged = new Emitter<void>();
+		this._onTabDisposed = new Emitter<ITerminalTab>();
 		this._onInstanceDisposed = new Emitter<ITerminalInstance>();
 		this._onInstanceProcessIdReady = new Emitter<ITerminalInstance>();
 		this._onInstanceTitleChanged = new Emitter<string>();
-		this._onInstancesChanged = new Emitter<string>();
+		this._onInstancesChanged = new Emitter<void>();
 
 		lifecycleService.onWillShutdown(event => event.veto(this._onWillShutdown()));
 		lifecycleService.onShutdown(() => this._onShutdown());
 		this._terminalFocusContextKey = KEYBINDING_CONTEXT_TERMINAL_FOCUS.bindTo(this._contextKeyService);
 		this._findWidgetVisible = KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE.bindTo(this._contextKeyService);
-		this.onInstanceDisposed((terminalInstance) => { this._removeInstance(terminalInstance); });
+		this.onTabDisposed(tab => this._removeTab(tab));
 	}
 
 	protected abstract _showTerminalCloseConfirmation(): TPromise<boolean>;
@@ -89,46 +93,57 @@ export abstract class TerminalService implements ITerminalService {
 	}
 
 	private _onShutdown(): void {
-		this.terminalInstances.forEach(instance => {
-			instance.dispose();
-		});
+		this.terminalInstances.forEach(instance => instance.dispose());
 	}
 
-	public getInstanceLabels(): string[] {
-		return this._terminalInstances.map((instance, index) => `${index + 1}: ${instance.title}`);
+	public getTabLabels(): string[] {
+		return this._terminalTabs.filter(tab => tab.terminalInstances.length > 0).map((tab, index) => `${index + 1}: ${tab.title}`);
 	}
 
-	private _removeInstance(terminalInstance: ITerminalInstance): void {
-		let index = this.terminalInstances.indexOf(terminalInstance);
-		let wasActiveInstance = terminalInstance === this.getActiveInstance();
+	private _removeTab(tab: ITerminalTab): void {
+		// Get the index of the tab and remove it from the list
+		const index = this._terminalTabs.indexOf(tab);
+		const wasActiveTab = tab === this.getActiveTab();
 		if (index !== -1) {
-			this.terminalInstances.splice(index, 1);
+			this._terminalTabs.splice(index, 1);
 		}
-		if (wasActiveInstance && this.terminalInstances.length > 0) {
-			let newIndex = index < this.terminalInstances.length ? index : this.terminalInstances.length - 1;
-			this.setActiveInstanceByIndex(newIndex);
-			if (terminalInstance.hadFocusOnExit) {
-				this.getActiveInstance().focus(true);
-			}
+
+		// Adjust focus if the tab was active
+		if (wasActiveTab && this._terminalTabs.length > 0) {
+			// TODO: Only focus the new tab if the removed tab had focus?
+			// const hasFocusOnExit = tab.activeInstance.hadFocusOnExit;
+			let newIndex = index < this._terminalTabs.length ? index : this._terminalTabs.length - 1;
+			this.setActiveTabByIndex(newIndex);
+			this.getActiveInstance().focus(true);
 		}
+
 		// Hide the panel if there are no more instances, provided that VS Code is not shutting
 		// down. When shutting down the panel is locked in place so that it is restored upon next
 		// launch.
-		if (this.terminalInstances.length === 0 && !this._isShuttingDown) {
+		if (this._terminalTabs.length === 0 && !this._isShuttingDown) {
 			this.hidePanel();
 		}
+
+		// Fire events
 		this._onInstancesChanged.fire();
-		if (wasActiveInstance) {
-			this._onActiveInstanceChanged.fire();
+		if (wasActiveTab) {
+			this._onActiveTabChanged.fire();
 		}
 	}
 
-	public getActiveInstance(): ITerminalInstance {
-		if (this.activeTerminalInstanceIndex < 0 || this.activeTerminalInstanceIndex >= this.terminalInstances.length) {
+	public getActiveTab(): ITerminalTab {
+		if (this._activeTabIndex < 0 || this._activeTabIndex >= this._terminalTabs.length) {
 			return null;
-
 		}
-		return this.terminalInstances[this.activeTerminalInstanceIndex];
+		return this._terminalTabs[this._activeTabIndex];
+	}
+
+	public getActiveInstance(): ITerminalInstance {
+		const tab = this.getActiveTab();
+		if (!tab) {
+			return null;
+		}
+		return tab.activeInstance;
 	}
 
 	public getInstanceFromId(terminalId: number): ITerminalInstance {
@@ -143,41 +158,105 @@ export abstract class TerminalService implements ITerminalService {
 		this.setActiveInstanceByIndex(this._getIndexFromId(terminalInstance.id));
 	}
 
-	public setActiveInstanceByIndex(terminalIndex: number): void {
-		if (terminalIndex >= this._terminalInstances.length) {
+	public setActiveTabByIndex(tabIndex: number): void {
+		if (tabIndex >= this._terminalTabs.length) {
 			return;
 		}
-		const didInstanceChange = this._activeTerminalInstanceIndex !== terminalIndex;
-		this._activeTerminalInstanceIndex = terminalIndex;
-		this._terminalInstances.forEach((terminalInstance, i) => {
-			terminalInstance.setVisible(i === terminalIndex);
-		});
-		// Only fire the event if there was a change
-		if (didInstanceChange) {
-			this._onActiveInstanceChanged.fire();
+
+		const didTabChange = this._activeTabIndex !== tabIndex;
+		this._activeTabIndex = tabIndex;
+
+		this._terminalTabs.forEach((t, i) => t.setVisible(i === this._activeTabIndex));
+		if (didTabChange) {
+			this._onActiveTabChanged.fire();
 		}
 	}
 
-	public setActiveInstanceToNext(): void {
-		if (this.terminalInstances.length <= 1) {
+	private _getInstanceFromGlobalInstanceIndex(index: number): { tab: ITerminalTab, tabIndex: number, instance: ITerminalInstance, localInstanceIndex: number } {
+		let currentTabIndex = 0;
+		while (index >= 0 && currentTabIndex < this._terminalTabs.length) {
+			const tab = this._terminalTabs[currentTabIndex];
+			const count = tab.terminalInstances.length;
+			if (index < count) {
+				return {
+					tab,
+					tabIndex: currentTabIndex,
+					instance: tab.terminalInstances[index],
+					localInstanceIndex: index
+				};
+			}
+			index -= count;
+			currentTabIndex++;
+		}
+		return null;
+	}
+
+	public setActiveInstanceByIndex(terminalIndex: number): void {
+		const query = this._getInstanceFromGlobalInstanceIndex(terminalIndex);
+		if (!query) {
 			return;
 		}
-		let newIndex = this._activeTerminalInstanceIndex + 1;
-		if (newIndex >= this.terminalInstances.length) {
+
+		query.tab.setActiveInstanceByIndex(query.localInstanceIndex);
+		const didTabChange = this._activeTabIndex !== query.tabIndex;
+		this._activeTabIndex = query.tabIndex;
+		this._terminalTabs.forEach((t, i) => t.setVisible(i === query.tabIndex));
+
+		// Only fire the event if there was a change
+		if (didTabChange) {
+			this._onActiveTabChanged.fire();
+		}
+	}
+
+	public setActiveTabToNext(): void {
+		if (this._terminalTabs.length <= 1) {
+			return;
+		}
+		let newIndex = this._activeTabIndex + 1;
+		if (newIndex >= this._terminalTabs.length) {
 			newIndex = 0;
 		}
-		this.setActiveInstanceByIndex(newIndex);
+		this.setActiveTabByIndex(newIndex);
 	}
 
-	public setActiveInstanceToPrevious(): void {
-		if (this.terminalInstances.length <= 1) {
+	public setActiveTabToPrevious(): void {
+		if (this._terminalTabs.length <= 1) {
 			return;
 		}
-		let newIndex = this._activeTerminalInstanceIndex - 1;
+		let newIndex = this._activeTabIndex - 1;
 		if (newIndex < 0) {
-			newIndex = this.terminalInstances.length - 1;
+			newIndex = this._terminalTabs.length - 1;
 		}
-		this.setActiveInstanceByIndex(newIndex);
+		this.setActiveTabByIndex(newIndex);
+	}
+
+	public splitInstance(instanceToSplit: ITerminalInstance): void {
+		const tab = this._getTabForInstance(instanceToSplit);
+		if (!tab) {
+			return;
+		}
+
+		const instance = tab.split(this._terminalFocusContextKey, this.configHelper, {});
+		this._initInstanceListeners(instance);
+		this._onInstancesChanged.fire();
+
+		this._terminalTabs.forEach((t, i) => t.setVisible(i === this._activeTabIndex));
+	}
+
+	protected _initInstanceListeners(instance: ITerminalInstance): void {
+		instance.addDisposable(instance.onDisposed(this._onInstanceDisposed.fire, this._onInstanceDisposed));
+		instance.addDisposable(instance.onTitleChanged(this._onInstanceTitleChanged.fire, this._onInstanceTitleChanged));
+		instance.addDisposable(instance.onProcessIdReady(this._onInstanceProcessIdReady.fire, this._onInstanceProcessIdReady));
+	}
+
+	private _getTabForInstance(instance: ITerminalInstance): ITerminalTab {
+		for (let i = 0; i < this._terminalTabs.length; i++) {
+			const tab = this._terminalTabs[i];
+			if (tab.terminalInstances.indexOf(instance) !== -1) {
+				return tab;
+			}
+		}
+		return null;
 	}
 
 	public showPanel(focus?: boolean): TPromise<void> {
diff --git a/src/vs/workbench/parts/terminal/electron-browser/media/scrollbar.css b/src/vs/workbench/parts/terminal/electron-browser/media/scrollbar.css
index ebe03196593..55ccd4c3e6c 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/media/scrollbar.css
+++ b/src/vs/workbench/parts/terminal/electron-browser/media/scrollbar.css
@@ -6,6 +6,7 @@
 .monaco-workbench .panel.integrated-terminal .xterm-viewport {
 	/* Use the hack presented in http://stackoverflow.com/a/38748186/1156119 to get opacity transitions working on the scrollbar */
 	-webkit-background-clip: text;
+	background-clip: text;
 	-webkit-text-fill-color: transparent;
 	transition: background-color 800ms linear;
 }
diff --git a/src/vs/workbench/parts/terminal/electron-browser/media/terminal.css b/src/vs/workbench/parts/terminal/electron-browser/media/terminal.css
index 5ce4d42203a..92773886fc8 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/media/terminal.css
+++ b/src/vs/workbench/parts/terminal/electron-browser/media/terminal.css
@@ -15,14 +15,17 @@
 
 .monaco-workbench .panel.integrated-terminal .terminal-outer-container {
 	height: 100%;
-	padding-left: 20px; /*Don't use right padding in case xterm.js misbehaves*/
-	padding-bottom: 2px;
 	width: 100%;
 	box-sizing: border-box;
 }
 
+.monaco-workbench .panel.integrated-terminal .terminal-tab {
+	height: 100%;
+}
+
 .monaco-workbench .panel.integrated-terminal .terminal-wrapper {
 	display: none;
+	margin: 0 20px;
 }
 .monaco-workbench .panel.integrated-terminal .terminal-wrapper.active {
 	display: block;
@@ -30,6 +33,12 @@
 	bottom: 2px; /* Matches padding-bottom on .terminal-outer-container */
 	top: 0;
 }
+.monaco-workbench .panel.integrated-terminal .monaco-split-view2.horizontal .split-view-view:not(:first-of-type) .terminal-wrapper {
+	margin-left: 10px;
+}
+.monaco-workbench .panel.integrated-terminal .monaco-split-view2.horizontal .split-view-view:not(:last-of-type) .terminal-wrapper {
+	margin-right: 10px;
+}
 
 .monaco-workbench .panel.integrated-terminal .xterm a:not(.xterm-invalid-link) {
 	/* To support message box sizing */
@@ -43,6 +52,9 @@
 .monaco-workbench .panel.integrated-terminal .xterm-viewport {
 	margin-right: -20px;
 }
+.monaco-workbench .panel.integrated-terminal .monaco-split-view2.horizontal .split-view-view:not(:only-of-type) .xterm-viewport {
+	margin-right: -10px;
+}
 
 .monaco-workbench .panel.integrated-terminal canvas {
 	/* Align the viewport and canvases to the bottom of the panel */
@@ -58,6 +70,22 @@
 	font-variant-ligatures: none;
 }
 
+.monaco-workbench .panel.integrated-terminal .split-view-view {
+	/* Make relative as terminal absolute positioning needs it deeper in the tree */
+	position: relative;
+	box-sizing: border-box;
+}
+
+/* border-color is set by theme key terminal.border */
+.monaco-workbench .panel.integrated-terminal .monaco-split-view2.horizontal .split-view-view:not(:first-child) {
+	border-left-width: 1px;
+	border-left-style: solid;
+}
+.monaco-workbench .panel.integrated-terminal .monaco-split-view2.vertical .split-view-view:not(:first-child) {
+	border-top-width: 1px;
+	border-top-style: solid;
+}
+
 .monaco-workbench .panel.integrated-terminal.enable-ligatures {
 	font-variant-ligatures: normal;
 }
@@ -88,12 +116,18 @@
 .hc-black .monaco-workbench .panel.integrated-terminal .xterm:focus::before {
 	display: block;
 	content: "";
-	border: 2px solid #f38518;
+	border: 1px solid;
 	position: absolute;
 	left: -5px;
 	top: 0;
 	right: -5px;
 	bottom: 0;
+	z-index: 10;
+}
+
+.hc-black .monaco-workbench .panel.integrated-terminal .monaco-split-view2.horizontal .split-view-view:not(:only-child) .xterm.focus::before,
+.hc-black .monaco-workbench .panel.integrated-terminal .monaco-split-view2.horizontal .split-view-view:not(:only-child) .xterm:focus::before {
+	right: 0;
 }
 
 .monaco-workbench .panel.integrated-terminal .xterm .xterm-helpers {
@@ -106,8 +140,6 @@
 	opacity: 0 !important;
 }
 
-/* Terminal actions */
-
 /* Light theme */
 .monaco-workbench .terminal-action.kill { background: url('kill.svg') center center no-repeat; }
 .monaco-workbench .terminal-action.new { background: url('new.svg') center center no-repeat; }
diff --git a/src/vs/workbench/parts/terminal/electron-browser/media/xterm.css b/src/vs/workbench/parts/terminal/electron-browser/media/xterm.css
index 6068c9445bd..58a8c3baf24 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/media/xterm.css
+++ b/src/vs/workbench/parts/terminal/electron-browser/media/xterm.css
@@ -99,9 +99,19 @@
 	/* On OS X this is required in order for the scroll bar to appear fully opaque */
 	background-color: #000;
 	overflow-y: scroll;
+	cursor: default;
+	position: absolute;
+	right: 0;
+	left: 0;
+	top: 0;
+	bottom: 0;
 }
 
-.xterm canvas {
+.xterm .xterm-screen {
+	position: relative;
+}
+
+.xterm .xterm-screen canvas {
 	position: absolute;
 	left: 0;
 	top: 0;
@@ -127,16 +137,14 @@
 	cursor: text;
 }
 
-.xterm .xterm-accessibility {
+.xterm .xterm-accessibility,
+.xterm .xterm-message {
 	position: absolute;
 	left: 0;
 	top: 0;
 	bottom: 0;
 	right: 0;
 	z-index: 100;
-}
-
-.xterm .xterm-accessibility-tree {
 	color: transparent;
 }
 
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
index 51db98bf363..781b10d3689 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
@@ -14,11 +14,11 @@ import * as platform from 'vs/base/common/platform';
 import * as terminalCommands from 'vs/workbench/parts/terminal/electron-browser/terminalCommands';
 import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
 import { ITerminalService, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, TERMINAL_PANEL_ID, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE, TerminalCursorStyle } from 'vs/workbench/parts/terminal/common/terminal';
-import { TERMINAL_DEFAULT_SHELL_UNIX_LIKE, TERMINAL_DEFAULT_SHELL_WINDOWS } from 'vs/workbench/parts/terminal/electron-browser/terminal';
+import { getTerminalDefaultShellUnixLike, getTerminalDefaultShellWindows } from 'vs/workbench/parts/terminal/electron-browser/terminal';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KillTerminalAction, CopyTerminalSelectionAction, CreateNewTerminalAction, CreateNewInActiveWorkspaceTerminalAction, FocusActiveTerminalAction, FocusNextTerminalAction, FocusPreviousTerminalAction, SelectDefaultShellWindowsTerminalAction, RunSelectedTextInTerminalAction, RunActiveFileInTerminalAction, ScrollDownTerminalAction, ScrollDownPageTerminalAction, ScrollToBottomTerminalAction, ScrollUpTerminalAction, ScrollUpPageTerminalAction, ScrollToTopTerminalAction, TerminalPasteAction, ToggleTerminalAction, ClearTerminalAction, AllowWorkspaceShellTerminalCommand, DisallowWorkspaceShellTerminalCommand, RenameTerminalAction, SelectAllTerminalAction, FocusTerminalFindWidgetAction, HideTerminalFindWidgetAction, ShowNextFindTermTerminalFindWidgetAction, ShowPreviousFindTermTerminalFindWidgetAction, DeleteWordLeftTerminalAction, DeleteWordRightTerminalAction, QuickOpenActionTermContributor, QuickOpenTermAction, TERMINAL_PICKER_PREFIX, MoveToLineStartTerminalAction, MoveToLineEndTerminalAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
+import { KillTerminalAction, CopyTerminalSelectionAction, CreateNewTerminalAction, CreateNewInActiveWorkspaceTerminalAction, FocusActiveTerminalAction, FocusNextTerminalAction, FocusPreviousTerminalAction, SelectDefaultShellWindowsTerminalAction, RunSelectedTextInTerminalAction, RunActiveFileInTerminalAction, ScrollDownTerminalAction, ScrollDownPageTerminalAction, ScrollToBottomTerminalAction, ScrollUpTerminalAction, ScrollUpPageTerminalAction, ScrollToTopTerminalAction, TerminalPasteAction, ToggleTerminalAction, ClearTerminalAction, AllowWorkspaceShellTerminalCommand, DisallowWorkspaceShellTerminalCommand, RenameTerminalAction, SelectAllTerminalAction, FocusTerminalFindWidgetAction, HideTerminalFindWidgetAction, ShowNextFindTermTerminalFindWidgetAction, ShowPreviousFindTermTerminalFindWidgetAction, DeleteWordLeftTerminalAction, DeleteWordRightTerminalAction, QuickOpenActionTermContributor, QuickOpenTermAction, TERMINAL_PICKER_PREFIX, MoveToLineStartTerminalAction, MoveToLineEndTerminalAction, SplitTerminalAction, FocusPreviousPaneTerminalAction, FocusNextPaneTerminalAction, ResizePaneLeftTerminalAction, ResizePaneRightTerminalAction, ResizePaneUpTerminalAction, ResizePaneDownTerminalAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ShowAllCommandsAction } from 'vs/workbench/parts/quickopen/browser/commandsHandler';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
@@ -76,7 +76,7 @@ configurationRegistry.registerConfiguration({
 		'terminal.integrated.shell.linux': {
 			'description': nls.localize('terminal.integrated.shell.linux', "The path of the shell that the terminal uses on Linux."),
 			'type': 'string',
-			'default': TERMINAL_DEFAULT_SHELL_UNIX_LIKE
+			'default': getTerminalDefaultShellUnixLike()
 		},
 		'terminal.integrated.shellArgs.linux': {
 			'description': nls.localize('terminal.integrated.shellArgs.linux', "The command line arguments to use when on the Linux terminal."),
@@ -89,7 +89,7 @@ configurationRegistry.registerConfiguration({
 		'terminal.integrated.shell.osx': {
 			'description': nls.localize('terminal.integrated.shell.osx', "The path of the shell that the terminal uses on OS X."),
 			'type': 'string',
-			'default': TERMINAL_DEFAULT_SHELL_UNIX_LIKE
+			'default': getTerminalDefaultShellUnixLike()
 		},
 		'terminal.integrated.shellArgs.osx': {
 			'description': nls.localize('terminal.integrated.shellArgs.osx', "The command line arguments to use when on the OS X terminal."),
@@ -105,7 +105,7 @@ configurationRegistry.registerConfiguration({
 		'terminal.integrated.shell.windows': {
 			'description': nls.localize('terminal.integrated.shell.windows', "The path of the shell that the terminal uses on Windows. When using shells shipped with Windows (cmd, PowerShell or Bash on Ubuntu)."),
 			'type': 'string',
-			'default': TERMINAL_DEFAULT_SHELL_WINDOWS
+			'default': getTerminalDefaultShellWindows()
 		},
 		'terminal.integrated.shellArgs.windows': {
 			'description': nls.localize('terminal.integrated.shellArgs.windows', "The command line arguments to use when on the Windows terminal."),
@@ -272,7 +272,14 @@ configurationRegistry.registerConfiguration({
 				MoveToLineStartTerminalAction.ID,
 				MoveToLineEndTerminalAction.ID,
 				TogglePanelAction.ID,
-				'workbench.action.quickOpenView'
+				'workbench.action.quickOpenView',
+				SplitTerminalAction.ID,
+				FocusPreviousPaneTerminalAction.ID,
+				FocusNextPaneTerminalAction.ID,
+				ResizePaneLeftTerminalAction.ID,
+				ResizePaneRightTerminalAction.ID,
+				ResizePaneUpTerminalAction.ID,
+				ResizePaneDownTerminalAction.ID
 			].sort()
 		},
 		'terminal.integrated.env.osx': {
@@ -409,6 +416,45 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(MoveToLineEndTer
 	primary: null,
 	mac: { primary: KeyMod.CtrlCmd | KeyCode.RightArrow }
 }, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Move To Line End', category);
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(SplitTerminalAction, SplitTerminalAction.ID, SplitTerminalAction.LABEL, {
+	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_5,
+	mac: {
+		primary: KeyMod.CtrlCmd | KeyCode.KEY_D,
+		secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_5]
+	}
+}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Split', category);
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FocusPreviousPaneTerminalAction, FocusPreviousPaneTerminalAction.ID, FocusPreviousPaneTerminalAction.LABEL, {
+	primary: KeyMod.Alt | KeyCode.LeftArrow,
+	secondary: [KeyMod.Alt | KeyCode.UpArrow],
+	mac: {
+		primary: KeyMod.Alt | KeyMod.CtrlCmd | KeyCode.LeftArrow,
+		secondary: [KeyMod.Alt | KeyMod.CtrlCmd | KeyCode.UpArrow]
+	}
+}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Focus Previous Pane', category);
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FocusNextPaneTerminalAction, FocusNextPaneTerminalAction.ID, FocusNextPaneTerminalAction.LABEL, {
+	primary: KeyMod.Alt | KeyCode.RightArrow,
+	secondary: [KeyMod.Alt | KeyCode.DownArrow],
+	mac: {
+		primary: KeyMod.Alt | KeyMod.CtrlCmd | KeyCode.RightArrow,
+		secondary: [KeyMod.Alt | KeyMod.CtrlCmd | KeyCode.DownArrow]
+	}
+}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Focus Next Pane', category);
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ResizePaneLeftTerminalAction, ResizePaneLeftTerminalAction.ID, ResizePaneLeftTerminalAction.LABEL, {
+	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.LeftArrow,
+	mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.LeftArrow }
+}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Resize Pane Left', category);
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ResizePaneRightTerminalAction, ResizePaneRightTerminalAction.ID, ResizePaneRightTerminalAction.LABEL, {
+	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.RightArrow,
+	mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.RightArrow }
+}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Resize Pane Right', category);
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ResizePaneUpTerminalAction, ResizePaneUpTerminalAction.ID, ResizePaneUpTerminalAction.LABEL, {
+	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.UpArrow,
+	mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.UpArrow }
+}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Resize Pane Up', category);
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ResizePaneDownTerminalAction, ResizePaneDownTerminalAction.ID, ResizePaneDownTerminalAction.LABEL, {
+	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.DownArrow,
+	mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.DownArrow }
+}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Resize Pane Down', category);
 
 terminalCommands.setup();
 
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.ts
index b73b020260e..620dcf23b9f 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminal.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.ts
@@ -9,21 +9,32 @@ import * as platform from 'vs/base/common/platform';
 import * as processes from 'vs/base/node/processes';
 import { readFile, fileExists } from 'vs/base/node/pfs';
 
-let unixLikeTerminal = 'sh';
-if (!platform.isWindows && process.env.SHELL) {
-	unixLikeTerminal = process.env.SHELL;
-	// Some systems have $SHELL set to /bin/false which breaks the terminal
-	if (unixLikeTerminal === '/bin/false') {
-		unixLikeTerminal = '/bin/bash';
+let _TERMINAL_DEFAULT_SHELL_UNIX_LIKE: string = null;
+export function getTerminalDefaultShellUnixLike(): string {
+	if (!_TERMINAL_DEFAULT_SHELL_UNIX_LIKE) {
+		let unixLikeTerminal = 'sh';
+		if (!platform.isWindows && process.env.SHELL) {
+			unixLikeTerminal = process.env.SHELL;
+			// Some systems have $SHELL set to /bin/false which breaks the terminal
+			if (unixLikeTerminal === '/bin/false') {
+				unixLikeTerminal = '/bin/bash';
+			}
+		}
+		_TERMINAL_DEFAULT_SHELL_UNIX_LIKE = unixLikeTerminal;
 	}
+	return _TERMINAL_DEFAULT_SHELL_UNIX_LIKE;
 }
-export const TERMINAL_DEFAULT_SHELL_UNIX_LIKE = unixLikeTerminal;
 
-const isAtLeastWindows10 = platform.isWindows && parseFloat(os.release()) >= 10;
-const is32ProcessOn64Windows = process.env.hasOwnProperty('PROCESSOR_ARCHITEW6432');
-const powerShellPath = `${process.env.windir}\\${is32ProcessOn64Windows ? 'Sysnative' : 'System32'}\\WindowsPowerShell\\v1.0\\powershell.exe`;
-
-export const TERMINAL_DEFAULT_SHELL_WINDOWS = isAtLeastWindows10 ? powerShellPath : processes.getWindowsShell();
+let _TERMINAL_DEFAULT_SHELL_WINDOWS: string = null;
+export function getTerminalDefaultShellWindows(): string {
+	if (!_TERMINAL_DEFAULT_SHELL_WINDOWS) {
+		const isAtLeastWindows10 = platform.isWindows && parseFloat(os.release()) >= 10;
+		const is32ProcessOn64Windows = process.env.hasOwnProperty('PROCESSOR_ARCHITEW6432');
+		const powerShellPath = `${process.env.windir}\\${is32ProcessOn64Windows ? 'Sysnative' : 'System32'}\\WindowsPowerShell\\v1.0\\powershell.exe`;
+		_TERMINAL_DEFAULT_SHELL_WINDOWS = isAtLeastWindows10 ? powerShellPath : processes.getWindowsShell();
+	}
+	return _TERMINAL_DEFAULT_SHELL_WINDOWS;
+}
 
 if (platform.isLinux) {
 	const file = '/etc/os-release';
@@ -40,4 +51,4 @@ if (platform.isLinux) {
 	});
 }
 
-export let isFedora = false;
\ No newline at end of file
+export let isFedora = false;
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
index 001c4303a1f..abf78d774e6 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
@@ -8,13 +8,12 @@ import * as os from 'os';
 import { Action, IAction } from 'vs/base/common/actions';
 import { EndOfLinePreference } from 'vs/editor/common/model';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { ITerminalService, TERMINAL_PANEL_ID, ITerminalInstance } from 'vs/workbench/parts/terminal/common/terminal';
+import { ITerminalService, TERMINAL_PANEL_ID, ITerminalInstance, Direction } from 'vs/workbench/parts/terminal/common/terminal';
 import { SelectActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { TogglePanelAction } from 'vs/workbench/browser/panel';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IQuickOpenService, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
@@ -25,6 +24,7 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/workspaceCommands';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export const TERMINAL_PICKER_PREFIX = 'term ';
 
@@ -99,9 +99,9 @@ export class QuickKillTerminalAction extends Action {
 		if (terminal) {
 			terminal.dispose();
 		}
-		if (this.terminalService.terminalInstances.length > 0 && this.terminalService.activeTerminalInstanceIndex !== terminalIndex) {
-			this.terminalService.setActiveInstanceByIndex(Math.min(terminalIndex, this.terminalService.terminalInstances.length - 1));
-		}
+		// if (this.terminalService.terminalInstances.length > 0 && this.terminalService.activeTerminalInstanceIndex !== terminalIndex) {
+		// 	this.terminalService.setActiveInstanceByIndex(Math.min(terminalIndex, this.terminalService.terminalInstances.length - 1));
+		// }
 		return TPromise.timeout(50).then(result => this.quickOpenService.show(TERMINAL_PICKER_PREFIX, null));
 	}
 }
@@ -157,7 +157,7 @@ export abstract class BaseSendTextTerminalAction extends Action {
 		id: string,
 		label: string,
 		private _text: string,
-		@ITerminalService private _terminalService: ITerminalService
+		@ITerminalService private readonly _terminalService: ITerminalService
 	) {
 		super(id, label);
 	}
@@ -296,6 +296,135 @@ export class CreateNewInActiveWorkspaceTerminalAction extends Action {
 	}
 }
 
+export class SplitTerminalAction extends Action {
+	public static readonly ID = 'workbench.action.terminal.split';
+	public static readonly LABEL = nls.localize('workbench.action.terminal.split', "Split Terminal");
+
+	constructor(
+		id: string, label: string,
+		@ITerminalService private readonly _terminalService: ITerminalService
+	) {
+		super(id, label);
+	}
+
+	public run(event?: any): TPromise<any> {
+		const instance = this._terminalService.getActiveInstance();
+		if (!instance) {
+			return TPromise.as(void 0);
+		}
+		this._terminalService.splitInstance(instance);
+		return this._terminalService.showPanel(true);
+	}
+}
+
+export class FocusPreviousPaneTerminalAction extends Action {
+	public static readonly ID = 'workbench.action.terminal.focusPreviousPane';
+	public static readonly LABEL = nls.localize('workbench.action.terminal.focusPreviousPane', "Focus Previous Pane");
+
+	constructor(
+		id: string, label: string,
+		@ITerminalService private readonly _terminalService: ITerminalService
+	) {
+		super(id, label);
+	}
+
+	public run(event?: any): TPromise<any> {
+		const tab = this._terminalService.getActiveTab();
+		if (!tab) {
+			return TPromise.as(void 0);
+		}
+		tab.focusPreviousPane();
+		return this._terminalService.showPanel(true);
+	}
+}
+
+export class FocusNextPaneTerminalAction extends Action {
+	public static readonly ID = 'workbench.action.terminal.focusNextPane';
+	public static readonly LABEL = nls.localize('workbench.action.terminal.focusNextPane', "Focus Next Pane");
+
+	constructor(
+		id: string, label: string,
+		@ITerminalService private readonly _terminalService: ITerminalService
+	) {
+		super(id, label);
+	}
+
+	public run(event?: any): TPromise<any> {
+		const tab = this._terminalService.getActiveTab();
+		if (!tab) {
+			return TPromise.as(void 0);
+		}
+		tab.focusNextPane();
+		return this._terminalService.showPanel(true);
+	}
+}
+
+export abstract class BaseFocusDirectionTerminalAction extends Action {
+	constructor(
+		id: string, label: string,
+		private _direction: Direction,
+		@ITerminalService private readonly _terminalService: ITerminalService
+	) {
+		super(id, label);
+	}
+
+	public run(event?: any): TPromise<any> {
+		const tab = this._terminalService.getActiveTab();
+		if (tab) {
+			tab.resizePane(this._direction);
+		}
+		return TPromise.as(void 0);
+	}
+}
+
+export class ResizePaneLeftTerminalAction extends BaseFocusDirectionTerminalAction {
+	public static readonly ID = 'workbench.action.terminal.resizePaneLeft';
+	public static readonly LABEL = nls.localize('workbench.action.terminal.resizePaneLeft', "Resize Pane Left");
+
+	constructor(
+		id: string, label: string,
+		@ITerminalService readonly terminalService: ITerminalService
+	) {
+		super(id, label, Direction.Left, terminalService);
+	}
+}
+
+export class ResizePaneRightTerminalAction extends BaseFocusDirectionTerminalAction {
+	public static readonly ID = 'workbench.action.terminal.resizePaneRight';
+	public static readonly LABEL = nls.localize('workbench.action.terminal.resizePaneRight', "Resize Pane Right");
+
+	constructor(
+		id: string, label: string,
+		@ITerminalService readonly terminalService: ITerminalService
+	) {
+		super(id, label, Direction.Right, terminalService);
+	}
+}
+
+export class ResizePaneUpTerminalAction extends BaseFocusDirectionTerminalAction {
+	public static readonly ID = 'workbench.action.terminal.resizePaneUp';
+	public static readonly LABEL = nls.localize('workbench.action.terminal.resizePaneUp', "Resize Pane Up");
+
+	constructor(
+		id: string, label: string,
+		@ITerminalService readonly terminalService: ITerminalService
+	) {
+		super(id, label, Direction.Up, terminalService);
+	}
+}
+
+export class ResizePaneDownTerminalAction extends BaseFocusDirectionTerminalAction {
+	public static readonly ID = 'workbench.action.terminal.resizePaneDown';
+	public static readonly LABEL = nls.localize('workbench.action.terminal.resizePaneDown', "Resize Pane Down");
+
+	constructor(
+		id: string, label: string,
+		@ITerminalService readonly terminalService: ITerminalService
+	) {
+		super(id, label, Direction.Down, terminalService);
+	}
+}
+
 export class FocusActiveTerminalAction extends Action {
 
 	public static readonly ID = 'workbench.action.terminal.focus';
@@ -331,7 +460,7 @@ export class FocusNextTerminalAction extends Action {
 	}
 
 	public run(event?: any): TPromise<any> {
-		this.terminalService.setActiveInstanceToNext();
+		this.terminalService.setActiveTabToNext();
 		return this.terminalService.showPanel(true);
 	}
 }
@@ -349,10 +478,11 @@ export class FocusPreviousTerminalAction extends Action {
 	}
 
 	public run(event?: any): TPromise<any> {
-		this.terminalService.setActiveInstanceToPrevious();
+		this.terminalService.setActiveTabToPrevious();
 		return this.terminalService.showPanel(true);
 	}
 }
+
 export class TerminalPasteAction extends Action {
 
 	public static readonly ID = 'workbench.action.terminal.paste';
@@ -435,7 +565,7 @@ export class RunActiveFileInTerminalAction extends Action {
 		id: string, label: string,
 		@ICodeEditorService private codeEditorService: ICodeEditorService,
 		@ITerminalService private terminalService: ITerminalService,
-		@IMessageService private messageService: IMessageService
+		@INotificationService private notificationService: INotificationService
 	) {
 		super(id, label);
 	}
@@ -451,7 +581,7 @@ export class RunActiveFileInTerminalAction extends Action {
 		}
 		const uri = editor.getModel().uri;
 		if (uri.scheme !== 'file') {
-			this.messageService.show(Severity.Warning, nls.localize('workbench.action.terminal.runActiveFile.noFile', 'Only files on disk can be run in the terminal'));
+			this.notificationService.warn(nls.localize('workbench.action.terminal.runActiveFile.noFile', 'Only files on disk can be run in the terminal'));
 			return TPromise.as(void 0);
 		}
 		instance.sendText(uri.fsPath, true);
@@ -459,30 +589,30 @@ export class RunActiveFileInTerminalAction extends Action {
 	}
 }
 
-export class SwitchTerminalInstanceAction extends Action {
+export class SwitchTerminalAction extends Action {
 
-	public static readonly ID = 'workbench.action.terminal.switchTerminalInstance';
-	public static readonly LABEL = nls.localize('workbench.action.terminal.switchTerminalInstance', "Switch Terminal Instance");
+	public static readonly ID = 'workbench.action.terminal.switchTerminal';
+	public static readonly LABEL = nls.localize('workbench.action.terminal.switchTerminal', "Switch Terminal");
 
 	constructor(
 		id: string, label: string,
 		@ITerminalService private terminalService: ITerminalService
 	) {
-		super(SwitchTerminalInstanceAction.ID, SwitchTerminalInstanceAction.LABEL);
-		this.class = 'terminal-action switch-terminal-instance';
+		super(SwitchTerminalAction.ID, SwitchTerminalAction.LABEL);
+		this.class = 'terminal-action switch-terminal';
 	}
 
 	public run(item?: string): TPromise<any> {
 		if (!item || !item.split) {
 			return TPromise.as(null);
 		}
-		const selectedTerminalIndex = parseInt(item.split(':')[0], 10) - 1;
-		this.terminalService.setActiveInstanceByIndex(selectedTerminalIndex);
+		const selectedTabIndex = parseInt(item.split(':')[0], 10) - 1;
+		this.terminalService.setActiveTabByIndex(selectedTabIndex);
 		return this.terminalService.showPanel(true);
 	}
 }
 
-export class SwitchTerminalInstanceActionItem extends SelectActionItem {
+export class SwitchTerminalActionItem extends SelectActionItem {
 
 	constructor(
 		action: IAction,
@@ -490,16 +620,16 @@ export class SwitchTerminalInstanceActionItem extends SelectActionItem {
 		@IThemeService themeService: IThemeService,
 		@IContextViewService contextViewService: IContextViewService
 	) {
-		super(null, action, terminalService.getInstanceLabels(), terminalService.activeTerminalInstanceIndex, contextViewService);
+		super(null, action, terminalService.getTabLabels(), terminalService.activeTabIndex, contextViewService);
 
 		this.toDispose.push(terminalService.onInstancesChanged(this._updateItems, this));
-		this.toDispose.push(terminalService.onActiveInstanceChanged(this._updateItems, this));
+		this.toDispose.push(terminalService.onActiveTabChanged(this._updateItems, this));
 		this.toDispose.push(terminalService.onInstanceTitleChanged(this._updateItems, this));
 		this.toDispose.push(attachSelectBoxStyler(this.selectBox, themeService));
 	}
 
 	private _updateItems(): void {
-		this.setOptions(this.terminalService.getInstanceLabels(), this.terminalService.activeTerminalInstanceIndex);
+		this.setOptions(this.terminalService.getTabLabels(), this.terminalService.activeTabIndex);
 	}
 }
 
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.ts
index 58e125b9f86..c0a687f50f4 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.ts
@@ -26,6 +26,7 @@ export const TERMINAL_SELECTION_BACKGROUND_COLOR = registerColor('terminal.selec
 	dark: '#FFFFFF40',
 	hc: '#FFFFFF80'
 }, nls.localize('terminal.selectionBackground', 'The selection background color of the terminal.'));
+export const TERMINAL_BORDER_COLOR = registerColor('terminal.border', null, nls.localize('terminal.border', 'The color of the border that separates multiple terminals. This defaults to panel.border'));
 
 const ansiColorMap = {
 	'terminal.ansiBlack': {
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
index 24a10026878..3c27b5e6719 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
@@ -9,12 +9,11 @@ import * as platform from 'vs/base/common/platform';
 import { EDITOR_FONT_DEFAULTS, IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
-import { IChoiceService } from 'vs/platform/message/common/message';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { ITerminalConfiguration, ITerminalConfigHelper, ITerminalFont, IShellLaunchConfig, IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, TERMINAL_CONFIG_SECTION } from 'vs/workbench/parts/terminal/common/terminal';
-import { TPromise } from 'vs/base/common/winjs.base';
 import Severity from 'vs/base/common/severity';
 import { isFedora } from 'vs/workbench/parts/terminal/electron-browser/terminal';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
 
 const DEFAULT_LINE_HEIGHT = 1.0;
 
@@ -33,10 +32,10 @@ export class TerminalConfigHelper implements ITerminalConfigHelper {
 	public config: ITerminalConfiguration;
 
 	public constructor(
-		@IConfigurationService private _configurationService: IConfigurationService,
-		@IWorkspaceConfigurationService private _workspaceConfigurationService: IWorkspaceConfigurationService,
-		@IChoiceService private _choiceService: IChoiceService,
-		@IStorageService private _storageService: IStorageService
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IWorkspaceConfigurationService private readonly _workspaceConfigurationService: IWorkspaceConfigurationService,
+		@IChoiceService private readonly _choiceService: IChoiceService,
+		@IStorageService private readonly _storageService: IStorageService
 	) {
 		this._updateConfig();
 		this._configurationService.onDidChangeConfiguration(e => {
@@ -51,6 +50,14 @@ export class TerminalConfigHelper implements ITerminalConfigHelper {
 	}
 
 	private _measureFont(fontFamily: string, fontSize: number, lineHeight: number): ITerminalFont {
+		// Return cached font if no config changed
+		if (this._lastFontMeasurement &&
+			this._lastFontMeasurement.fontFamily === fontFamily &&
+			this._lastFontMeasurement.fontSize === fontSize &&
+			this._lastFontMeasurement.lineHeight === lineHeight) {
+			return this._lastFontMeasurement;
+		}
+
 		// Create charMeasureElement if it hasn't been created or if it was orphaned by its parent
 		if (!this._charMeasureElement || !this._charMeasureElement.parentElement) {
 			this._charMeasureElement = document.createElement('div');
@@ -151,13 +158,15 @@ export class TerminalConfigHelper implements ITerminalConfigHelper {
 			}
 			const message = nls.localize('terminal.integrated.allowWorkspaceShell', "Do you allow {0} (defined as a workspace setting) to be launched in the terminal?", changeString);
 			const options = [nls.localize('allow', "Allow"), nls.localize('disallow', "Disallow")];
-			this._choiceService.choose(Severity.Info, message, options, 1).then(choice => {
-				if (choice === 0) {
-					this._storageService.store(IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, true, StorageScope.WORKSPACE);
-				} else {
-					this._storageService.store(IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, false, StorageScope.WORKSPACE);
+			this._choiceService.choose(Severity.Info, message, options).then(choice => {
+				switch (choice) {
+					case 0:  /* Allow */
+						this._storageService.store(IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, true, StorageScope.WORKSPACE);
+						break;
+					case 1:  /* Disallow */
+						this._storageService.store(IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, false, StorageScope.WORKSPACE);
+						break;
 				}
-				return TPromise.as(null);
 			});
 		}
 
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts
index 431ea507364..54f6566bf1f 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts
@@ -13,8 +13,8 @@ export class TerminalFindWidget extends SimpleFindWidget {
 
 	constructor(
 		@IContextViewService _contextViewService: IContextViewService,
-		@IContextKeyService private _contextKeyService: IContextKeyService,
-		@ITerminalService private _terminalService: ITerminalService
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@ITerminalService private readonly _terminalService: ITerminalService
 	) {
 		super(_contextViewService);
 		this._findInputFocused = KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_INPUT_FOCUSED.bindTo(this._contextKeyService);
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
index 63c8088d148..185ed97b4bf 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
@@ -17,7 +17,6 @@ import { Terminal as XTermTerminal } from 'vscode-xterm';
 import { Dimension } from 'vs/base/browser/builder';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IStringDictionary } from 'vs/base/common/collections';
 import { ITerminalInstance, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, TERMINAL_PANEL_ID, IShellLaunchConfig } from 'vs/workbench/parts/terminal/common/terminal';
@@ -28,7 +27,7 @@ import { TerminalConfigHelper } from 'vs/workbench/parts/terminal/electron-brows
 import { TerminalLinkHandler } from 'vs/workbench/parts/terminal/electron-browser/terminalLinkHandler';
 import { TerminalWidgetManager } from 'vs/workbench/parts/terminal/browser/terminalWidgetManager';
 import { registerThemingParticipant, ITheme, ICssStyleCollector, IThemeService } from 'vs/platform/theme/common/themeService';
-import { scrollbarSliderBackground, scrollbarSliderHoverBackground, scrollbarSliderActiveBackground } from 'vs/platform/theme/common/colorRegistry';
+import { scrollbarSliderBackground, scrollbarSliderHoverBackground, scrollbarSliderActiveBackground, activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
@@ -39,6 +38,7 @@ import { IConfigurationResolverService } from 'vs/workbench/services/configurati
 import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 /** The amount of time to consider terminal errors to be related to the launch */
 const LAUNCHING_DURATION = 500;
@@ -78,7 +78,8 @@ export class TerminalInstance implements ITerminalInstance {
 	private _processReady: TPromise<void>;
 	private _isDisposed: boolean;
 	private _onDisposed: Emitter<ITerminalInstance>;
-	private _onProcessIdReady: Emitter<TerminalInstance>;
+	private _onFocused: Emitter<ITerminalInstance>;
+	private _onProcessIdReady: Emitter<ITerminalInstance>;
 	private _onTitleChanged: Emitter<string>;
 	private _process: cp.ChildProcess;
 	private _processId: number;
@@ -105,7 +106,8 @@ export class TerminalInstance implements ITerminalInstance {
 	public get id(): number { return this._id; }
 	public get processId(): number { return this._processId; }
 	public get onDisposed(): Event<ITerminalInstance> { return this._onDisposed.event; }
-	public get onProcessIdReady(): Event<TerminalInstance> { return this._onProcessIdReady.event; }
+	public get onFocused(): Event<ITerminalInstance> { return this._onFocused.event; }
+	public get onProcessIdReady(): Event<ITerminalInstance> { return this._onProcessIdReady.event; }
 	public get onTitleChanged(): Event<string> { return this._onTitleChanged.event; }
 	public get title(): string { return this._title; }
 	public get hadFocusOnExit(): boolean { return this._hadFocusOnExit; }
@@ -116,17 +118,17 @@ export class TerminalInstance implements ITerminalInstance {
 		private _configHelper: TerminalConfigHelper,
 		private _container: HTMLElement,
 		private _shellLaunchConfig: IShellLaunchConfig,
-		@IContextKeyService private _contextKeyService: IContextKeyService,
-		@IKeybindingService private _keybindingService: IKeybindingService,
-		@IMessageService private _messageService: IMessageService,
-		@IPanelService private _panelService: IPanelService,
-		@IInstantiationService private _instantiationService: IInstantiationService,
-		@IClipboardService private _clipboardService: IClipboardService,
-		@IHistoryService private _historyService: IHistoryService,
-		@IThemeService private _themeService: IThemeService,
-		@IConfigurationResolverService private _configurationResolverService: IConfigurationResolverService,
-		@IWorkspaceContextService private _workspaceContextService: IWorkspaceContextService,
-		@IConfigurationService private _configurationService: IConfigurationService
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@INotificationService private readonly _notificationService: INotificationService,
+		@IPanelService private readonly _panelService: IPanelService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IClipboardService private readonly _clipboardService: IClipboardService,
+		@IHistoryService private readonly _historyService: IHistoryService,
+		@IThemeService private readonly _themeService: IThemeService,
+		@IConfigurationResolverService private readonly _configurationResolverService: IConfigurationResolverService,
+		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService
 	) {
 		this._instanceDisposables = [];
 		this._processDisposables = [];
@@ -142,6 +144,7 @@ export class TerminalInstance implements ITerminalInstance {
 		this._preLaunchInputQueue = '';
 
 		this._onDisposed = new Emitter<TerminalInstance>();
+		this._onFocused = new Emitter<TerminalInstance>();
 		this._onProcessIdReady = new Emitter<TerminalInstance>();
 		this._onTitleChanged = new Emitter<string>();
 
@@ -165,7 +168,7 @@ export class TerminalInstance implements ITerminalInstance {
 
 			// Only attach xterm.js to the DOM if the terminal panel has been opened before.
 			if (_container) {
-				this.attachToElement(_container);
+				this._attachToElement(_container);
 			}
 		});
 
@@ -202,10 +205,16 @@ export class TerminalInstance implements ITerminalInstance {
 	 * @return The terminal's width if it requires a layout.
 	 */
 	private _evaluateColsAndRows(width: number, height: number): number {
+		// Ignore if dimensions are undefined or 0
+		if (!width || !height) {
+			return null;
+		}
+
 		const dimension = this._getDimension(width, height);
 		if (!dimension) {
 			return null;
 		}
+
 		const font = this._configHelper.getFont();
 
 		// Because xterm.js converts from CSS pixels to actual pixels through
@@ -234,25 +243,19 @@ export class TerminalInstance implements ITerminalInstance {
 		// The panel is minimized
 		if (!height) {
 			return TerminalInstance._lastKnownDimensions;
-		} else {
-			// Trigger scroll event manually so that the viewport's scroll area is synced. This
-			// needs to happen otherwise its scrollTop value is invalid when the panel is toggled as
-			// it gets removed and then added back to the DOM (resetting scrollTop to 0).
-			// Upstream issue: https://github.com/sourcelair/xterm.js/issues/291
-			if (this._xterm) {
-				this._xterm.emit('scroll', this._xterm.buffer.ydisp);
-			}
 		}
 
-		const outerContainer = document.querySelector('.terminal-outer-container');
-		const outerContainerStyle = getComputedStyle(outerContainer);
-		const padding = parseInt(outerContainerStyle.paddingLeft.split('px')[0], 10);
-		const paddingBottom = parseInt(outerContainerStyle.paddingBottom.split('px')[0], 10);
+		if (!this._wrapperElement) {
+			return null;
+		}
 
-		// Use left padding as right padding, right padding is not defined in CSS just in case
-		// xterm.js causes an unexpected overflow.
-		const innerWidth = width - padding * 2;
-		const innerHeight = height - paddingBottom;
+		const wrapperElementStyle = getComputedStyle(this._wrapperElement);
+		const marginLeft = parseInt(wrapperElementStyle.marginLeft.split('px')[0], 10);
+		const marginRight = parseInt(wrapperElementStyle.marginRight.split('px')[0], 10);
+		const bottom = parseInt(wrapperElementStyle.bottom.split('px')[0], 10);
+
+		const innerWidth = width - marginLeft - marginRight;
+		const innerHeight = height - bottom;
 
 		TerminalInstance._lastKnownDimensions = new Dimension(innerWidth, innerHeight);
 		return TerminalInstance._lastKnownDimensions;
@@ -313,7 +316,38 @@ export class TerminalInstance implements ITerminalInstance {
 		this._instanceDisposables.push(this._themeService.onThemeChange(theme => this._updateTheme(theme)));
 	}
 
+	public reattachToElement(container: HTMLElement): void {
+		if (!this._wrapperElement) {
+			throw new Error('The terminal instance has not been attached to a container yet');
+		}
+
+		if (this._wrapperElement.parentNode) {
+			this._wrapperElement.parentNode.removeChild(this._wrapperElement);
+		}
+		this._container = container;
+		this._container.appendChild(this._wrapperElement);
+	}
+
 	public attachToElement(container: HTMLElement): void {
+		// The container did not change, do nothing
+		if (this._container === container) {
+			return;
+		}
+
+		// Attach has not occured yet
+		if (!this._wrapperElement) {
+			this._attachToElement(container);
+			return;
+		}
+
+		// TODO: Verify listeners still work
+		// The container changed, reattach
+		this._container.removeChild(this._wrapperElement);
+		this._container = container;
+		this._container.appendChild(this._wrapperElement);
+	}
+
+	public _attachToElement(container: HTMLElement): void {
 		this._xtermReadyPromise.then(() => {
 			if (this._wrapperElement) {
 				throw new Error('The terminal instance has already been attached to a container');
@@ -389,6 +423,7 @@ export class TerminalInstance implements ITerminalInstance {
 
 			this._instanceDisposables.push(dom.addDisposableListener(this._xterm.textarea, 'focus', (event: KeyboardEvent) => {
 				this._terminalFocusContextKey.set(true);
+				this._onFocused.fire(this);
 			}));
 			this._instanceDisposables.push(dom.addDisposableListener(this._xterm.textarea, 'blur', (event: KeyboardEvent) => {
 				this._terminalFocusContextKey.reset();
@@ -438,7 +473,7 @@ export class TerminalInstance implements ITerminalInstance {
 		if (this.hasSelection()) {
 			this._clipboardService.writeText(this._xterm.getSelection());
 		} else {
-			this._messageService.show(Severity.Warning, nls.localize('terminal.integrated.copySelection.noSelection', 'The terminal has no selection to copy'));
+			this._notificationService.warn(nls.localize('terminal.integrated.copySelection.noSelection', 'The terminal has no selection to copy'));
 		}
 	}
 
@@ -767,10 +802,10 @@ export class TerminalInstance implements ITerminalInstance {
 							return a;
 						}).join(' ');
 					}
-					this._messageService.show(Severity.Error, nls.localize('terminal.integrated.launchFailed', 'The terminal process command `{0}{1}` failed to launch (exit code: {2})', this._shellLaunchConfig.executable, args, exitCode));
+					this._notificationService.error(nls.localize('terminal.integrated.launchFailed', 'The terminal process command \'{0}{1}\' failed to launch (exit code: {2})', this._shellLaunchConfig.executable, args, exitCode));
 				} else {
 					if (this._configHelper.config.showExitAlert) {
-						this._messageService.show(Severity.Error, exitCodeMessage);
+						this._notificationService.error(exitCodeMessage);
 					} else {
 						console.warn(exitCodeMessage);
 					}
@@ -780,13 +815,7 @@ export class TerminalInstance implements ITerminalInstance {
 	}
 
 	private _attachPressAnyKeyToCloseListener() {
-		this._processDisposables.push(dom.addDisposableListener(this._xterm.textarea, 'keydown', (event: KeyboardEvent) => {
-			switch (event.key) {
-				case 'Meta':
-				case 'Shift':
-				case 'Alt':
-				case 'Control': return;
-			}
+		this._processDisposables.push(dom.addDisposableListener(this._xterm.textarea, 'keypress', (event: KeyboardEvent) => {
 			this.dispose();
 			event.preventDefault();
 		}));
@@ -1082,6 +1111,13 @@ export class TerminalInstance implements ITerminalInstance {
 
 			this._xterm.resize(this._cols, this._rows);
 			this._xterm.element.style.width = terminalWidth + 'px';
+			if (this._isVisible) {
+				// Force the renderer to unpause by simulating an IntersectionObserver event. This
+				// is to fix an issue where dragging the window to the top of the screen to maximize
+				// on Winodws/Linux would fire an event saying that the terminal was not visible.
+				// This should only force a refresh if one is needed.
+				(<any>this._xterm).renderer.onIntersectionChange({ intersectionRatio: 1 });
+			}
 		}
 
 		this._processReady.then(() => {
@@ -1170,6 +1206,14 @@ export class TerminalInstance implements ITerminalInstance {
 }
 
 registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
+	// Border
+	const border = theme.getColor(activeContrastBorder);
+	if (border) {
+		collector.addRule(`
+			.hc-black .monaco-workbench .panel.integrated-terminal .xterm.focus::before,
+			.hc-black .monaco-workbench .panel.integrated-terminal .xterm:focus::before { border-color: ${border}; }`
+		);
+	}
 
 	// Scrollbar
 	const scrollbarSliderBackgroundColor = theme.getColor(scrollbarSliderBackground);
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts
index bb1bbe0019f..87351d5db48 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts
@@ -14,6 +14,7 @@ import { TerminalWidgetManager } from 'vs/workbench/parts/terminal/browser/termi
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ITerminalService } from 'vs/workbench/parts/terminal/common/terminal';
+import { IEditorService } from 'vs/platform/editor/common/editor';
 
 const pathPrefix = '(\\.\\.?|\\~)';
 const pathSeparatorClause = '\\/';
@@ -66,9 +67,10 @@ export class TerminalLinkHandler {
 		private _xterm: any,
 		private _platform: platform.Platform,
 		private _initialCwd: string,
-		@IOpenerService private _openerService: IOpenerService,
-		@IConfigurationService private _configurationService: IConfigurationService,
-		@ITerminalService private _terminalService: ITerminalService
+		@IOpenerService private readonly _openerService: IOpenerService,
+		@IEditorService private readonly _editorService: IEditorService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@ITerminalService private readonly _terminalService: ITerminalService
 	) {
 		const baseLocalLinkClause = _platform === platform.Platform.Windows ? winLocalLinkClause : unixLocalLinkClause;
 		// Append line and column number regex
@@ -136,7 +138,7 @@ export class TerminalLinkHandler {
 		return this._localLinkPattern;
 	}
 
-	private _handleLocalLink(link: string): TPromise<void> {
+	private _handleLocalLink(link: string): TPromise<any> {
 		return this._resolvePath(link).then(resolvedLink => {
 			if (!resolvedLink) {
 				return void 0;
@@ -152,7 +154,7 @@ export class TerminalLinkHandler {
 				fragment: Uri.parse(normalizedPath).fragment
 			});
 
-			return this._openerService.open(resource);
+			return this._editorService.openEditor({ resource, options: { pinned: true } });
 		});
 	}
 
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
index b4958a95fbb..39212b7fe68 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
@@ -19,13 +19,13 @@ import { ITerminalService, TERMINAL_PANEL_ID } from 'vs/workbench/parts/terminal
 import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
 import { TerminalFindWidget } from './terminalFindWidget';
 import { editorHoverBackground, editorHoverBorder, editorForeground } from 'vs/platform/theme/common/colorRegistry';
-import { KillTerminalAction, SwitchTerminalInstanceAction, SwitchTerminalInstanceActionItem, CopyTerminalSelectionAction, TerminalPasteAction, ClearTerminalAction, SelectAllTerminalAction, CreateNewTerminalAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
+import { KillTerminalAction, SwitchTerminalAction, SwitchTerminalActionItem, CopyTerminalSelectionAction, TerminalPasteAction, ClearTerminalAction, SelectAllTerminalAction, CreateNewTerminalAction, SplitTerminalAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
 import { Panel } from 'vs/workbench/browser/panel';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { TPromise } from 'vs/base/common/winjs.base';
 import URI from 'vs/base/common/uri';
-import { PANEL_BACKGROUND } from 'vs/workbench/common/theme';
-import { TERMINAL_BACKGROUND_COLOR } from 'vs/workbench/parts/terminal/electron-browser/terminalColorRegistry';
+import { PANEL_BACKGROUND, PANEL_BORDER } from 'vs/workbench/common/theme';
+import { TERMINAL_BACKGROUND_COLOR, TERMINAL_BORDER_COLOR } from 'vs/workbench/parts/terminal/electron-browser/terminalColorRegistry';
 import { DataTransfers } from 'vs/base/browser/dnd';
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 
@@ -42,11 +42,11 @@ export class TerminalPanel extends Panel {
 	private _findWidget: TerminalFindWidget;
 
 	constructor(
-		@IConfigurationService private _configurationService: IConfigurationService,
-		@IContextMenuService private _contextMenuService: IContextMenuService,
-		@IInstantiationService private _instantiationService: IInstantiationService,
-		@ITerminalService private _terminalService: ITerminalService,
-		@ILifecycleService private _lifecycleService: ILifecycleService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ITerminalService private readonly _terminalService: ITerminalService,
+		@ILifecycleService private readonly _lifecycleService: ILifecycleService,
 		@IThemeService protected themeService: IThemeService,
 		@ITelemetryService telemetryService: ITelemetryService
 	) {
@@ -92,9 +92,7 @@ export class TerminalPanel extends Panel {
 		if (!dimension) {
 			return;
 		}
-		this._terminalService.terminalInstances.forEach((t) => {
-			t.layout(dimension);
-		});
+		this._terminalService.terminalTabs.forEach(t => t.layout(dimension.width, dimension.height));
 	}
 
 	public setVisible(visible: boolean): TPromise<void> {
@@ -128,7 +126,7 @@ export class TerminalPanel extends Panel {
 	public getActions(): IAction[] {
 		if (!this._actions) {
 			this._actions = [
-				this._instantiationService.createInstance(SwitchTerminalInstanceAction, SwitchTerminalInstanceAction.ID, SwitchTerminalInstanceAction.LABEL),
+				this._instantiationService.createInstance(SwitchTerminalAction, SwitchTerminalAction.ID, SwitchTerminalAction.LABEL),
 				this._instantiationService.createInstance(CreateNewTerminalAction, CreateNewTerminalAction.ID, CreateNewTerminalAction.PANEL_LABEL),
 				this._instantiationService.createInstance(KillTerminalAction, KillTerminalAction.ID, KillTerminalAction.PANEL_LABEL)
 			];
@@ -149,7 +147,9 @@ export class TerminalPanel extends Panel {
 				this._instantiationService.createInstance(TerminalPasteAction, TerminalPasteAction.ID, nls.localize('paste', "Paste")),
 				this._instantiationService.createInstance(SelectAllTerminalAction, SelectAllTerminalAction.ID, nls.localize('selectAll', "Select All")),
 				new Separator(),
-				this._instantiationService.createInstance(ClearTerminalAction, ClearTerminalAction.ID, nls.localize('clear', "Clear"))
+				this._instantiationService.createInstance(ClearTerminalAction, ClearTerminalAction.ID, nls.localize('clear', "Clear")),
+				new Separator(),
+				this._instantiationService.createInstance(SplitTerminalAction, SplitTerminalAction.ID, nls.localize('split', "Split"))
 			];
 			this._contextMenuActions.forEach(a => {
 				this._register(a);
@@ -161,8 +161,8 @@ export class TerminalPanel extends Panel {
 	}
 
 	public getActionItem(action: Action): IActionItem {
-		if (action.id === SwitchTerminalInstanceAction.ID) {
-			return this._instantiationService.createInstance(SwitchTerminalInstanceActionItem, action);
+		if (action.id === SwitchTerminalAction.ID) {
+			return this._instantiationService.createInstance(SwitchTerminalActionItem, action);
 		}
 
 		return super.getActionItem(action);
@@ -254,16 +254,6 @@ export class TerminalPanel extends Panel {
 			}
 			this._cancelContextMenu = false;
 		}));
-		this._register(dom.addDisposableListener(this._parentDomElement, 'click', (event) => {
-			if (event.which === 3) {
-				return;
-			}
-
-			const instance = this._terminalService.getActiveInstance();
-			if (instance) {
-				this._terminalService.getActiveInstance().focus();
-			}
-		}));
 		this._register(dom.addDisposableListener(this._parentDomElement, 'keyup', (event: KeyboardEvent) => {
 			if (event.keyCode === 27) {
 				// Keep terminal open on escape
@@ -306,6 +296,11 @@ export class TerminalPanel extends Panel {
 		const backgroundColor = theme.getColor(TERMINAL_BACKGROUND_COLOR) || theme.getColor(PANEL_BACKGROUND);
 		this._terminalContainer.style.backgroundColor = backgroundColor ? backgroundColor.toString() : '';
 
+		const borderColor = theme.getColor(TERMINAL_BORDER_COLOR) || theme.getColor(PANEL_BORDER);
+		if (borderColor) {
+			css += `.monaco-workbench .panel.integrated-terminal .split-view-view:not(:first-child) { border-color: ${borderColor.toString()}; }`;
+		}
+
 		// Borrow the editor's hover background for now
 		let hoverBackground = theme.getColor(editorHoverBackground);
 		if (hoverBackground) {
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
index 53d7571edef..fd102cf2d5f 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
@@ -16,52 +16,59 @@ import { IQuickOpenService, IPickOpenEntry, IPickOptions } from 'vs/platform/qui
 import { ITerminalInstance, ITerminalService, IShellLaunchConfig, ITerminalConfigHelper, NEVER_SUGGEST_SELECT_WINDOWS_SHELL_STORAGE_KEY, TERMINAL_PANEL_ID } from 'vs/workbench/parts/terminal/common/terminal';
 import { TerminalService as AbstractTerminalService } from 'vs/workbench/parts/terminal/common/terminalService';
 import { TerminalConfigHelper } from 'vs/workbench/parts/terminal/electron-browser/terminalConfigHelper';
-import { TerminalInstance } from 'vs/workbench/parts/terminal/electron-browser/terminalInstance';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IChoiceService, IMessageService } from 'vs/platform/message/common/message';
 import Severity from 'vs/base/common/severity';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { TERMINAL_DEFAULT_SHELL_WINDOWS } from 'vs/workbench/parts/terminal/electron-browser/terminal';
+import { getTerminalDefaultShellWindows } from 'vs/workbench/parts/terminal/electron-browser/terminal';
 import { TerminalPanel } from 'vs/workbench/parts/terminal/electron-browser/terminalPanel';
+import { TerminalTab } from 'vs/workbench/parts/terminal/electron-browser/terminalTab';
+import { IChoiceService, IConfirmationService, Choice } from 'vs/platform/dialogs/common/dialogs';
 
 export class TerminalService extends AbstractTerminalService implements ITerminalService {
 	private _configHelper: TerminalConfigHelper;
 	public get configHelper(): ITerminalConfigHelper { return this._configHelper; }
 
+	protected _terminalTabs: TerminalTab[];
+	protected get _terminalInstances(): ITerminalInstance[] {
+		return this._terminalTabs.reduce((p, c) => p.concat(c.terminalInstances), <ITerminalInstance[]>[]);
+	}
+
 	constructor(
 		@IContextKeyService _contextKeyService: IContextKeyService,
 		@IPanelService _panelService: IPanelService,
 		@IPartService _partService: IPartService,
 		@ILifecycleService _lifecycleService: ILifecycleService,
-		@IConfigurationService private _configurationService: IConfigurationService,
-		@IInstantiationService private _instantiationService: IInstantiationService,
-		@IQuickOpenService private _quickOpenService: IQuickOpenService,
-		@IChoiceService private _choiceService: IChoiceService,
-		@IStorageService private _storageService: IStorageService,
-		@IMessageService private _messageService: IMessageService
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IQuickOpenService private readonly _quickOpenService: IQuickOpenService,
+		@IChoiceService private readonly _choiceService: IChoiceService,
+		@IStorageService private readonly _storageService: IStorageService,
+		@IConfirmationService private readonly _confirmationService: IConfirmationService
 	) {
 		super(_contextKeyService, _panelService, _partService, _lifecycleService);
 
+		this._terminalTabs = [];
 		this._configHelper = this._instantiationService.createInstance(TerminalConfigHelper);
 	}
 
 	public createInstance(shell: IShellLaunchConfig = {}, wasNewTerminalAction?: boolean): ITerminalInstance {
-		let terminalInstance = this._instantiationService.createInstance(TerminalInstance,
+		const terminalTab = this._instantiationService.createInstance(TerminalTab,
 			this._terminalFocusContextKey,
 			this._configHelper,
 			this._terminalContainer,
 			shell);
-		terminalInstance.addDisposable(terminalInstance.onTitleChanged(this._onInstanceTitleChanged.fire, this._onInstanceTitleChanged));
-		terminalInstance.addDisposable(terminalInstance.onDisposed(this._onInstanceDisposed.fire, this._onInstanceDisposed));
-		terminalInstance.addDisposable(terminalInstance.onProcessIdReady(this._onInstanceProcessIdReady.fire, this._onInstanceProcessIdReady));
-		this.terminalInstances.push(terminalInstance);
+		this._terminalTabs.push(terminalTab);
+		const instance = terminalTab.terminalInstances[0];
+		terminalTab.addDisposable(terminalTab.onDisposed(this._onTabDisposed.fire, this._onTabDisposed));
+		terminalTab.addDisposable(terminalTab.onInstancesChanged(this._onInstancesChanged.fire, this._onInstancesChanged));
+		this._initInstanceListeners(instance);
 		if (this.terminalInstances.length === 1) {
 			// It's the first instance so it should be made active automatically
 			this.setActiveInstanceByIndex(0);
 		}
 		this._onInstancesChanged.fire();
 		this._suggestShellChange(wasNewTerminalAction);
-		return terminalInstance;
+		return instance;
 	}
 
 	public focusFindWidget(): TPromise<void> {
@@ -114,17 +121,17 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 		}
 
 		// Never suggest if the setting is non-default already (ie. they set the setting manually)
-		if (this._configHelper.config.shell.windows !== TERMINAL_DEFAULT_SHELL_WINDOWS) {
+		if (this._configHelper.config.shell.windows !== getTerminalDefaultShellWindows()) {
 			this._storageService.store(NEVER_SUGGEST_SELECT_WINDOWS_SHELL_STORAGE_KEY, true);
 			return;
 		}
 
 		const message = nls.localize('terminal.integrated.chooseWindowsShellInfo', "You can change the default terminal shell by selecting the customize button.");
-		const options = [nls.localize('customize', "Customize"), nls.localize('cancel', "Cancel"), nls.localize('never again', "OK, Don't Show Again")];
-		this._choiceService.choose(Severity.Info, message, options, 1).then(choice => {
+		const options: Choice[] = [nls.localize('customize', "Customize"), { label: nls.localize('never again', "Don't Show Again") }];
+		this._choiceService.choose(Severity.Info, message, options).then(choice => {
 			switch (choice) {
-				case 0:
-					return this.selectDefaultWindowsShell().then(shell => {
+				case 0 /* Customize */:
+					this.selectDefaultWindowsShell().then(shell => {
 						if (!shell) {
 							return TPromise.as(null);
 						}
@@ -138,12 +145,10 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 						}
 						return TPromise.as(null);
 					});
-				case 1:
-					return TPromise.as(null);
-				case 2:
+					break;
+				case 1 /* Do not show again */:
 					this._storageService.store(NEVER_SUGGEST_SELECT_WINDOWS_SHELL_STORAGE_KEY, true);
-				default:
-					return TPromise.as(null);
+					break;
 			}
 		});
 	}
@@ -220,7 +225,7 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 			message = nls.localize('terminalService.terminalCloseConfirmationPlural', "There are {0} active terminal sessions, do you want to kill them?", this.terminalInstances.length);
 		}
 
-		return this._messageService.confirm({
+		return this._confirmationService.confirm({
 			message,
 			type: 'warning',
 		}).then(confirmed => !confirmed);
@@ -229,8 +234,6 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 	public setContainers(panelContainer: HTMLElement, terminalContainer: HTMLElement): void {
 		this._configHelper.panelContainer = panelContainer;
 		this._terminalContainer = terminalContainer;
-		this._terminalInstances.forEach(terminalInstance => {
-			terminalInstance.attachToElement(this._terminalContainer);
-		});
+		this._terminalTabs.forEach(tab => tab.attachToElement(this._terminalContainer));
 	}
 }
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts
new file mode 100644
index 00000000000..7b435ff6643
--- /dev/null
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts
@@ -0,0 +1,437 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ITerminalInstance, IShellLaunchConfig, ITerminalTab, Direction, ITerminalService } from 'vs/workbench/parts/terminal/common/terminal';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { TerminalConfigHelper } from 'vs/workbench/parts/terminal/electron-browser/terminalConfigHelper';
+import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { TerminalInstance } from 'vs/workbench/parts/terminal/electron-browser/terminalInstance';
+import Event, { Emitter, anyEvent } from 'vs/base/common/event';
+import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
+import { SplitView, Orientation, IView } from 'vs/base/browser/ui/splitview/splitview';
+import { IPartService, Position } from 'vs/workbench/services/part/common/partService';
+
+class SplitPaneContainer {
+	private _height: number;
+	private _width: number;
+	private _splitView: SplitView;
+	private _splitViewDisposables: IDisposable[];
+	private _children: SplitPane[] = [];
+
+	// If the user sizes the panes manually, the proportional resizing will not be applied.
+	// Proportional resizing will come back when: a sash is reset, an instance is added/removed or
+	// the panel position moves.
+	private _isManuallySized: boolean = false;
+
+	private _onDidChange: Event<number | undefined> = Event.None;
+	public get onDidChange(): Event<number | undefined> { return this._onDidChange; }
+
+	constructor(
+		private _container: HTMLElement,
+		public orientation: Orientation
+	) {
+		this._width = this._container.offsetWidth;
+		this._height = this._container.offsetHeight;
+		this._createSplitView();
+		this._splitView.layout(this.orientation === Orientation.HORIZONTAL ? this._width : this._height);
+	}
+
+	private _createSplitView(): void {
+		this._splitView = new SplitView(this._container, { orientation: this.orientation });
+		this._splitViewDisposables = [];
+		this._splitViewDisposables.push(this._splitView.onDidSashReset(() => this._resetSize()));
+		this._splitViewDisposables.push(this._splitView.onDidSashChange(() => {
+			this._isManuallySized = true;
+		}));
+	}
+
+	public split(instance: ITerminalInstance, index: number = this._children.length): void {
+		const size = this.orientation === Orientation.HORIZONTAL ? this._width : this._height;
+		this._addChild(size / (this._children.length + 1), instance, index);
+	}
+
+	private _resetSize(): void {
+		// TODO: Optimize temrinal instance layout
+		let totalSize = 0;
+		for (let i = 0; i < this._splitView.length; i++) {
+			totalSize += this._splitView.getViewSize(i);
+		}
+		const newSize = Math.floor(totalSize / this._splitView.length);
+		for (let i = 0; i < this._splitView.length - 1; i++) {
+			this._splitView.resizeView(i, newSize);
+		}
+		this._isManuallySized = false;
+	}
+
+	public resizePane(index: number, direction: Direction, amount: number): void {
+		// TODO: Should resize pane up/down resize the panel?
+
+		// Only resize the correct dimension
+		const isHorizontal = direction === Direction.Left || direction === Direction.Right;
+		if (isHorizontal && this.orientation !== Orientation.HORIZONTAL ||
+			!isHorizontal && this.orientation !== Orientation.VERTICAL) {
+			return;
+		}
+
+		// Only resize when there is mor ethan one pane
+		if (this._children.length <= 1) {
+			return;
+		}
+
+		// Get sizes
+		const sizes = [];
+		for (let i = 0; i < this._splitView.length; i++) {
+			sizes.push(this._splitView.getViewSize(i));
+		}
+
+		// Remove size from right pane, unless index is the last pane in which case use left pane
+		const isSizingEndPane = index !== this._children.length - 1;
+		const indexToChange = isSizingEndPane ? index + 1 : index - 1;
+		if (isSizingEndPane && direction === Direction.Left) {
+			amount *= -1;
+		} else if (!isSizingEndPane && direction === Direction.Right) {
+			amount *= -1;
+		} else if (isSizingEndPane && direction === Direction.Up) {
+			amount *= -1;
+		} else if (!isSizingEndPane && direction === Direction.Down) {
+			amount *= -1;
+		}
+		sizes[index] += amount;
+		sizes[indexToChange] -= amount;
+
+		// Apply
+		for (let i = 0; i < this._splitView.length - 1; i++) {
+			this._splitView.resizeView(i, sizes[i]);
+		}
+		this._isManuallySized = true;
+	}
+
+	private _addChild(size: number, instance: ITerminalInstance, index: number): void {
+		const child = new SplitPane(this.orientation === Orientation.HORIZONTAL ? this._height : this._width);
+		child.orientation = this.orientation;
+		child.instance = instance;
+		this._splitView.addView(child, size, index);
+
+		if (typeof index === 'number') {
+			this._children.splice(index, 0, child);
+		} else {
+			this._children.push(child);
+		}
+
+		this._resetSize();
+
+		this._onDidChange = anyEvent(...this._children.map(c => c.onDidChange));
+	}
+
+	public remove(instance: ITerminalInstance): void {
+		let index = null;
+		for (let i = 0; i < this._children.length; i++) {
+			if (this._children[i].instance === instance) {
+				index = i;
+			}
+		}
+		if (index !== null) {
+			this._children.splice(index, 1);
+			this._splitView.removeView(index);
+			this._resetSize();
+		}
+	}
+
+	public layout(width: number, height: number): void {
+		if (!this._isManuallySized) {
+			this._resetSize();
+		}
+		this._width = width;
+		this._height = height;
+		if (this.orientation === Orientation.HORIZONTAL) {
+			this._children.forEach(c => c.orthogonalLayout(height));
+			this._splitView.layout(width);
+		} else {
+			this._children.forEach(c => c.orthogonalLayout(width));
+			this._splitView.layout(height);
+		}
+	}
+
+	public setOrientation(orientation: Orientation): void {
+		if (this.orientation === orientation) {
+			return;
+		}
+		this.orientation = orientation;
+
+		// Remove old split view
+		while (this._container.children.length > 0) {
+			this._container.removeChild(this._container.children[0]);
+		}
+		this._splitViewDisposables.forEach(d => d.dispose());
+		this._splitViewDisposables = [];
+		this._splitView.dispose();
+
+		// Create new split view with updated orientation
+		this._createSplitView();
+		this._children.forEach(child => {
+			child.orientation = orientation;
+			this._splitView.addView(child, 1);
+		});
+
+		// Allow time for a layout to occur
+		this.layout(this._container.offsetWidth, this._container.offsetHeight);
+		this._resetSize();
+	}
+}
+
+class SplitPane implements IView {
+	public minimumSize: number = 40;
+	public maximumSize: number = Number.MAX_VALUE;
+
+	public instance: ITerminalInstance;
+	public orientation: Orientation | undefined;
+	protected _size: number;
+
+	private _onDidChange: Event<number | undefined> = Event.None;
+	public get onDidChange(): Event<number | undefined> { return this._onDidChange; }
+
+	constructor(
+		public orthogonalSize: number
+	) {
+	}
+
+	public render(container: HTMLElement): void {
+		if (!container) {
+			return;
+		}
+		this.instance.attachToElement(container);
+	}
+
+	public layout(size: number): void {
+		// Only layout when both sizes are known
+		this._size = size;
+		if (!this._size || !this.orthogonalSize) {
+			return;
+		}
+
+		if (this.orientation === Orientation.VERTICAL) {
+			this.instance.layout({ width: this.orthogonalSize, height: this._size });
+		} else {
+			this.instance.layout({ width: this._size, height: this.orthogonalSize });
+		}
+	}
+
+	public orthogonalLayout(size: number): void {
+		this.orthogonalSize = size;
+	}
+}
+
+export class TerminalTab extends Disposable implements ITerminalTab {
+	private _terminalInstances: ITerminalInstance[] = [];
+	private _splitPaneContainer: SplitPaneContainer | undefined;
+	private _tabElement: HTMLElement;
+	private _panelPosition: Position = Position.BOTTOM;
+
+	private _activeInstanceIndex: number;
+
+	public get terminalInstances(): ITerminalInstance[] { return this._terminalInstances; }
+
+	private _onDisposed: Emitter<ITerminalTab>;
+	public get onDisposed(): Event<ITerminalTab> { return this._onDisposed.event; }
+	private _onInstancesChanged: Emitter<void>;
+	public get onInstancesChanged(): Event<void> { return this._onInstancesChanged.event; }
+
+	constructor(
+		terminalFocusContextKey: IContextKey<boolean>,
+		configHelper: TerminalConfigHelper,
+		private _container: HTMLElement,
+		shellLaunchConfig: IShellLaunchConfig,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ITerminalService private readonly _terminalService: ITerminalService,
+		@IPartService private readonly _partService: IPartService
+	) {
+		super();
+		this._onDisposed = new Emitter<ITerminalTab>();
+		this._onInstancesChanged = new Emitter<void>();
+
+		const instance = this._instantiationService.createInstance(TerminalInstance,
+			terminalFocusContextKey,
+			configHelper,
+			undefined,
+			shellLaunchConfig);
+		this._terminalInstances.push(instance);
+		this._initInstanceListeners(instance);
+		this._activeInstanceIndex = 0;
+
+		if (this._container) {
+			this.attachToElement(this._container);
+		}
+	}
+
+	public dispose(): void {
+		super.dispose();
+		if (this._tabElement) {
+			this._container.removeChild(this._tabElement);
+			this._tabElement = null;
+		}
+		this._terminalInstances = [];
+		this._onInstancesChanged.fire();
+	}
+
+	public get activeInstance(): ITerminalInstance {
+		if (this._terminalInstances.length === 0) {
+			return null;
+		}
+		return this._terminalInstances[this._activeInstanceIndex];
+	}
+
+	private _initInstanceListeners(instance: ITerminalInstance): void {
+		instance.addDisposable(instance.onDisposed(instance => this._onInstanceDisposed(instance)));
+		instance.addDisposable(instance.onFocused(instance => this._setActiveInstance(instance)));
+	}
+
+	private _onInstanceDisposed(instance: ITerminalInstance): void {
+		// Get the index of the instance and remove it from the list
+		const index = this._terminalInstances.indexOf(instance);
+		const wasActiveInstance = instance === this.activeInstance;
+		if (index !== -1) {
+			this._terminalInstances.splice(index, 1);
+		}
+
+		// Adjust focus if the instance was active
+		if (wasActiveInstance && this._terminalInstances.length > 0) {
+			let newIndex = index < this._terminalInstances.length ? index : this._terminalInstances.length - 1;
+			this.setActiveInstanceByIndex(newIndex);
+			// TODO: Only focus the new instance if the tab had focus?
+			this.activeInstance.focus(true);
+		}
+
+		// Remove the instance from the split pane if it has been created
+		if (this._splitPaneContainer) {
+			this._splitPaneContainer.remove(instance);
+		}
+
+		// Fire events and dispose tab if it was the last instance
+		this._onInstancesChanged.fire();
+		if (this._terminalInstances.length === 0) {
+			this._onDisposed.fire(this);
+			this.dispose();
+		}
+	}
+
+	private _setActiveInstance(instance: ITerminalInstance): void {
+		this.setActiveInstanceByIndex(this._getIndexFromId(instance.id));
+	}
+
+	private _getIndexFromId(terminalId: number): number {
+		let terminalIndex = -1;
+		this.terminalInstances.forEach((terminalInstance, i) => {
+			if (terminalInstance.id === terminalId) {
+				terminalIndex = i;
+			}
+		});
+		if (terminalIndex === -1) {
+			throw new Error(`Terminal with ID ${terminalId} does not exist (has it already been disposed?)`);
+		}
+		return terminalIndex;
+	}
+
+	public setActiveInstanceByIndex(index: number): void {
+		// Check for invalid value
+		if (index < 0 || index >= this._terminalInstances.length) {
+			return;
+		}
+
+		const didInstanceChange = this._activeInstanceIndex !== index;
+		this._activeInstanceIndex = index;
+
+		if (didInstanceChange) {
+			this._onInstancesChanged.fire();
+		}
+	}
+
+	public attachToElement(element: HTMLElement): void {
+		this._container = element;
+		this._tabElement = document.createElement('div');
+		this._tabElement.classList.add('terminal-tab');
+		this._container.appendChild(this._tabElement);
+		if (!this._splitPaneContainer) {
+			this._panelPosition = this._partService.getPanelPosition();
+			const orientation = this._panelPosition === Position.BOTTOM ? Orientation.HORIZONTAL : Orientation.VERTICAL;
+			this._splitPaneContainer = new SplitPaneContainer(this._tabElement, orientation);
+			this.terminalInstances.forEach(instance => this._splitPaneContainer.split(instance));
+		}
+	}
+
+	public get title(): string {
+		let title = this.terminalInstances[0].title;
+		for (let i = 1; i < this.terminalInstances.length; i++) {
+			title += `, ${this.terminalInstances[i].title}`;
+		}
+		return title;
+	}
+
+	public setVisible(visible: boolean): void {
+		if (this._tabElement) {
+			this._tabElement.style.display = visible ? '' : 'none';
+		}
+		this.terminalInstances.forEach(i => i.setVisible(visible));
+	}
+
+	public split(
+		terminalFocusContextKey: IContextKey<boolean>,
+		configHelper: TerminalConfigHelper,
+		shellLaunchConfig: IShellLaunchConfig
+	): ITerminalInstance {
+		const instance = this._instantiationService.createInstance(TerminalInstance,
+			terminalFocusContextKey,
+			configHelper,
+			undefined,
+			shellLaunchConfig);
+		this._terminalInstances.splice(this._activeInstanceIndex + 1, 0, instance);
+		this._initInstanceListeners(instance);
+		this._setActiveInstance(instance);
+
+		if (this._splitPaneContainer) {
+			this._splitPaneContainer.split(instance, this._activeInstanceIndex);
+		}
+
+		return instance;
+	}
+
+	public addDisposable(disposable: IDisposable): void {
+		this._register(disposable);
+	}
+
+	public layout(width: number, height: number): void {
+		if (this._splitPaneContainer) {
+			// Check if the panel position changed and rotate panes if so
+			const newPanelPosition = this._partService.getPanelPosition();
+			if (newPanelPosition !== this._panelPosition) {
+				const newOrientation = newPanelPosition === Position.BOTTOM ? Orientation.HORIZONTAL : Orientation.VERTICAL;
+				this._splitPaneContainer.setOrientation(newOrientation);
+			}
+			this._panelPosition = newPanelPosition;
+
+			this._splitPaneContainer.layout(width, height);
+		}
+	}
+
+	public focusPreviousPane(): void {
+		this.setActiveInstanceByIndex(this._activeInstanceIndex - 1);
+	}
+
+	public focusNextPane(): void {
+		this.setActiveInstanceByIndex(this._activeInstanceIndex + 1);
+	}
+
+	public resizePane(direction: Direction): void {
+		if (!this._splitPaneContainer) {
+			return;
+		}
+
+		const isHorizontal = (direction === Direction.Left || direction === Direction.Right);
+		const font = this._terminalService.configHelper.getFont();
+		const amount = isHorizontal ? font.charWidth : font.charHeight;
+		if (amount) {
+			this._splitPaneContainer.resizePane(this._activeInstanceIndex, direction, amount);
+		}
+	}
+}
diff --git a/src/vs/workbench/parts/terminal/test/electron-browser/terminalInstance.test.ts b/src/vs/workbench/parts/terminal/test/electron-browser/terminalInstance.test.ts
index 1dadac1f411..7fef7fc8039 100644
--- a/src/vs/workbench/parts/terminal/test/electron-browser/terminalInstance.test.ts
+++ b/src/vs/workbench/parts/terminal/test/electron-browser/terminalInstance.test.ts
@@ -9,13 +9,12 @@ import * as assert from 'assert';
 import * as os from 'os';
 import * as platform from 'vs/base/common/platform';
 import Uri from 'vs/base/common/uri';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { IStringDictionary } from 'vs/base/common/collections';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { TerminalInstance } from 'vs/workbench/parts/terminal/electron-browser/terminalInstance';
 import { IShellLaunchConfig } from 'vs/workbench/parts/terminal/common/terminal';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { TestMessageService, TestContextService, TestHistoryService } from 'vs/workbench/test/workbenchTestServices';
+import { TestNotificationService, TestContextService, TestHistoryService } from 'vs/workbench/test/workbenchTestServices';
 import { MockContextKeyService, MockKeybindingService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
@@ -23,6 +22,7 @@ import { IHistoryService } from 'vs/workbench/services/history/common/history';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 class TestTerminalInstance extends TerminalInstance {
 
@@ -40,7 +40,7 @@ suite('Workbench - TerminalInstance', () => {
 
 	setup(() => {
 		instantiationService = new TestInstantiationService();
-		instantiationService.stub(IMessageService, new TestMessageService());
+		instantiationService.stub(INotificationService, new TestNotificationService());
 		instantiationService.stub(IHistoryService, new TestHistoryService());
 	});
 
@@ -156,7 +156,7 @@ suite('Workbench - TerminalInstance', () => {
 			let terminalFocusContextKey = contextKeyService.createKey('test', false);
 			instantiationService = new TestInstantiationService();
 			instantiationService.stub(IConfigurationService, new TestConfigurationService());
-			instantiationService.stub(IMessageService, new TestMessageService());
+			instantiationService.stub(INotificationService, new TestNotificationService());
 			instantiationService.stub(IWorkspaceContextService, new TestContextService());
 			instantiationService.stub(IKeybindingService, keybindingService);
 			instantiationService.stub(IContextKeyService, contextKeyService);
diff --git a/src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts b/src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts
index 906b59e3037..00690d0f7c2 100644
--- a/src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts
+++ b/src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts
@@ -35,7 +35,7 @@ interface LinkFormatInfo {
 suite('Workbench - TerminalLinkHandler', () => {
 	suite('localLinkRegex', () => {
 		test('Windows', () => {
-			const terminalLinkHandler = new TestTerminalLinkHandler(new TestXterm(), Platform.Windows, null, null, null, null);
+			const terminalLinkHandler = new TestTerminalLinkHandler(new TestXterm(), Platform.Windows, null, null, null, null, null);
 			function testLink(link: string, linkUrl: string, lineNo?: string, columnNo?: string) {
 				assert.equal(terminalLinkHandler.extractLinkUrl(link), linkUrl);
 				assert.equal(terminalLinkHandler.extractLinkUrl(`:${link}:`), linkUrl);
@@ -105,7 +105,7 @@ suite('Workbench - TerminalLinkHandler', () => {
 		});
 
 		test('Linux', () => {
-			const terminalLinkHandler = new TestTerminalLinkHandler(new TestXterm(), Platform.Linux, null, null, null, null);
+			const terminalLinkHandler = new TestTerminalLinkHandler(new TestXterm(), Platform.Linux, null, null, null, null, null);
 			function testLink(link: string, linkUrl: string, lineNo?: string, columnNo?: string) {
 				assert.equal(terminalLinkHandler.extractLinkUrl(link), linkUrl);
 				assert.equal(terminalLinkHandler.extractLinkUrl(`:${link}:`), linkUrl);
@@ -169,7 +169,7 @@ suite('Workbench - TerminalLinkHandler', () => {
 
 	suite('preprocessPath', () => {
 		test('Windows', () => {
-			const linkHandler = new TestTerminalLinkHandler(new TestXterm(), Platform.Windows, 'C:\\base', null, null, null);
+			const linkHandler = new TestTerminalLinkHandler(new TestXterm(), Platform.Windows, 'C:\\base', null, null, null, null);
 
 			let stub = sinon.stub(path, 'join', function (arg1: string, arg2: string) {
 				return arg1 + '\\' + arg2;
@@ -182,7 +182,7 @@ suite('Workbench - TerminalLinkHandler', () => {
 		});
 
 		test('Linux', () => {
-			const linkHandler = new TestTerminalLinkHandler(new TestXterm(), Platform.Linux, '/base', null, null, null);
+			const linkHandler = new TestTerminalLinkHandler(new TestXterm(), Platform.Linux, '/base', null, null, null, null);
 
 			let stub = sinon.stub(path, 'join', function (arg1: string, arg2: string) {
 				return arg1 + '/' + arg2;
@@ -195,7 +195,7 @@ suite('Workbench - TerminalLinkHandler', () => {
 		});
 
 		test('No Workspace', () => {
-			const linkHandler = new TestTerminalLinkHandler(new TestXterm(), Platform.Linux, null, null, null, null);
+			const linkHandler = new TestTerminalLinkHandler(new TestXterm(), Platform.Linux, null, null, null, null, null);
 
 			assert.equal(linkHandler.preprocessPath('./src/file1'), null);
 			assert.equal(linkHandler.preprocessPath('src/file2'), null);
diff --git a/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.ts b/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.ts
index f338e06acd7..d3edbef785c 100644
--- a/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.ts
+++ b/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.ts
@@ -7,18 +7,15 @@
 
 import * as nls from 'vs/nls';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { Action } from 'vs/base/common/actions';
 import { IWorkbenchContributionsRegistry, IWorkbenchContribution, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
 import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-
-
+import { IChoiceService, Choice } from 'vs/platform/dialogs/common/dialogs';
+import { Severity } from 'vs/platform/notification/common/notification';
 
 class UnsupportedWorkspaceSettingsContribution implements IWorkbenchContribution {
 
@@ -31,7 +28,7 @@ class UnsupportedWorkspaceSettingsContribution implements IWorkbenchContribution
 		@IWorkspaceContextService workspaceContextService: IWorkspaceContextService,
 		@IWorkspaceConfigurationService private workspaceConfigurationService: IWorkspaceConfigurationService,
 		@IPreferencesService private preferencesService: IPreferencesService,
-		@IMessageService private messageService: IMessageService,
+		@IChoiceService private choiceService: IChoiceService,
 		@IStorageService private storageService: IStorageService
 	) {
 		lifecycleService.onShutdown(this.dispose, this);
@@ -64,26 +61,18 @@ class UnsupportedWorkspaceSettingsContribution implements IWorkbenchContribution
 	}
 
 	private showWarning(unsupportedKeys: string[]): void {
-		const message = nls.localize('unsupportedWorkspaceSettings', 'This Workspace contains settings that can only be set in User Settings. ({0})', unsupportedKeys.join(', '));
-
-		const openWorkspaceSettings = new Action('unsupportedWorkspaceSettings.openWorkspaceSettings', nls.localize('openWorkspaceSettings', 'Open Workspace Settings'), '', true, () => {
-			this.rememberWarningWasShown();
-			return this.preferencesService.openWorkspaceSettings();
+		const choices: Choice[] = [nls.localize('openWorkspaceSettings', 'Open Workspace Settings'), { label: nls.localize('dontShowAgain', 'Don\'t Show Again') }];
+		this.choiceService.choose(Severity.Warning, nls.localize('unsupportedWorkspaceSettings', 'This Workspace contains settings that can only be set in User Settings ({0}). Click [here]({1}) to learn more.', unsupportedKeys.join(', '), 'https://go.microsoft.com/fwlink/?linkid=839878'), choices).then(choice => {
+			switch (choice) {
+				case 0 /* Open Workspace Settings */:
+					this.rememberWarningWasShown();
+					this.preferencesService.openWorkspaceSettings();
+					break;
+				case 1 /* Never show again */:
+					this.rememberWarningWasShown();
+					break;
+			}
 		});
-
-		const openDocumentation = new Action('unsupportedWorkspaceSettings.openDocumentation', nls.localize('openDocumentation', 'Learn More'), '', true, () => {
-			this.rememberWarningWasShown();
-			window.open('https://go.microsoft.com/fwlink/?linkid=839878'); // Don't change link.
-			return TPromise.as(true);
-		});
-
-		const close = new Action('unsupportedWorkspaceSettings.Ignore', nls.localize('ignore', 'Ignore'), '', true, () => {
-			this.rememberWarningWasShown();
-			return TPromise.as(true);
-		});
-
-		const actions = [openWorkspaceSettings, openDocumentation, close];
-		this.messageService.show(Severity.Warning, { message, actions });
 	}
 }
 
diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
index b78a3529a97..52abc7a5262 100644
--- a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
+++ b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
@@ -14,7 +14,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { ReleaseNotesInput } from './releaseNotesInput';
 import { EditorOptions } from 'vs/workbench/common/editor';
-import WebView from 'vs/workbench/parts/html/browser/webview';
+import { Webview } from 'vs/workbench/parts/html/browser/webview';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { tokenizeToString } from 'vs/editor/common/modes/textToHtmlTokenizer';
@@ -28,6 +28,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { addGAParameters } from 'vs/platform/telemetry/node/telemetryNodeUtils';
 import { generateTokensCSSForColorMap } from 'vs/editor/common/modes/supports/tokenization';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 
 function renderBody(
 	body: string,
@@ -49,7 +50,7 @@ function renderBody(
 
 export class ReleaseNotesEditor extends WebviewEditor {
 
-	static ID: string = 'workbench.editor.releaseNotes';
+	static readonly ID: string = 'workbench.editor.releaseNotes';
 
 	private contentDisposables: IDisposable[] = [];
 	private scrollYPercentage: number = 0;
@@ -63,7 +64,8 @@ export class ReleaseNotesEditor extends WebviewEditor {
 		@IOpenerService private openerService: IOpenerService,
 		@IModeService private modeService: IModeService,
 		@IPartService private partService: IPartService,
-		@IContextViewService private _contextViewService: IContextViewService
+		@IContextViewService private readonly _contextViewService: IContextViewService,
+		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService
 	) {
 		super(ReleaseNotesEditor.ID, telemetryService, themeService, storageService, contextKeyService);
 	}
@@ -104,7 +106,17 @@ export class ReleaseNotesEditor extends WebviewEditor {
 		const colorMap = TokenizationRegistry.getColorMap();
 		const css = generateTokensCSSForColorMap(colorMap);
 		const body = renderBody(marked(text, { renderer }), css);
-		this._webview = new WebView(this.content, this.partService.getContainer(Parts.EDITOR_PART), this.environmentService, this._contextViewService, this.contextKey, this.findInputFocusContextKey, {}, false);
+		this._webview = new Webview(
+			this.content,
+			this.partService.getContainer(Parts.EDITOR_PART),
+			this.environmentService,
+			this._contextService,
+			this._contextViewService,
+			this.contextKey,
+			this.findInputFocusContextKey,
+			{},
+			false);
+
 		if (this.input && this.input instanceof ReleaseNotesInput) {
 			const state = this.loadViewState(this.input.version);
 			if (state) {
@@ -112,7 +124,7 @@ export class ReleaseNotesEditor extends WebviewEditor {
 			}
 		}
 		this.onThemeChange(this.themeService.getTheme());
-		this._webview.contents = [body];
+		this._webview.contents = body;
 
 		this._webview.onDidClickLink(link => {
 			addGAParameters(this.telemetryService, this.environmentService, link, 'ReleaseNotes')
diff --git a/src/vs/workbench/parts/update/electron-browser/update.contribution.ts b/src/vs/workbench/parts/update/electron-browser/update.contribution.ts
index c0fb85b7c64..73400b9d5c1 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.contribution.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.contribution.ts
@@ -8,6 +8,7 @@
 import * as nls from 'vs/nls';
 import 'vs/css!./media/update.contribution';
 import 'vs/platform/update/node/update.config.contribution';
+import * as platform from 'vs/base/common/platform';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { ReleaseNotesEditor } from 'vs/workbench/parts/update/electron-browser/releaseNotesEditor';
@@ -23,7 +24,7 @@ import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
 	.registerWorkbenchContribution(ProductContribution, LifecyclePhase.Running);
 
-if (process.platform === 'win32' && process.arch === 'ia32') {
+if (platform.isWindows && process.arch === 'ia32') {
 	Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
 		.registerWorkbenchContribution(Win3264BitContribution, LifecyclePhase.Running);
 }
diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
index 6b702d8667e..47a62a92dda 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.ts
@@ -11,7 +11,6 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { IAction, Action } from 'vs/base/common/actions';
 import { IDisposable, dispose, empty as EmptyDisposable } from 'vs/base/common/lifecycle';
 import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IMessageService, CloseAction, Severity } from 'vs/platform/message/common/message';
 import pkg from 'vs/platform/node/package';
 import product from 'vs/platform/node/product';
 import URI from 'vs/base/common/uri';
@@ -32,6 +31,7 @@ import { IUpdateService, State as UpdateState, StateType, IUpdate } from 'vs/pla
 import * as semver from 'semver';
 import { OS } from 'vs/base/common/platform';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 const NotNowAction = new Action(
 	'update.later',
@@ -167,11 +167,6 @@ export class ShowCurrentReleaseNotesAction extends AbstractShowReleaseNotesActio
 	}
 }
 
-const LinkAction = (id: string, message: string, licenseUrl: string) => new Action(
-	id, message, null, true,
-	() => { window.open(licenseUrl); return TPromise.as(null); }
-);
-
 export class ProductContribution implements IWorkbenchContribution {
 
 	private static readonly KEY = 'releaseNotes/lastVersion';
@@ -179,7 +174,7 @@ export class ProductContribution implements IWorkbenchContribution {
 	constructor(
 		@IStorageService storageService: IStorageService,
 		@IInstantiationService instantiationService: IInstantiationService,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@IWorkbenchEditorService editorService: IWorkbenchEditorService,
 		@IEnvironmentService environmentService: IEnvironmentService
 	) {
@@ -190,24 +185,19 @@ export class ProductContribution implements IWorkbenchContribution {
 			instantiationService.invokeFunction(loadReleaseNotes, pkg.version).then(
 				text => editorService.openEditor(instantiationService.createInstance(ReleaseNotesInput, pkg.version, text), { pinned: true }),
 				() => {
-					messageService.show(Severity.Info, {
+					notificationService.notify({
+						severity: severity.Info,
 						message: nls.localize('read the release notes', "Welcome to {0} v{1}! Would you like to read the Release Notes?", product.nameLong, pkg.version),
-						actions: [
-							instantiationService.createInstance(OpenLatestReleaseNotesInBrowserAction),
-							CloseAction
-						]
+						actions: { primary: [instantiationService.createInstance(OpenLatestReleaseNotesInBrowserAction)] }
 					});
 				});
 		}
 
 		// should we show the new license?
 		if (product.licenseUrl && lastVersion && semver.satisfies(lastVersion, '<1.0.0') && semver.satisfies(pkg.version, '>=1.0.0')) {
-			messageService.show(Severity.Info, {
-				message: nls.localize('licenseChanged', "Our license terms have changed, please go through them.", product.nameLong, pkg.version),
-				actions: [
-					LinkAction('update.showLicense', nls.localize('license', "Read License"), product.licenseUrl),
-					CloseAction
-				]
+			notificationService.notify({
+				severity: severity.Info,
+				message: nls.localize('licenseChanged', "Our license terms have changed, please click [here]({0}) to go through them.", product.licenseUrl),
 			});
 		}
 
@@ -219,7 +209,11 @@ class NeverShowAgain {
 
 	private readonly key: string;
 
-	readonly action = new Action(`neverShowAgain:${this.key}`, nls.localize('neveragain', "Don't Show Again"), undefined, true, () => {
+	readonly action = new Action(`neverShowAgain:${this.key}`, nls.localize('neveragain', "Don't Show Again"), undefined, true, (notification: IDisposable) => {
+
+		// Hide notification
+		notification.dispose();
+
 		return TPromise.wrap(this.storageService.store(this.key, true, StorageScope.GLOBAL));
 	});
 
@@ -241,7 +235,7 @@ export class Win3264BitContribution implements IWorkbenchContribution {
 	constructor(
 		@IStorageService storageService: IStorageService,
 		@IInstantiationService instantiationService: IInstantiationService,
-		@IMessageService messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IWorkbenchEditorService editorService: IWorkbenchEditorService,
 		@IEnvironmentService environmentService: IEnvironmentService
 	) {
@@ -259,13 +253,10 @@ export class Win3264BitContribution implements IWorkbenchContribution {
 			? Win3264BitContribution.INSIDER_URL
 			: Win3264BitContribution.URL;
 
-		messageService.show(Severity.Info, {
-			message: nls.localize('64bitisavailable', "{0} for 64-bit Windows is now available!", product.nameShort),
-			actions: [
-				LinkAction('update.show64bitreleasenotes', nls.localize('learn more', "Learn More"), url),
-				neverShowAgain.action,
-				CloseAction
-			]
+		this.notificationService.notify({
+			severity: severity.Info,
+			message: nls.localize('64bitisavailable', "{0} for 64-bit Windows is now available! Click [here]({1}) to learn more.", product.nameShort, url),
+			actions: { secondary: [neverShowAgain.action] }
 		});
 	}
 }
@@ -289,6 +280,7 @@ export class UpdateContribution implements IGlobalActivity {
 	private static readonly openUserSnippets = 'workbench.action.openSnippets';
 	private static readonly selectColorThemeId = 'workbench.action.selectTheme';
 	private static readonly selectIconThemeId = 'workbench.action.selectIconTheme';
+	private static readonly showExtensionsId = 'workbench.view.extensions';
 
 	get id() { return 'vs.update'; }
 	get name() { return ''; }
@@ -302,7 +294,7 @@ export class UpdateContribution implements IGlobalActivity {
 		@IStorageService private storageService: IStorageService,
 		@ICommandService private commandService: ICommandService,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IUpdateService private updateService: IUpdateService,
 		@IWorkbenchEditorService editorService: IWorkbenchEditorService,
 		@IActivityService private activityService: IActivityService
@@ -375,7 +367,7 @@ export class UpdateContribution implements IGlobalActivity {
 	}
 
 	private onUpdateNotAvailable(): void {
-		this.messageService.show(severity.Info, nls.localize('noUpdatesAvailable', "There are no updates currently available."));
+		this.notificationService.info(nls.localize('noUpdatesAvailable', "There are currently no updates available."));
 	}
 
 	// linux
@@ -388,9 +380,10 @@ export class UpdateContribution implements IGlobalActivity {
 		const downloadAction = new Action('update.downloadNow', nls.localize('download now', "Download Now"), null, true, () =>
 			this.updateService.downloadUpdate());
 
-		this.messageService.show(severity.Info, {
+		this.notificationService.notify({
+			severity: severity.Info,
 			message: nls.localize('thereIsUpdateAvailable', "There is an available update."),
-			actions: [downloadAction, NotNowAction, releaseNotesAction]
+			actions: { primary: [downloadAction, NotNowAction, releaseNotesAction] }
 		});
 	}
 
@@ -404,9 +397,10 @@ export class UpdateContribution implements IGlobalActivity {
 		const installUpdateAction = new Action('update.applyUpdate', nls.localize('installUpdate', "Install Update"), undefined, true, () =>
 			this.updateService.applyUpdate());
 
-		this.messageService.show(severity.Info, {
+		this.notificationService.notify({
+			severity: severity.Info,
 			message: nls.localize('updateAvailable', "There's an available update: {0} {1}", product.nameLong, update.productVersion),
-			actions: [installUpdateAction, NotNowAction, releaseNotesAction]
+			actions: { primary: [installUpdateAction, NotNowAction, releaseNotesAction] }
 		});
 	}
 
@@ -418,9 +412,10 @@ export class UpdateContribution implements IGlobalActivity {
 			return;
 		}
 
-		this.messageService.show(severity.Info, {
+		this.notificationService.notify({
+			severity: severity.Info,
 			message: nls.localize('updateInstalling', "{0} {1} is being installed in the background, we'll let you know when it's done.", product.nameLong, update.productVersion),
-			actions: [neverShowAgain.action, CloseAction]
+			actions: { secondary: [neverShowAgain.action] }
 		});
 	}
 
@@ -434,9 +429,10 @@ export class UpdateContribution implements IGlobalActivity {
 		const applyUpdateAction = new Action('update.applyUpdate', nls.localize('updateNow', "Update Now"), undefined, true, () =>
 			this.updateService.quitAndInstall());
 
-		this.messageService.show(severity.Info, {
+		this.notificationService.notify({
+			severity: severity.Info,
 			message: nls.localize('updateAvailableAfterRestart', "{0} will be updated after it restarts.", product.nameLong),
-			actions: [applyUpdateAction, NotNowAction, releaseNotesAction]
+			actions: { primary: [applyUpdateAction, NotNowAction, releaseNotesAction] }
 		});
 	}
 
@@ -463,6 +459,7 @@ export class UpdateContribution implements IGlobalActivity {
 			new Separator(),
 			new CommandAction(UpdateContribution.openSettingsId, nls.localize('settings', "Settings"), this.commandService),
 			new CommandAction(UpdateContribution.openKeybindingsId, nls.localize('keyboardShortcuts', "Keyboard Shortcuts"), this.commandService),
+			new CommandAction(UpdateContribution.showExtensionsId, nls.localize('showExtensions', "Manage Extensions"), this.commandService),
 			new Separator(),
 			new CommandAction(UpdateContribution.openUserSnippets, nls.localize('userSnippets', "User Snippets"), this.commandService),
 			new Separator(),
diff --git a/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/gettingStarted.ts b/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/gettingStarted.ts
index 642cecf588e..a2948effde7 100644
--- a/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/gettingStarted.ts
+++ b/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/gettingStarted.ts
@@ -39,7 +39,7 @@ export class GettingStarted implements IWorkbenchContribution {
 	private openExternal(url: string) {
 		// Don't open the welcome page as the root user on Linux, this is due to a bug with xdg-open
 		// which recommends against running itself as root.
-		if (platform.isLinux && platform.isRootUser) {
+		if (platform.isLinux && platform.isRootUser()) {
 			return;
 		}
 		window.open(url);
@@ -61,4 +61,4 @@ export class GettingStarted implements IWorkbenchContribution {
 			});
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts
index 26b5cf2c7e9..75313c3e266 100644
--- a/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts
+++ b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts
@@ -149,7 +149,7 @@ class WelcomeOverlay {
 		@IPartService private partService: IPartService,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
 		@ICommandService private commandService: ICommandService,
-		@IContextKeyService private _contextKeyService: IContextKeyService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 		@IKeybindingService private keybindingService: IKeybindingService
 	) {
 		this._overlayVisible = OVERLAY_VISIBLE.bindTo(this._contextKeyService);
diff --git a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
index 56ccc4ee28c..f75566bb048 100644
--- a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
+++ b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
@@ -24,7 +24,6 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { Schemas } from 'vs/base/common/network';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
-import { IMessageService, Severity, CloseAction } from 'vs/platform/message/common/message';
 import { getInstalledExtensions, IExtensionStatus, onExtensionChanged, isKeymapExtension } from 'vs/workbench/parts/extensions/electron-browser/extensionsUtils';
 import { IExtensionEnablementService, IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService, EnablementState } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { used } from 'vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page';
@@ -39,6 +38,8 @@ import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IWorkspaceIdentifier, getWorkspaceLabel, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { IEditorInputFactory, EditorInput } from 'vs/workbench/common/editor';
 import { getIdAndVersionFromLocalExtensionId } from 'vs/platform/extensionManagement/node/extensionManagementUtil';
+import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
 
 used();
 
@@ -151,7 +152,6 @@ interface Strings {
 			"${WelcomePageInstalled-2}",
 			"${WelcomePageInstalled-3}",
 			"${WelcomePageInstalled-4}",
-			"${WelcomePageInstalled-5}",
 			"${WelcomePageInstalled-6}"
 		]
 	}
@@ -188,7 +188,6 @@ const extensionPackStrings: Strings = {
 			"${WelcomePageInstalled-2}",
 			"${WelcomePageInstalled-3}",
 			"${WelcomePageInstalled-4}",
-			"${WelcomePageInstalled-5}",
 			"${WelcomePageInstalled-6}"
 		]
 	}
@@ -227,7 +226,8 @@ class WelcomePage {
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IConfigurationService private configurationService: IConfigurationService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
+		@IChoiceService private choiceService: IChoiceService,
 		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService,
 		@IExtensionGalleryService private extensionGalleryService: IExtensionGalleryService,
 		@IExtensionManagementService private extensionManagementService: IExtensionManagementService,
@@ -413,7 +413,7 @@ class WelcomePage {
 					extensionId: extensionSuggestion.id,
 					outcome: 'already_enabled',
 				});
-				this.messageService.show(Severity.Info, strings.alreadyInstalled.replace('{0}', extensionSuggestion.name));
+				this.notificationService.info(strings.alreadyInstalled.replace('{0}', extensionSuggestion.name));
 				return;
 			}
 			const foundAndInstalled = installedExtension ? TPromise.as(installedExtension.identifier) : this.extensionGalleryService.query({ names: [extensionSuggestion.id], source: telemetryFrom })
@@ -430,16 +430,13 @@ class WelcomePage {
 							return extension.identifier;
 						});
 				});
-			this.messageService.show(Severity.Info, {
-				message: strings.reloadAfterInstall.replace('{0}', extensionSuggestion.name),
-				actions: [
-					new Action('ok', localize('ok', "OK"), null, true, () => {
+
+			this.choiceService.choose(Severity.Info, strings.reloadAfterInstall.replace('{0}', extensionSuggestion.name), [localize('ok', "OK"), localize('details', "Details")]).then(choice => {
+				switch (choice) {
+					case 0 /* OK */:
 						const messageDelay = TPromise.timeout(300);
 						messageDelay.then(() => {
-							this.messageService.show(Severity.Info, {
-								message: strings.installing.replace('{0}', extensionSuggestion.name),
-								actions: [CloseAction]
-							});
+							this.notificationService.info(strings.installing.replace('{0}', extensionSuggestion.name));
 						});
 						TPromise.join(extensionSuggestion.isKeymap ? extensions.filter(extension => isKeymapExtension(this.tipsService, extension) && extension.globallyEnabled)
 							.map(extension => {
@@ -477,7 +474,7 @@ class WelcomePage {
 											extensionId: extensionSuggestion.id,
 											outcome: 'not_found',
 										});
-										this.messageService.show(Severity.Error, strings.extensionNotFound.replace('{0}', extensionSuggestion.name).replace('{1}', extensionSuggestion.id));
+										this.notificationService.error(strings.extensionNotFound.replace('{0}', extensionSuggestion.name).replace('{1}', extensionSuggestion.id));
 										return undefined;
 									}
 								});
@@ -487,7 +484,7 @@ class WelcomePage {
 										"from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 										"extensionId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 										"outcome": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-										"error": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+										"error": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" }
 									}
 								*/
 								this.telemetryService.publicLog(strings.installedEvent, {
@@ -496,11 +493,10 @@ class WelcomePage {
 									outcome: isPromiseCanceledError(err) ? 'canceled' : 'error',
 									error: String(err),
 								});
-								this.messageService.show(Severity.Error, err);
+								this.notificationService.error(err);
 							});
-						return TPromise.as(true);
-					}),
-					new Action('details', localize('details', "Details"), null, true, () => {
+						break;
+					case 1 /* Details */:
 						/* __GDPR__FRAGMENT__
 							"WelcomePageDetails-1" : {
 								"from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -514,24 +510,8 @@ class WelcomePage {
 						this.extensionsWorkbenchService.queryGallery({ names: [extensionSuggestion.id] })
 							.then(result => this.extensionsWorkbenchService.open(result.firstPage[0]))
 							.then(null, onUnexpectedError);
-						return TPromise.as(false);
-					}),
-					new Action('cancel', localize('cancel', "Cancel"), null, true, () => {
-						/* __GDPR__FRAGMENT__
-							"WelcomePageInstalled-5" : {
-								"from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-								"extensionId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-								"outcome": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-							}
-						*/
-						this.telemetryService.publicLog(strings.installedEvent, {
-							from: telemetryFrom,
-							extensionId: extensionSuggestion.id,
-							outcome: 'user_canceled',
-						});
-						return TPromise.as(true);
-					})
-				]
+						break;
+				}
 			});
 		}).then(null, err => {
 			/* __GDPR__FRAGMENT__
@@ -539,7 +519,7 @@ class WelcomePage {
 					"from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 					"extensionId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 					"outcome": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					"error": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+					"error": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" }
 				}
 			*/
 			this.telemetryService.publicLog(strings.installedEvent, {
@@ -548,7 +528,7 @@ class WelcomePage {
 				outcome: isPromiseCanceledError(err) ? 'canceled' : 'error',
 				error: String(err),
 			});
-			this.messageService.show(Severity.Error, err);
+			this.notificationService.error(err);
 		});
 	}
 
diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
index 422b30d7333..67b8e6e13e4 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
@@ -33,13 +33,13 @@ import { isObject } from 'vs/base/common/types';
 import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { registerColor, focusBorder, textLinkForeground, textLinkActiveForeground, textPreformatForeground, contrastBorder, textBlockQuoteBackground, textBlockQuoteBorder } from 'vs/platform/theme/common/colorRegistry';
 import { getExtraColor } from 'vs/workbench/parts/welcome/walkThrough/node/walkThroughUtils';
 import { UILabelProvider } from 'vs/base/common/keybindingLabels';
 import { OS, OperatingSystem } from 'vs/base/common/platform';
 import { deepClone } from 'vs/base/common/objects';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export const WALK_THROUGH_FOCUS = new RawContextKey<boolean>('interactivePlaygroundFocus', false);
 
@@ -83,7 +83,7 @@ class WalkThroughCodeEditor extends CodeEditor {
 
 export class WalkThroughPart extends BaseEditor {
 
-	static ID: string = 'workbench.editor.walkThroughPart';
+	static readonly ID: string = 'workbench.editor.walkThroughPart';
 
 	private disposables: IDisposable[] = [];
 	private contentDisposables: IDisposable[] = [];
@@ -102,7 +102,7 @@ export class WalkThroughPart extends BaseEditor {
 		@IStorageService private storageService: IStorageService,
 		@IContextKeyService private contextKeyService: IContextKeyService,
 		@IConfigurationService private configurationService: IConfigurationService,
-		@IMessageService private messageService: IMessageService
+		@INotificationService private notificationService: INotificationService
 	) {
 		super(WalkThroughPart.ID, telemetryService, themeService);
 		this.editorFocus = WALK_THROUGH_FOCUS.bindTo(this.contextKeyService);
@@ -199,7 +199,7 @@ export class WalkThroughPart extends BaseEditor {
 
 	private open(uri: URI) {
 		if (uri.scheme === 'command' && uri.path === 'git.clone' && !CommandsRegistry.getCommand('git.clone')) {
-			this.messageService.show(Severity.Info, localize('walkThrough.gitNotFound', "It looks like Git is not installed on your system."));
+			this.notificationService.info(localize('walkThrough.gitNotFound', "It looks like Git is not installed on your system."));
 			return;
 		}
 		this.openerService.open(this.addFrom(uri));
diff --git a/src/vs/workbench/services/backup/test/node/backupFileService.test.ts b/src/vs/workbench/services/backup/test/node/backupFileService.test.ts
index 048787bcf7d..159133f0e46 100644
--- a/src/vs/workbench/services/backup/test/node/backupFileService.test.ts
+++ b/src/vs/workbench/services/backup/test/node/backupFileService.test.ts
@@ -17,7 +17,7 @@ import Uri from 'vs/base/common/uri';
 import { BackupFileService, BackupFilesModel } from 'vs/workbench/services/backup/node/backupFileService';
 import { FileService } from 'vs/workbench/services/files/node/fileService';
 import { TextModel, createTextBufferFactory } from 'vs/editor/common/model/textModel';
-import { TestContextService, TestTextResourceConfigurationService, getRandomTestPath, TestLifecycleService } from 'vs/workbench/test/workbenchTestServices';
+import { TestContextService, TestTextResourceConfigurationService, getRandomTestPath, TestLifecycleService, TestEnvironmentService } from 'vs/workbench/test/workbenchTestServices';
 import { Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { DefaultEndOfLine } from 'vs/editor/common/model';
@@ -39,7 +39,7 @@ const untitledBackupPath = path.join(workspaceBackupPath, 'untitled', crypto.cre
 
 class TestBackupFileService extends BackupFileService {
 	constructor(workspace: Uri, backupHome: string, workspacesJsonPath: string) {
-		const fileService = new FileService(new TestContextService(new Workspace(workspace.fsPath, workspace.fsPath, toWorkspaceFolders([{ path: workspace.fsPath }]))), new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), { disableWatcher: true });
+		const fileService = new FileService(new TestContextService(new Workspace(workspace.fsPath, workspace.fsPath, toWorkspaceFolders([{ path: workspace.fsPath }]))), TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), { disableWatcher: true });
 
 		super(workspaceBackupPath, fileService);
 	}
diff --git a/src/vs/workbench/services/configuration/node/configuration.ts b/src/vs/workbench/services/configuration/node/configuration.ts
index 897e2c0faac..3a91b6124be 100644
--- a/src/vs/workbench/services/configuration/node/configuration.ts
+++ b/src/vs/workbench/services/configuration/node/configuration.ts
@@ -92,10 +92,12 @@ export class WorkspaceConfiguration extends Disposable {
 
 		this._workspaceConfigPath = workspaceConfigPath;
 
-		this.stopListeningToWatcher();
 		return new TPromise<void>((c, e) => {
 			const defaultConfig = new WorkspaceConfigurationModelParser(this._workspaceConfigPath.fsPath);
 			defaultConfig.parse(JSON.stringify({ folders: [] } as IStoredWorkspace, null, '\t'));
+			if (this._workspaceConfigurationWatcher) {
+				this.disposeConfigurationWatcher();
+			}
 			this._workspaceConfigurationWatcher = new ConfigWatcher(this._workspaceConfigPath.fsPath, {
 				changeBufferDelay: 300,
 				onError: error => errors.onUnexpectedError(error),
@@ -144,7 +146,6 @@ export class WorkspaceConfiguration extends Disposable {
 	}
 
 	private listenToWatcher() {
-		this._workspaceConfigurationWatcherDisposables.push(this._workspaceConfigurationWatcher);
 		this._workspaceConfigurationWatcher.onDidUpdateConfiguration(() => this._onDidUpdateConfiguration.fire(), this, this._workspaceConfigurationWatcherDisposables);
 	}
 
@@ -156,8 +157,15 @@ export class WorkspaceConfiguration extends Disposable {
 		this._cache = this._workspaceConfigurationModelParser.settingsModel.merge(this._workspaceConfigurationModelParser.launchModel);
 	}
 
+	private disposeConfigurationWatcher(): void {
+		this.stopListeningToWatcher();
+		if (this._workspaceConfigurationWatcher) {
+			this._workspaceConfigurationWatcher.dispose();
+		}
+	}
+
 	dispose(): void {
-		dispose(this._workspaceConfigurationWatcherDisposables);
+		this.disposeConfigurationWatcher();
 		super.dispose();
 	}
 }
diff --git a/src/vs/workbench/services/configuration/node/configurationEditingService.ts b/src/vs/workbench/services/configuration/node/configurationEditingService.ts
index f91fcb78f79..b81c48bc42e 100644
--- a/src/vs/workbench/services/configuration/node/configurationEditingService.ts
+++ b/src/vs/workbench/services/configuration/node/configurationEditingService.ts
@@ -27,10 +27,11 @@ import { FOLDER_SETTINGS_PATH, WORKSPACE_STANDALONE_CONFIGURATIONS, TASKS_CONFIG
 import { IFileService } from 'vs/platform/files/common/files';
 import { ITextModelService, ITextEditorModel } from 'vs/editor/common/services/resolverService';
 import { OVERRIDE_PROPERTY_PATTERN, IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { IChoiceService, IMessageService, Severity } from 'vs/platform/message/common/message';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { ITextModel } from 'vs/editor/common/model';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
+import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 
 export enum ConfigurationEditingErrorCode {
 
@@ -127,7 +128,7 @@ export class ConfigurationEditingService {
 		@ITextModelService private textModelResolverService: ITextModelService,
 		@ITextFileService private textFileService: ITextFileService,
 		@IChoiceService private choiceService: IChoiceService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@ICommandService private commandService: ICommandService,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService
 	) {
@@ -184,7 +185,7 @@ export class ConfigurationEditingService {
 				this.onConfigurationFileDirtyError(error, operation, scopes);
 				break;
 			default:
-				this.messageService.show(Severity.Error, error.message);
+				this.notificationService.error(error.message);
 		}
 	}
 
@@ -193,21 +194,17 @@ export class ConfigurationEditingService {
 			: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? nls.localize('openLaunchConfiguration', "Open Launch Configuration")
 				: null;
 		if (openStandAloneConfigurationActionLabel) {
-			this.choiceService.choose(Severity.Error, error.message, [openStandAloneConfigurationActionLabel, nls.localize('close', "Close")], 1)
+			this.choiceService.choose(Severity.Error, error.message, [openStandAloneConfigurationActionLabel])
 				.then(option => {
-					switch (option) {
-						case 0:
-							this.openFile(operation.resource);
-							break;
+					if (option === 0) {
+						this.openFile(operation.resource);
 					}
 				});
 		} else {
-			this.choiceService.choose(Severity.Error, error.message, [nls.localize('open', "Open Settings"), nls.localize('close', "Close")], 1)
+			this.choiceService.choose(Severity.Error, error.message, [nls.localize('open', "Open Settings")])
 				.then(option => {
-					switch (option) {
-						case 0:
-							this.openSettings(operation);
-							break;
+					if (option === 0) {
+						this.openSettings(operation);
 					}
 				});
 		}
@@ -218,26 +215,26 @@ export class ConfigurationEditingService {
 			: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? nls.localize('openLaunchConfiguration', "Open Launch Configuration")
 				: null;
 		if (openStandAloneConfigurationActionLabel) {
-			this.choiceService.choose(Severity.Error, error.message, [nls.localize('saveAndRetry', "Save and Retry"), openStandAloneConfigurationActionLabel, nls.localize('close', "Close")], 2)
+			this.choiceService.choose(Severity.Error, error.message, [nls.localize('saveAndRetry', "Save and Retry"), openStandAloneConfigurationActionLabel])
 				.then(option => {
 					switch (option) {
-						case 0:
+						case 0 /* Save & Retry */:
 							const key = operation.key ? `${operation.workspaceStandAloneConfigurationKey}.${operation.key}` : operation.workspaceStandAloneConfigurationKey;
 							this.writeConfiguration(operation.target, { key, value: operation.value }, <ConfigurationEditingOptions>{ force: true, scopes });
 							break;
-						case 1:
+						case 1 /* Open Config */:
 							this.openFile(operation.resource);
 							break;
 					}
 				});
 		} else {
-			this.choiceService.choose(Severity.Error, error.message, [nls.localize('saveAndRetry', "Save and Retry"), nls.localize('open', "Open Settings"), nls.localize('close', "Close")], 2)
+			this.choiceService.choose(Severity.Error, error.message, [nls.localize('saveAndRetry', "Save and Retry"), nls.localize('open', "Open Settings")])
 				.then(option => {
 					switch (option) {
-						case 0:
+						case 0 /* Save and Retry */:
 							this.writeConfiguration(operation.target, { key: operation.key, value: operation.value }, <ConfigurationEditingOptions>{ force: true, scopes });
 							break;
-						case 1:
+						case 1 /* Open Settings */:
 							this.openSettings(operation);
 							break;
 					}
@@ -288,37 +285,37 @@ export class ConfigurationEditingService {
 			// User issues
 			case ConfigurationEditingErrorCode.ERROR_INVALID_CONFIGURATION: {
 				if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
-					return nls.localize('errorInvalidTaskConfiguration', "Unable to write into tasks file. Please open **Tasks** file to correct errors/warnings in it and try again.");
+					return nls.localize('errorInvalidTaskConfiguration', "Unable to write into the tasks configuration file. Please open it to correct errors/warnings in it and try again.");
 				}
 				if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
-					return nls.localize('errorInvalidLaunchConfiguration', "Unable to write into launch file. Please open **Launch** file to correct errors/warnings in it and try again.");
+					return nls.localize('errorInvalidLaunchConfiguration', "Unable to write into the launch configuration file. Please open it to correct errors/warnings in it and try again.");
 				}
 				switch (target) {
 					case ConfigurationTarget.USER:
-						return nls.localize('errorInvalidConfiguration', "Unable to write into user settings. Please open **User Settings** file to correct errors/warnings in it and try again.");
+						return nls.localize('errorInvalidConfiguration', "Unable to write into user settings. Please open the user settings to correct errors/warnings in it and try again.");
 					case ConfigurationTarget.WORKSPACE:
-						return nls.localize('errorInvalidConfigurationWorkspace', "Unable to write into workspace settings. Please open **Workspace Settings** file to correct errors/warnings in the file and try again.");
+						return nls.localize('errorInvalidConfigurationWorkspace', "Unable to write into workspace settings. Please open the workspace settings to correct errors/warnings in the file and try again.");
 					case ConfigurationTarget.WORKSPACE_FOLDER:
 						const workspaceFolderName = this.contextService.getWorkspaceFolder(operation.resource).name;
-						return nls.localize('errorInvalidConfigurationFolder', "Unable to write into folder settings. Please open **Folder Settings** file under **{0}** folder to correct errors/warnings in it and try again.", workspaceFolderName);
+						return nls.localize('errorInvalidConfigurationFolder', "Unable to write into folder settings. Please open the '{0}' folder settings to correct errors/warnings in it and try again.", workspaceFolderName);
 				}
 				return '';
 			}
 			case ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_DIRTY: {
 				if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY) {
-					return nls.localize('errorTasksConfigurationFileDirty', "Unable to write into tasks file because the file is dirty. Please save the **Tasks Configuration** file and try again.");
+					return nls.localize('errorTasksConfigurationFileDirty', "Unable to write into tasks configuration file because the file is dirty. Please save it first and then try again.");
 				}
 				if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
-					return nls.localize('errorLaunchConfigurationFileDirty', "Unable to write into launch file because the file is dirty. Please save the **Launch Configuration** file and try again.");
+					return nls.localize('errorLaunchConfigurationFileDirty', "Unable to write into launch configuration file because the file is dirty. Please save it first and then try again.");
 				}
 				switch (target) {
 					case ConfigurationTarget.USER:
-						return nls.localize('errorConfigurationFileDirty', "Unable to write into user settings because the file is dirty. Please save the **User Settings** file and try again.");
+						return nls.localize('errorConfigurationFileDirty', "Unable to write into user settings because the file is dirty. Please save the user settings file first and then try again.");
 					case ConfigurationTarget.WORKSPACE:
-						return nls.localize('errorConfigurationFileDirtyWorkspace', "Unable to write into workspace settings because the file is dirty. Please save the **Workspace Settings** file and try again.");
+						return nls.localize('errorConfigurationFileDirtyWorkspace', "Unable to write into workspace settings because the file is dirty. Please save the workspace settings file first and then try again.");
 					case ConfigurationTarget.WORKSPACE_FOLDER:
 						const workspaceFolderName = this.contextService.getWorkspaceFolder(operation.resource).name;
-						return nls.localize('errorConfigurationFileDirtyFolder', "Unable to write into folder settings because the file is dirty. Please save the **Folder Settings** file under **{0}** folder and try again.", workspaceFolderName);
+						return nls.localize('errorConfigurationFileDirtyFolder', "Unable to write into folder settings because the file is dirty. Please save the '{0}' folder settings file first and then try again.", workspaceFolderName);
 				}
 				return '';
 			}
diff --git a/src/vs/workbench/services/configuration/test/node/configurationEditingService.test.ts b/src/vs/workbench/services/configuration/test/node/configurationEditingService.test.ts
index f0d58534de4..032c4a8770b 100644
--- a/src/vs/workbench/services/configuration/test/node/configurationEditingService.test.ts
+++ b/src/vs/workbench/services/configuration/test/node/configurationEditingService.test.ts
@@ -18,7 +18,7 @@ import { parseArgs } from 'vs/platform/environment/node/argv';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
 import extfs = require('vs/base/node/extfs');
-import { TestTextFileService, TestTextResourceConfigurationService, workbenchInstantiationService, TestLifecycleService } from 'vs/workbench/test/workbenchTestServices';
+import { TestTextFileService, TestTextResourceConfigurationService, workbenchInstantiationService, TestLifecycleService, TestEnvironmentService } from 'vs/workbench/test/workbenchTestServices';
 import uuid = require('vs/base/common/uuid');
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
 import { WorkspaceService } from 'vs/workbench/services/configuration/node/configurationService';
@@ -31,10 +31,10 @@ import { TestInstantiationService } from 'vs/platform/instantiation/test/common/
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
-import { IChoiceService } from 'vs/platform/message/common/message';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { IWindowConfiguration } from 'vs/platform/windows/common/windows';
 import { mkdirp } from 'vs/base/node/pfs';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
 
 class SettingsTestEnvironmentService extends EnvironmentService {
 
@@ -102,7 +102,7 @@ suite('ConfigurationEditingService', () => {
 		instantiationService.stub(IWorkspaceContextService, workspaceService);
 		return workspaceService.initialize(noWorkspace ? {} as IWindowConfiguration : workspaceDir).then(() => {
 			instantiationService.stub(IConfigurationService, workspaceService);
-			instantiationService.stub(IFileService, new FileService(workspaceService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), { disableWatcher: true }));
+			instantiationService.stub(IFileService, new FileService(workspaceService, TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), { disableWatcher: true }));
 			instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
 			instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
 			testObject = instantiationService.createInstance(ConfigurationEditingService);
diff --git a/src/vs/workbench/services/configuration/test/node/configurationService.test.ts b/src/vs/workbench/services/configuration/test/node/configurationService.test.ts
index 2ef62d58898..bf72634738b 100644
--- a/src/vs/workbench/services/configuration/test/node/configurationService.test.ts
+++ b/src/vs/workbench/services/configuration/test/node/configurationService.test.ts
@@ -24,7 +24,7 @@ import { ConfigurationEditingErrorCode } from 'vs/workbench/services/configurati
 import { FileChangeType, FileChangesEvent, IFileService } from 'vs/platform/files/common/files';
 import { IWorkspaceContextService, WorkbenchState, IWorkspaceFoldersChangeEvent } from 'vs/platform/workspace/common/workspace';
 import { ConfigurationTarget, IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
-import { workbenchInstantiationService, TestTextResourceConfigurationService, TestTextFileService, TestLifecycleService } from 'vs/workbench/test/workbenchTestServices';
+import { workbenchInstantiationService, TestTextResourceConfigurationService, TestTextFileService, TestLifecycleService, TestEnvironmentService } from 'vs/workbench/test/workbenchTestServices';
 import { FileService } from 'vs/workbench/services/files/node/fileService';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
@@ -151,7 +151,7 @@ suite('WorkspaceContextService - Workspace', () => {
 
 				return workspaceService.initialize({ id: configPath, configPath }).then(() => {
 
-					instantiationService.stub(IFileService, new FileService(<IWorkspaceContextService>workspaceService, new TestTextResourceConfigurationService(), workspaceService, new TestLifecycleService(), { disableWatcher: true }));
+					instantiationService.stub(IFileService, new FileService(<IWorkspaceContextService>workspaceService, TestEnvironmentService, new TestTextResourceConfigurationService(), workspaceService, new TestLifecycleService(), { disableWatcher: true }));
 					instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
 					instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
 					workspaceService.setInstantiationService(instantiationService);
@@ -274,6 +274,19 @@ suite('WorkspaceContextService - Workspace', () => {
 			});
 	});
 
+	test('remove folders and add them back by writing into the file', done => {
+		const folders = testObject.getWorkspace().folders;
+		return testObject.removeFolders([folders[0].uri])
+			.then(() => {
+				testObject.onDidChangeWorkspaceFolders(actual => {
+					assert.deepEqual(actual.added.map(r => r.uri.toString()), [folders[0].uri.toString()]);
+					done();
+				});
+				const workspace = { folders: [{ path: folders[0].uri.fsPath }, { path: folders[1].uri.fsPath }] };
+				fs.writeFileSync(testObject.getWorkspace().configuration.fsPath, JSON.stringify(workspace, null, '\t'));
+			});
+	});
+
 	test('update folders (remove last and add to end)', () => {
 		const target = sinon.spy();
 		testObject.onDidChangeWorkspaceFolders(target);
@@ -395,7 +408,7 @@ suite('WorkspaceService - Initialization', () => {
 				instantiationService.stub(IEnvironmentService, environmentService);
 
 				return workspaceService.initialize(<IWindowConfiguration>{}).then(() => {
-					instantiationService.stub(IFileService, new FileService(<IWorkspaceContextService>workspaceService, new TestTextResourceConfigurationService(), workspaceService, new TestLifecycleService(), { disableWatcher: true }));
+					instantiationService.stub(IFileService, new FileService(<IWorkspaceContextService>workspaceService, TestEnvironmentService, new TestTextResourceConfigurationService(), workspaceService, new TestLifecycleService(), { disableWatcher: true }));
 					instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
 					instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
 					workspaceService.setInstantiationService(instantiationService);
@@ -647,7 +660,7 @@ suite('WorkspaceConfigurationService - Folder', () => {
 				instantiationService.stub(IEnvironmentService, environmentService);
 
 				return workspaceService.initialize(folderDir).then(() => {
-					instantiationService.stub(IFileService, new FileService(<IWorkspaceContextService>workspaceService, new TestTextResourceConfigurationService(), workspaceService, new TestLifecycleService(), { disableWatcher: true }));
+					instantiationService.stub(IFileService, new FileService(<IWorkspaceContextService>workspaceService, TestEnvironmentService, new TestTextResourceConfigurationService(), workspaceService, new TestLifecycleService(), { disableWatcher: true }));
 					instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
 					instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
 					workspaceService.setInstantiationService(instantiationService);
@@ -942,7 +955,7 @@ suite('WorkspaceConfigurationService - Multiroot', () => {
 
 				return workspaceService.initialize({ id: configPath, configPath }).then(() => {
 
-					instantiationService.stub(IFileService, new FileService(<IWorkspaceContextService>workspaceService, new TestTextResourceConfigurationService(), workspaceService, new TestLifecycleService(), { disableWatcher: true }));
+					instantiationService.stub(IFileService, new FileService(<IWorkspaceContextService>workspaceService, TestEnvironmentService, new TestTextResourceConfigurationService(), workspaceService, new TestLifecycleService(), { disableWatcher: true }));
 					instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
 					instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
 					workspaceService.setInstantiationService(instantiationService);
diff --git a/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts b/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
index 0364d7f5638..703f99559fa 100644
--- a/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
+++ b/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
@@ -6,18 +6,18 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import severity from 'vs/base/common/severity';
 import { IAction, IActionRunner, ActionRunner } from 'vs/base/common/actions';
 import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import dom = require('vs/base/browser/dom');
-import { IContextMenuService, IContextMenuDelegate, ContextSubMenu, IEvent } from 'vs/platform/contextview/browser/contextView';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 
 import { remote, webFrame } from 'electron';
 import { unmnemonicLabel } from 'vs/base/common/labels';
 import Event, { Emitter } from 'vs/base/common/event';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IContextMenuDelegate, ContextSubMenu, IEvent } from 'vs/base/browser/contextmenu';
 
 export class ContextMenuService implements IContextMenuService {
 
@@ -25,7 +25,7 @@ export class ContextMenuService implements IContextMenuService {
 	private _onDidContextMenu = new Emitter<void>();
 
 	constructor(
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IKeybindingService private keybindingService: IKeybindingService
 	) {
@@ -129,6 +129,6 @@ export class ContextMenuService implements IContextMenuService {
 		const context = delegate.getActionsContext ? delegate.getActionsContext(event) : event;
 		const res = actionRunner.run(actionToRun, context) || TPromise.as(null);
 
-		res.done(null, e => this.messageService.show(severity.Error, e));
+		res.done(null, e => this.notificationService.error(e));
 	}
 }
diff --git a/src/vs/workbench/services/message/electron-browser/messageService.ts b/src/vs/workbench/services/dialogs/electron-browser/dialogs.ts
similarity index 54%
rename from src/vs/workbench/services/message/electron-browser/messageService.ts
rename to src/vs/workbench/services/dialogs/electron-browser/dialogs.ts
index 6e7a376cd96..23fb5e74959 100644
--- a/src/vs/workbench/services/message/electron-browser/messageService.ts
+++ b/src/vs/workbench/services/dialogs/electron-browser/dialogs.ts
@@ -8,22 +8,25 @@
 import nls = require('vs/nls');
 import product from 'vs/platform/node/product';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { WorkbenchMessageService } from 'vs/workbench/services/message/browser/messageService';
-import { IConfirmation, Severity, IChoiceService, IConfirmationResult } from 'vs/platform/message/common/message';
+import Severity from 'vs/base/common/severity';
 import { isLinux } from 'vs/base/common/platform';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { Action } from 'vs/base/common/actions';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { mnemonicButtonLabel } from 'vs/base/common/labels';
+import { IConfirmationService, IChoiceService, IConfirmation, IConfirmationResult, Choice } from 'vs/platform/dialogs/common/dialogs';
+import { INotificationService, INotificationHandle, INotificationActions } from 'vs/platform/notification/common/notification';
+import { once } from 'vs/base/common/event';
+import URI from 'vs/base/common/uri';
+import { basename } from 'vs/base/common/paths';
 
-export class MessageService extends WorkbenchMessageService implements IChoiceService {
+export class DialogService implements IChoiceService, IConfirmationService {
+
+	public _serviceBrand: any;
 
 	constructor(
-		container: HTMLElement,
 		@IWindowService private windowService: IWindowService,
-		@ITelemetryService telemetryService: ITelemetryService
+		@INotificationService private notificationService: INotificationService
 	) {
-		super(container, telemetryService);
 	}
 
 	public confirmWithCheckbox(confirmation: IConfirmation): TPromise<IConfirmationResult> {
@@ -59,7 +62,7 @@ export class MessageService extends WorkbenchMessageService implements IChoiceSe
 			buttons.push(nls.localize('cancelButton', "Cancel"));
 		}
 
-		let opts: Electron.MessageBoxOptions = {
+		const opts: Electron.MessageBoxOptions = {
 			title: confirmation.title,
 			message: confirmation.message,
 			buttons,
@@ -83,34 +86,79 @@ export class MessageService extends WorkbenchMessageService implements IChoiceSe
 		return opts;
 	}
 
-	public choose(severity: Severity, message: string, options: string[], cancelId: number, modal: boolean = false): TPromise<number> {
+	public choose(severity: Severity, message: string, choices: Choice[], cancelId?: number, modal: boolean = false): TPromise<number> {
 		if (modal) {
-			return this.doChooseModal(severity, message, options, cancelId);
+			return this.doChooseWithDialog(severity, message, choices, cancelId);
 		}
 
-		return this.doChooseWithMessage(severity, message, options);
+		return this.doChooseWithNotification(severity, message, choices);
 	}
 
-	private doChooseModal(severity: Severity, message: string, options: string[], cancelId: number): TPromise<number> {
+	private doChooseWithDialog(severity: Severity, message: string, choices: Choice[], cancelId?: number): TPromise<number> {
 		const type: 'none' | 'info' | 'error' | 'question' | 'warning' = severity === Severity.Info ? 'question' : severity === Severity.Error ? 'error' : severity === Severity.Warning ? 'warning' : 'none';
 
+		const options: string[] = [];
+		choices.forEach(choice => {
+			if (typeof choice === 'string') {
+				options.push(choice);
+			} else {
+				options.push(choice.label);
+			}
+		});
+
 		return this.doShowMessageBox({ message, buttons: options, type, cancelId });
 	}
 
-	private doChooseWithMessage(severity: Severity, message: string, options: string[]): TPromise<number> {
-		let onCancel: () => void = null;
+	private doChooseWithNotification(severity: Severity, message: string, choices: Choice[]): TPromise<number> {
+		let handle: INotificationHandle;
 
 		const promise = new TPromise<number>((c, e) => {
-			const callback = (index: number) => () => {
+
+			// Complete promise with index of action that was picked
+			const callback = (index: number, closeNotification: boolean) => () => {
 				c(index);
 
-				return TPromise.as(true);
+				if (closeNotification) {
+					handle.dispose();
+				}
+
+				return TPromise.as(void 0);
 			};
 
-			const actions = options.map((option, index) => new Action('?', option, '', true, callback(index)));
+			// Convert choices into primary/secondary actions
+			const actions: INotificationActions = {
+				primary: [],
+				secondary: []
+			};
 
-			onCancel = this.show(severity, { message, actions }, () => promise.cancel());
-		}, () => onCancel());
+			choices.forEach((choice, index) => {
+				let isPrimary = true;
+				let label: string;
+				let closeNotification = false;
+
+				if (typeof choice === 'string') {
+					label = choice;
+				} else {
+					isPrimary = false;
+					label = choice.label;
+					closeNotification = !choice.keepOpen;
+				}
+
+				const action = new Action(`workbench.dialog.choice.${index}`, label, null, true, callback(index, closeNotification));
+				if (isPrimary) {
+					actions.primary.push(action);
+				} else {
+					actions.secondary.push(action);
+				}
+			});
+
+			// Show notification with actions
+			handle = this.notificationService.notify({ severity, message, actions });
+
+			// Cancel promise when notification gets disposed
+			once(handle.onDidDispose)(() => promise.cancel());
+
+		}, () => handle.dispose());
 
 		return promise;
 	}
@@ -141,3 +189,21 @@ export class MessageService extends WorkbenchMessageService implements IChoiceSe
 		return opts;
 	}
 }
+
+const MAX_CONFIRM_FILES = 10;
+export function getConfirmMessage(start: string, resourcesToConfirm: URI[]): string {
+	const message = [start];
+	message.push('');
+	message.push(...resourcesToConfirm.slice(0, MAX_CONFIRM_FILES).map(r => basename(r.fsPath)));
+
+	if (resourcesToConfirm.length > MAX_CONFIRM_FILES) {
+		if (resourcesToConfirm.length - MAX_CONFIRM_FILES === 1) {
+			message.push(nls.localize('moreFile', "...1 additional file not shown"));
+		} else {
+			message.push(nls.localize('moreFiles', "...{0} additional files not shown", resourcesToConfirm.length - MAX_CONFIRM_FILES));
+		}
+	}
+
+	message.push('');
+	return message.join('\n');
+}
\ No newline at end of file
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
index 8079fd1e198..cd04e1765bf 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
@@ -12,7 +12,6 @@ import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { isWindows, isLinux } from 'vs/base/common/platform';
 import { findFreePort } from 'vs/base/node/ports';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { ILifecycleService, ShutdownEvent } from 'vs/platform/lifecycle/common/lifecycle';
 import { IWindowsService, IWindowService } from 'vs/platform/windows/common/windows';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
@@ -36,6 +35,8 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IRemoteConsoleLog, log, parse } from 'vs/base/node/console';
 import { getScopes } from 'vs/platform/configuration/common/configurationRegistry';
 import { ILogService } from 'vs/platform/log/common/log';
+import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
 
 export class ExtensionHostProcessWorker {
 
@@ -63,7 +64,7 @@ export class ExtensionHostProcessWorker {
 	constructor(
 		/* intentionally not injected */private readonly _extensionService: IExtensionService,
 		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
-		@IMessageService private readonly _messageService: IMessageService,
+		@INotificationService private readonly _notificationService: INotificationService,
 		@IWindowsService private readonly _windowsService: IWindowsService,
 		@IWindowService private readonly _windowService: IWindowService,
 		@IBroadcastService private readonly _broadcastService: IBroadcastService,
@@ -72,6 +73,7 @@ export class ExtensionHostProcessWorker {
 		@IWorkspaceConfigurationService private readonly _configurationService: IWorkspaceConfigurationService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@ICrashReporterService private readonly _crashReporterService: ICrashReporterService,
+		@IChoiceService private readonly _choiceService: IChoiceService,
 		@ILogService private readonly _logService: ILogService
 	) {
 		// handle extension host lifecycle a bit special when we know we are developing an extension that runs inside
@@ -236,7 +238,11 @@ export class ExtensionHostProcessWorker {
 							? nls.localize('extensionHostProcess.startupFailDebug', "Extension host did not start in 10 seconds, it might be stopped on the first line and needs a debugger to continue.")
 							: nls.localize('extensionHostProcess.startupFail', "Extension host did not start in 10 seconds, that might be a problem.");
 
-						this._messageService.show(Severity.Warning, msg);
+						this._choiceService.choose(Severity.Warning, msg, [nls.localize('reloadWindow', "Reload Window")]).then(choice => {
+							if (choice === 0) {
+								this._windowService.reloadWindow();
+							}
+						});
 					}, 10000);
 				}
 
@@ -358,7 +364,7 @@ export class ExtensionHostProcessWorker {
 
 	private _createExtHostInitData(): TPromise<IInitData> {
 		return TPromise.join<any>([this._telemetryService.getTelemetryInfo(), this._extensionService.getExtensions()]).then(([telemetryInfo, extensionDescriptions]) => {
-			const configurationData: IConfigurationInitData = { ...this._configurationService.getConfigurationData(), configurationScopes: [] };
+			const configurationData: IConfigurationInitData = { ...this._configurationService.getConfigurationData(), configurationScopes: {} };
 			const r: IInitData = {
 				parentPid: process.pid,
 				environment: {
@@ -376,7 +382,7 @@ export class ExtensionHostProcessWorker {
 				workspace: this._contextService.getWorkbenchState() === WorkbenchState.EMPTY ? null : <IWorkspaceData>this._contextService.getWorkspace(),
 				extensions: extensionDescriptions,
 				// Send configurations scopes only in development mode.
-				configuration: !this._environmentService.isBuilt || this._environmentService.isExtensionDevelopment ? { ...configurationData, configurationScopes: getScopes(this._configurationService.keys().default) } : configurationData,
+				configuration: !this._environmentService.isBuilt || this._environmentService.isExtensionDevelopment ? { ...configurationData, configurationScopes: getScopes() } : configurationData,
 				telemetryInfo,
 				args: this._environmentService.args,
 				execPath: this._environmentService.execPath,
@@ -419,7 +425,7 @@ export class ExtensionHostProcessWorker {
 
 		this._lastExtensionHostError = errorMessage;
 
-		this._messageService.show(Severity.Error, nls.localize('extensionHostProcess.error', "Error from the extension host: {0}", errorMessage));
+		this._notificationService.error(nls.localize('extensionHostProcess.error', "Error from the extension host: {0}", errorMessage));
 	}
 
 	private _onExtHostProcessExit(code: number, signal: string): void {
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
index 0b93a411e49..b09ef386b27 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
@@ -7,7 +7,6 @@
 import * as nls from 'vs/nls';
 import * as errors from 'vs/base/common/errors';
 import * as objects from 'vs/base/common/objects';
-import Severity from 'vs/base/common/severity';
 import { TPromise } from 'vs/base/common/winjs.base';
 import pkg from 'vs/platform/node/package';
 import * as path from 'path';
@@ -21,7 +20,6 @@ import { IExtensionEnablementService, IExtensionIdentifier, EnablementState } fr
 import { areSameExtensions, BetterMergeId, BetterMergeDisabledNowKey } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ExtensionsRegistry, ExtensionPoint, IExtensionPointUser, ExtensionMessageCollector, IExtensionPoint } from 'vs/platform/extensions/common/extensionsRegistry';
 import { ExtensionScanner, ILog, ExtensionScannerInput, IExtensionResolver, IExtensionReference, Translations } from 'vs/workbench/services/extensions/node/extensionPoints';
-import { IMessageService, CloseAction } from 'vs/platform/message/common/message';
 import { ProxyIdentifier } from 'vs/workbench/services/extensions/node/proxyIdentifier';
 import { ExtHostContext, ExtHostExtensionServiceShape, IExtHostContext, MainContext } from 'vs/workbench/api/node/extHost.protocol';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -32,20 +30,32 @@ import { ExtensionHostProcessWorker } from 'vs/workbench/services/extensions/ele
 import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
 import { ExtHostCustomersRegistry } from 'vs/workbench/api/electron-browser/extHostCustomers';
 import { IWindowService } from 'vs/platform/windows/common/windows';
-import { Action } from 'vs/base/common/actions';
 import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { mark, time } from 'vs/base/common/performance';
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { Barrier } from 'vs/base/common/async';
 import Event, { Emitter } from 'vs/base/common/event';
 import { ExtensionHostProfiler } from 'vs/workbench/services/extensions/electron-browser/extensionHostProfiler';
-import { ReloadWindowAction } from 'vs/workbench/electron-browser/actions';
 import product from 'vs/platform/node/product';
 import * as strings from 'vs/base/common/strings';
 import { RPCProtocol } from 'vs/workbench/services/extensions/node/rpcProtocol';
+import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
 
-const SystemExtensionsRoot = path.normalize(path.join(URI.parse(require.toUrl('')).fsPath, '..', 'extensions'));
-const ExtraDevSystemExtensionsRoot = path.normalize(path.join(URI.parse(require.toUrl('')).fsPath, '..', '.build', 'builtInExtensions'));
+let _SystemExtensionsRoot: string = null;
+function getSystemExtensionsRoot(): string {
+	if (!_SystemExtensionsRoot) {
+		_SystemExtensionsRoot = path.normalize(path.join(URI.parse(require.toUrl('')).fsPath, '..', 'extensions'));
+	}
+	return _SystemExtensionsRoot;
+}
+let _ExtraDevSystemExtensionsRoot: string = null;
+function getExtraDevSystemExtensionsRoot(): string {
+	if (!_ExtraDevSystemExtensionsRoot) {
+		_ExtraDevSystemExtensionsRoot = path.normalize(path.join(URI.parse(require.toUrl('')).fsPath, '..', '.build', 'builtInExtensions'));
+	}
+	return _ExtraDevSystemExtensionsRoot;
+}
 
 interface IBuiltInExtension {
 	name: string;
@@ -71,7 +81,7 @@ class ExtraBuiltInExtensionResolver implements IExtensionResolver {
 				case 'disabled':
 					break;
 				case 'marketplace':
-					result.push({ name: ext.name, path: path.join(ExtraDevSystemExtensionsRoot, ext.name) });
+					result.push({ name: ext.name, path: path.join(getExtraDevSystemExtensionsRoot(), ext.name) });
 					break;
 				default:
 					result.push({ name: ext.name, path: controlState });
@@ -132,7 +142,8 @@ export class ExtensionService extends Disposable implements IExtensionService {
 
 	constructor(
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IMessageService private readonly _messageService: IMessageService,
+		@INotificationService private readonly _notificationService: INotificationService,
+		@IChoiceService private readonly _choiceService: IChoiceService,
 		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@IExtensionEnablementService private readonly _extensionEnablementService: IExtensionEnablementService,
@@ -259,16 +270,6 @@ export class ExtensionService extends Disposable implements IExtensionService {
 	}
 
 	private _onExtensionHostCrashed(code: number, signal: string): void {
-		const openDevTools = new Action('openDevTools', nls.localize('devTools', "Developer Tools"), '', true, (): TPromise<boolean> => {
-			return this._windowService.openDevTools().then(() => false);
-		});
-
-		const restart = new Action('restart', nls.localize('restart', "Restart Extension Host"), '', true, (): TPromise<boolean> => {
-			this._messageService.hideAll();
-			this._startExtensionHostProcess(Object.keys(this._allRequestedActivateEvents));
-			return TPromise.as(true);
-		});
-
 		console.error('Extension host terminated unexpectedly. Code: ', code, ' Signal: ', signal);
 		this._stopExtensionHostProcess();
 
@@ -276,12 +277,16 @@ export class ExtensionService extends Disposable implements IExtensionService {
 		if (code === 87) {
 			message = nls.localize('extensionHostProcess.unresponsiveCrash', "Extension host terminated because it was not responsive.");
 		}
-		this._messageService.show(Severity.Error, {
-			message: message,
-			actions: [
-				openDevTools,
-				restart
-			]
+
+		this._choiceService.choose(Severity.Error, message, [nls.localize('devTools', "Developer Tools"), nls.localize('restart', "Restart Extension Host")]).then(choice => {
+			switch (choice) {
+				case 0 /* Open Dev Tools */:
+					this._windowService.openDevTools();
+					break;
+				case 1 /* Restart Extension Host */:
+					this._startExtensionHostProcess(Object.keys(this._allRequestedActivateEvents));
+					break;
+			}
 		});
 	}
 
@@ -448,7 +453,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 			this._logOrShowMessage(severity, this._isDev ? messageWithSource2(source, message) : message);
 		});
 
-		return ExtensionService._scanInstalledExtensions(this._instantiationService, this._messageService, this._environmentService, log)
+		return ExtensionService._scanInstalledExtensions(this._windowService, this._choiceService, this._environmentService, log)
 			.then(({ system, user, development }) => {
 				this._extensionEnablementService.migrateToIdentifiers(user); // TODO: @sandy Remove it after couple of milestones
 				return this._extensionEnablementService.getDisabledExtensions()
@@ -458,8 +463,9 @@ export class ExtensionService extends Disposable implements IExtensionService {
 						let userMigratedSystemExtensions: IExtensionIdentifier[] = [{ id: BetterMergeId }];
 
 						system.forEach((systemExtension) => {
-							// Disabling system extensions is not supported
-							result[systemExtension.id] = systemExtension;
+							if (disabledExtensions.every(disabled => !areSameExtensions(disabled, systemExtension))) {
+								result[systemExtension.id] = systemExtension;
+							}
 						});
 
 						user.forEach((userExtension) => {
@@ -536,7 +542,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 		}
 	}
 
-	private static async _validateExtensionsCache(instantiationService: IInstantiationService, messageService: IMessageService, environmentService: IEnvironmentService, cacheKey: string, input: ExtensionScannerInput): TPromise<void> {
+	private static async _validateExtensionsCache(windowService: IWindowService, choiceService: IChoiceService, environmentService: IEnvironmentService, cacheKey: string, input: ExtensionScannerInput): TPromise<void> {
 		const cacheFolder = path.join(environmentService.userDataPath, MANIFEST_CACHE_FOLDER);
 		const cacheFile = path.join(cacheFolder, cacheKey);
 
@@ -561,13 +567,10 @@ export class ExtensionService extends Disposable implements IExtensionService {
 			console.error(err);
 		}
 
-		let message = nls.localize('extensionCache.invalid', "Extensions have been modified on disk. Please reload the window.");
-		messageService.show(Severity.Info, {
-			message: message,
-			actions: [
-				instantiationService.createInstance(ReloadWindowAction, ReloadWindowAction.ID, ReloadWindowAction.LABEL),
-				CloseAction
-			]
+		choiceService.choose(Severity.Error, nls.localize('extensionCache.invalid', "Extensions have been modified on disk. Please reload the window."), [nls.localize('reloadWindow', "Reload Window")]).then(choice => {
+			if (choice === 0) {
+				windowService.reloadWindow();
+			}
 		});
 	}
 
@@ -602,7 +605,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 		}
 	}
 
-	private static async _scanExtensionsWithCache(instantiationService: IInstantiationService, messageService: IMessageService, environmentService: IEnvironmentService, cacheKey: string, input: ExtensionScannerInput, log: ILog): TPromise<IExtensionDescription[]> {
+	private static async _scanExtensionsWithCache(windowService: IWindowService, choiceService: IChoiceService, environmentService: IEnvironmentService, cacheKey: string, input: ExtensionScannerInput, log: ILog): TPromise<IExtensionDescription[]> {
 		if (input.devMode) {
 			// Do not cache when running out of sources...
 			return ExtensionScanner.scanExtensions(input, log);
@@ -620,7 +623,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 			// Validate the cache asynchronously after 5s
 			setTimeout(async () => {
 				try {
-					await this._validateExtensionsCache(instantiationService, messageService, environmentService, cacheKey, input);
+					await this._validateExtensionsCache(windowService, choiceService, environmentService, cacheKey, input);
 				} catch (err) {
 					errors.onUnexpectedError(err);
 				}
@@ -642,7 +645,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 		return result;
 	}
 
-	private static _scanInstalledExtensions(instantiationService: IInstantiationService, messageService: IMessageService, environmentService: IEnvironmentService, log: ILog): TPromise<{ system: IExtensionDescription[], user: IExtensionDescription[], development: IExtensionDescription[] }> {
+	private static _scanInstalledExtensions(windowService: IWindowService, choiceService: IChoiceService, environmentService: IEnvironmentService, log: ILog): TPromise<{ system: IExtensionDescription[], user: IExtensionDescription[], development: IExtensionDescription[] }> {
 
 		const translationConfig: TPromise<Translations> = platform.translationsConfigFile
 			? pfs.readFile(platform.translationsConfigFile, 'utf8').then((content) => {
@@ -663,11 +666,11 @@ export class ExtensionService extends Disposable implements IExtensionService {
 			const locale = platform.locale;
 
 			const builtinExtensions = this._scanExtensionsWithCache(
-				instantiationService,
-				messageService,
+				windowService,
+				choiceService,
 				environmentService,
 				BUILTIN_MANIFEST_CACHE_FILE,
-				new ExtensionScannerInput(version, commit, locale, devMode, SystemExtensionsRoot, true, translations),
+				new ExtensionScannerInput(version, commit, locale, devMode, getSystemExtensionsRoot(), true, translations),
 				log
 			);
 
@@ -682,7 +685,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 				const controlFile = pfs.readFile(controlFilePath, 'utf8')
 					.then<IBuiltInExtensionControl>(raw => JSON.parse(raw), () => ({} as any));
 
-				const input = new ExtensionScannerInput(version, commit, locale, devMode, ExtraDevSystemExtensionsRoot, true, translations);
+				const input = new ExtensionScannerInput(version, commit, locale, devMode, getExtraDevSystemExtensionsRoot(), true, translations);
 				const extraBuiltinExtensions = TPromise.join([builtInExtensions, controlFile])
 					.then(([builtInExtensions, control]) => new ExtraBuiltInExtensionResolver(builtInExtensions, control))
 					.then(resolver => ExtensionScanner.scanExtensions(input, log, resolver));
@@ -717,8 +720,8 @@ export class ExtensionService extends Disposable implements IExtensionService {
 				environmentService.disableExtensions || !environmentService.extensionsPath
 					? TPromise.as([])
 					: this._scanExtensionsWithCache(
-						instantiationService,
-						messageService,
+						windowService,
+						choiceService,
 						environmentService,
 						USER_MANIFEST_CACHE_FILE,
 						new ExtensionScannerInput(version, commit, locale, devMode, environmentService.extensionsPath, false, translations),
@@ -767,7 +770,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 
 	private _showMessageToUser(severity: Severity, msg: string): void {
 		if (severity === Severity.Error || severity === Severity.Warning) {
-			this._messageService.show(severity, msg);
+			this._notificationService.notify({ severity, message: msg });
 		} else {
 			this._logMessageInConsole(severity, msg);
 		}
diff --git a/src/vs/workbench/services/files/electron-browser/fileService.ts b/src/vs/workbench/services/files/electron-browser/fileService.ts
index 99b4e90c588..73cf7a37ecd 100644
--- a/src/vs/workbench/services/files/electron-browser/fileService.ts
+++ b/src/vs/workbench/services/files/electron-browser/fileService.ts
@@ -15,8 +15,6 @@ import { FileOperation, FileOperationEvent, IFileService, IFilesConfiguration, I
 import { FileService as NodeFileService, IFileServiceOptions, IEncodingOverride } from 'vs/workbench/services/files/node/fileService';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { Action } from 'vs/base/common/actions';
-import { IMessageService, IMessageWithAction, Severity, CloseAction } from 'vs/platform/message/common/message';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
@@ -26,6 +24,8 @@ import { ITextResourceConfigurationService } from 'vs/editor/common/services/res
 import { isMacintosh } from 'vs/base/common/platform';
 import product from 'vs/platform/node/product';
 import { Schemas } from 'vs/base/common/network';
+import { Severity } from 'vs/platform/notification/common/notification';
+import { IChoiceService, Choice } from 'vs/platform/dialogs/common/dialogs';
 
 export class FileService implements IFileService {
 
@@ -50,7 +50,7 @@ export class FileService implements IFileService {
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@ILifecycleService private lifecycleService: ILifecycleService,
-		@IMessageService private messageService: IMessageService,
+		@IChoiceService private choiceService: IChoiceService,
 		@IStorageService private storageService: IStorageService,
 		@ITextResourceConfigurationService textResourceConfigurationService: ITextResourceConfigurationService
 	) {
@@ -84,7 +84,7 @@ export class FileService implements IFileService {
 		};
 
 		// create service
-		this.raw = new NodeFileService(contextService, textResourceConfigurationService, configurationService, lifecycleService, fileServiceConfig);
+		this.raw = new NodeFileService(contextService, environmentService, textResourceConfigurationService, configurationService, lifecycleService, fileServiceConfig);
 
 		// Listeners
 		this.registerListeners();
@@ -109,41 +109,31 @@ export class FileService implements IFileService {
 
 		// Detect if we run < .NET Framework 4.5 (TODO@ben remove with new watcher impl)
 		if (msg.indexOf(FileService.NET_VERSION_ERROR) >= 0 && !this.storageService.getBoolean(FileService.NET_VERSION_ERROR_IGNORE_KEY, StorageScope.WORKSPACE)) {
-			this.messageService.show(Severity.Warning, <IMessageWithAction>{
-				message: nls.localize('netVersionError', "The Microsoft .NET Framework 4.5 is required. Please follow the link to install it."),
-				actions: [
-					new Action('install.net', nls.localize('installNet', "Download .NET Framework 4.5"), null, true, () => {
+			const choices: Choice[] = [nls.localize('installNet', "Download .NET Framework 4.5"), { label: nls.localize('neverShowAgain', "Don't Show Again") }];
+			this.choiceService.choose(Severity.Warning, nls.localize('netVersionError', "The Microsoft .NET Framework 4.5 is required. Please follow the link to install it."), choices).then(choice => {
+				switch (choice) {
+					case 0 /* Read More */:
 						window.open('https://go.microsoft.com/fwlink/?LinkId=786533');
-
-						return TPromise.as(true);
-					}),
-					new Action('net.error.ignore', nls.localize('neverShowAgain', "Don't Show Again"), '', true, () => {
+						break;
+					case 1 /* Never show again */:
 						this.storageService.store(FileService.NET_VERSION_ERROR_IGNORE_KEY, true, StorageScope.WORKSPACE);
-
-						return TPromise.as(null);
-					}),
-					CloseAction
-				]
+						break;
+				}
 			});
 		}
 
 		// Detect if we run into ENOSPC issues (TODO@ben remove with new watcher impl)
 		if (msg.indexOf(FileService.ENOSPC_ERROR) >= 0 && !this.storageService.getBoolean(FileService.ENOSPC_ERROR_IGNORE_KEY, StorageScope.WORKSPACE)) {
-			this.messageService.show(Severity.Warning, <IMessageWithAction>{
-				message: nls.localize('enospcError', "{0} is running out of file handles. Please follow the instructions link to resolve this issue.", product.nameLong),
-				actions: [
-					new Action('learnMore', nls.localize('learnMore', "Instructions"), null, true, () => {
+			const choices: Choice[] = [nls.localize('learnMore', "Instructions"), { label: nls.localize('neverShowAgain', "Don't Show Again") }];
+			this.choiceService.choose(Severity.Warning, nls.localize('enospcError', "{0} is running out of file handles. Please follow the instructions link to resolve this issue.", product.nameLong), choices).then(choice => {
+				switch (choice) {
+					case 0 /* Read More */:
 						window.open('https://go.microsoft.com/fwlink/?linkid=867693');
-
-						return TPromise.as(true);
-					}),
-					new Action('enospc.error.ignore', nls.localize('neverShowAgain', "Don't Show Again"), '', true, () => {
+						break;
+					case 1 /* Never show again */:
 						this.storageService.store(FileService.ENOSPC_ERROR_IGNORE_KEY, true, StorageScope.WORKSPACE);
-
-						return TPromise.as(null);
-					}),
-					CloseAction
-				]
+						break;
+				}
 			});
 		}
 	}
diff --git a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
index 1fb80d99042..35cf5d0d071 100644
--- a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
+++ b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
@@ -19,18 +19,19 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
 import { IExtensionService } from 'vs/platform/extensions/common/extensions';
 import { maxBufferLen, detectMimeAndEncodingFromBuffer } from 'vs/base/node/mime';
 import { MIME_BINARY } from 'vs/base/common/mime';
 import { localize } from 'vs/nls';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
 
 function toIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], recurse?: (tuple: [URI, IStat]) => boolean): TPromise<IFileStat> {
 	const [resource, stat] = tuple;
 	const fileStat: IFileStat = {
 		isDirectory: false,
+		isSymbolicLink: stat.type === FileType.Symlink,
 		resource: resource,
 		name: basename(resource.path),
 		mtime: stat.mtime,
@@ -85,7 +86,7 @@ export class RemoteFileService extends FileService {
 		@IWorkspaceContextService contextService: IWorkspaceContextService,
 		@IEnvironmentService environmentService: IEnvironmentService,
 		@ILifecycleService lifecycleService: ILifecycleService,
-		@IMessageService messageService: IMessageService,
+		@IChoiceService choiceService: IChoiceService,
 		@ITextResourceConfigurationService textResourceConfigurationService: ITextResourceConfigurationService,
 	) {
 		super(
@@ -93,7 +94,7 @@ export class RemoteFileService extends FileService {
 			contextService,
 			environmentService,
 			lifecycleService,
-			messageService,
+			choiceService,
 			_storageService,
 			textResourceConfigurationService,
 		);
diff --git a/src/vs/workbench/services/files/node/fileService.ts b/src/vs/workbench/services/files/node/fileService.ts
index 402c8956b53..d59c4bd9d65 100644
--- a/src/vs/workbench/services/files/node/fileService.ts
+++ b/src/vs/workbench/services/files/node/fileService.ts
@@ -11,7 +11,7 @@ import os = require('os');
 import crypto = require('crypto');
 import assert = require('assert');
 import { isParent, FileOperation, FileOperationEvent, IContent, IFileService, IResolveFileOptions, IResolveFileResult, IResolveContentOptions, IFileStat, IStreamContent, FileOperationError, FileOperationResult, IUpdateContentOptions, FileChangeType, IImportResult, FileChangesEvent, ICreateFileOptions, IContentData, ITextSnapshot } from 'vs/platform/files/common/files';
-import { MAX_FILE_SIZE } from 'vs/platform/files/node/files';
+import { MAX_FILE_SIZE, MAX_HEAP_SIZE } from 'vs/platform/files/node/files';
 import { isEqualOrParent } from 'vs/base/common/paths';
 import { ResourceMap } from 'vs/base/common/map';
 import arrays = require('vs/base/common/arrays');
@@ -36,6 +36,7 @@ import Event, { Emitter } from 'vs/base/common/event';
 import { FileWatcher as NsfwWatcherService } from 'vs/workbench/services/files/node/watcher/nsfw/watcherService';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { getBaseLabel } from 'vs/base/common/labels';
@@ -131,6 +132,7 @@ export class FileService implements IFileService {
 
 	constructor(
 		private contextService: IWorkspaceContextService,
+		private environmentService: IEnvironmentService,
 		private textResourceConfigurationService: ITextResourceConfigurationService,
 		private configurationService: IConfigurationService,
 		private lifecycleService: ILifecycleService,
@@ -163,7 +165,7 @@ export class FileService implements IFileService {
 
 	private registerListeners(): void {
 		this.toDispose.push(this.contextService.onDidChangeWorkbenchState(() => {
-			if (this.lifecycleService.phase === LifecyclePhase.Running) {
+			if (this.lifecycleService.phase >= LifecyclePhase.Running) {
 				this.setupFileWatching();
 			}
 		}));
@@ -316,12 +318,20 @@ export class FileService implements IFileService {
 			}
 
 			// Return early if file is too large to load
-			if (typeof stat.size === 'number' && stat.size > MAX_FILE_SIZE) {
-				return onStatError(new FileOperationError(
-					nls.localize('fileTooLargeError', "File too large to open"),
-					FileOperationResult.FILE_TOO_LARGE,
-					options
-				));
+			if (typeof stat.size === 'number') {
+				if (stat.size > Math.max(this.environmentService.args['max-memory'] * 1024 * 1024 || 0, MAX_HEAP_SIZE)) {
+					return onStatError(new FileOperationError(
+						nls.localize('fileTooLargeForHeapError', "File size exceeds window memory limit, please try to run code --max-memory=NEWSIZE"),
+						FileOperationResult.FILE_EXCEED_MEMORY_LIMIT
+					));
+				}
+
+				if (stat.size > MAX_FILE_SIZE) {
+					return onStatError(new FileOperationError(
+						nls.localize('fileTooLargeError', "File too large to open"),
+						FileOperationResult.FILE_TOO_LARGE
+					));
+				}
 			}
 
 			return void 0;
@@ -455,6 +465,13 @@ export class FileService implements IFileService {
 							currentPosition += bytesRead;
 						}
 
+						if (totalBytesRead > Math.max(this.environmentService.args['max-memory'] * 1024 * 1024 || 0, MAX_HEAP_SIZE)) {
+							finish(new FileOperationError(
+								nls.localize('fileTooLargeForHeapError', "File size exceeds window memory limit, please try to run code --max-memory=NEWSIZE"),
+								FileOperationResult.FILE_EXCEED_MEMORY_LIMIT
+							));
+						}
+
 						if (totalBytesRead > MAX_FILE_SIZE) {
 							// stop when reading too much
 							finish(new FileOperationError(
@@ -895,8 +912,8 @@ export class FileService implements IFileService {
 	private toStatResolver(resource: uri): TPromise<StatResolver> {
 		const absolutePath = this.toAbsolutePath(resource);
 
-		return pfs.stat(absolutePath).then(stat => {
-			return new StatResolver(resource, stat.isDirectory(), stat.mtime.getTime(), stat.size, this.options.verboseLogging ? this.options.errorLogger : void 0);
+		return pfs.statLink(absolutePath).then(({ isSymbolicLink, stat }) => {
+			return new StatResolver(resource, isSymbolicLink, stat.isDirectory(), stat.mtime.getTime(), stat.size, this.options.verboseLogging ? this.options.errorLogger : void 0);
 		});
 	}
 
@@ -1129,25 +1146,21 @@ export class FileService implements IFileService {
 }
 
 export class StatResolver {
-	private resource: uri;
-	private isDirectory: boolean;
-	private mtime: number;
 	private name: string;
 	private etag: string;
-	private size: number;
-	private errorLogger: (error: Error | string) => void;
 
-	constructor(resource: uri, isDirectory: boolean, mtime: number, size: number, errorLogger?: (error: Error | string) => void) {
+	constructor(
+		private resource: uri,
+		private isSymbolicLink: boolean,
+		private isDirectory: boolean,
+		private mtime: number,
+		private size: number,
+		private errorLogger?: (error: Error | string) => void
+	) {
 		assert.ok(resource && resource.scheme === Schemas.file, `Invalid resource: ${resource}`);
 
-		this.resource = resource;
-		this.isDirectory = isDirectory;
-		this.mtime = mtime;
 		this.name = getBaseLabel(resource);
 		this.etag = etag(size, mtime);
-		this.size = size;
-
-		this.errorLogger = errorLogger;
 	}
 
 	public resolve(options: IResolveFileOptions): TPromise<IFileStat> {
@@ -1156,6 +1169,7 @@ export class StatResolver {
 		const fileStat: IFileStat = {
 			resource: this.resource,
 			isDirectory: this.isDirectory,
+			isSymbolicLink: this.isSymbolicLink,
 			name: this.name,
 			etag: this.etag,
 			size: this.size,
@@ -1206,6 +1220,7 @@ export class StatResolver {
 			flow.parallel(files, (file: string, clb: (error: Error, children: IFileStat) => void) => {
 				const fileResource = uri.file(paths.resolve(absolutePath, file));
 				let fileStat: fs.Stats;
+				let isSymbolicLink = false;
 				const $this = this;
 
 				flow.sequence(
@@ -1218,7 +1233,10 @@ export class StatResolver {
 					},
 
 					function stat(this: any): void {
-						fs.stat(fileResource.fsPath, this);
+						extfs.statLink(fileResource.fsPath, (error: Error, statAndIsLink) => {
+							isSymbolicLink = statAndIsLink.isSymbolicLink;
+							this(null, statAndIsLink.stat);
+						});
 					},
 
 					function countChildren(this: any, fsstat: fs.Stats): void {
@@ -1237,6 +1255,7 @@ export class StatResolver {
 						const childStat: IFileStat = {
 							resource: fileResource,
 							isDirectory: fileStat.isDirectory(),
+							isSymbolicLink,
 							name: file,
 							mtime: fileStat.mtime.getTime(),
 							etag: etag(fileStat),
@@ -1276,4 +1295,4 @@ export class StatResolver {
 			});
 		});
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts b/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts
index 675e464d805..e5403578de2 100644
--- a/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts
@@ -16,6 +16,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Schemas } from 'vs/base/common/network';
+import { isPromiseCanceledError } from 'vs/base/common/errors';
 
 export class FileWatcher {
 	private static readonly MAX_RESTARTS = 5;
@@ -58,7 +59,7 @@ export class FileWatcher {
 		const channel = getNextTickChannel(client.getChannel<IWatcherChannel>('watcher'));
 		this.service = new WatcherChannelClient(channel);
 		this.service.initialize(this.verboseLogging).then(null, err => {
-			if (!this.isDisposed && !(err instanceof Error && err.name === 'Canceled' && err.message === 'Canceled')) {
+			if (!this.isDisposed && !isPromiseCanceledError(err)) {
 				return TPromise.wrapError(err); // the service lib uses the promise cancel error to indicate the process died, we do not want to bubble this up
 			}
 			return void 0;
diff --git a/src/vs/workbench/services/files/node/watcher/unix/watcherService.ts b/src/vs/workbench/services/files/node/watcher/unix/watcherService.ts
index 9377480d5bd..160d25da051 100644
--- a/src/vs/workbench/services/files/node/watcher/unix/watcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/unix/watcherService.ts
@@ -14,6 +14,7 @@ import { IWatcherChannel, WatcherChannelClient } from 'vs/workbench/services/fil
 import { FileChangesEvent } from 'vs/platform/files/common/files';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { normalize } from 'path';
+import { isPromiseCanceledError } from 'vs/base/common/errors';
 
 export class FileWatcher {
 	private static readonly MAX_RESTARTS = 5;
@@ -54,7 +55,7 @@ export class FileWatcher {
 		// Start watching
 		const basePath: string = normalize(this.contextService.getWorkspace().folders[0].uri.fsPath);
 		service.watch({ basePath: basePath, ignored: this.ignored, verboseLogging: this.verboseLogging }).then(null, err => {
-			if (!this.isDisposed && !(err instanceof Error && err.name === 'Canceled' && err.message === 'Canceled')) {
+			if (!this.isDisposed && !isPromiseCanceledError(err)) {
 				return TPromise.wrapError(err); // the service lib uses the promise cancel error to indicate the process died, we do not want to bubble this up
 			}
 
diff --git a/src/vs/workbench/services/files/test/node/fileService.test.ts b/src/vs/workbench/services/files/test/node/fileService.test.ts
index 378b1b91a08..c0ba46842a0 100644
--- a/src/vs/workbench/services/files/test/node/fileService.test.ts
+++ b/src/vs/workbench/services/files/test/node/fileService.test.ts
@@ -19,7 +19,7 @@ import extfs = require('vs/base/node/extfs');
 import encodingLib = require('vs/base/node/encoding');
 import utils = require('vs/workbench/services/files/test/node/utils');
 import { onError } from 'vs/base/test/common/utils';
-import { TestContextService, TestTextResourceConfigurationService, getRandomTestPath, TestLifecycleService } from 'vs/workbench/test/workbenchTestServices';
+import { TestEnvironmentService, TestContextService, TestTextResourceConfigurationService, getRandomTestPath, TestLifecycleService } from 'vs/workbench/test/workbenchTestServices';
 import { Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { TextModel } from 'vs/editor/common/model/textModel';
@@ -39,7 +39,7 @@ suite('FileService', () => {
 				return onError(error, done);
 			}
 
-			service = new FileService(new TestContextService(new Workspace(testDir, testDir, toWorkspaceFolders([{ path: testDir }]))), new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), { disableWatcher: true });
+			service = new FileService(new TestContextService(new Workspace(testDir, testDir, toWorkspaceFolders([{ path: testDir }]))), TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), { disableWatcher: true });
 			done();
 		});
 	});
@@ -136,6 +136,33 @@ suite('FileService', () => {
 		}, error => onError(error, done));
 	});
 
+	test('createFolder: creating multiple folders at once', function (done: () => void) {
+		let event: FileOperationEvent;
+		const toDispose = service.onAfterOperation(e => {
+			event = e;
+		});
+
+		const multiFolderPaths = ['a', 'couple', 'of', 'folders'];
+		service.resolveFile(uri.file(testDir)).done(parent => {
+			const resource = uri.file(path.join(parent.resource.fsPath, ...multiFolderPaths));
+
+			return service.createFolder(resource).then(f => {
+				const lastFolderName = multiFolderPaths[multiFolderPaths.length - 1];
+				assert.equal(f.name, lastFolderName);
+				assert.equal(fs.existsSync(f.resource.fsPath), true);
+
+				assert.ok(event);
+				assert.equal(event.resource.fsPath, resource.fsPath);
+				assert.equal(event.operation, FileOperation.CREATE);
+				assert.equal(event.target.resource.fsPath, resource.fsPath);
+				assert.equal(event.target.isDirectory, true);
+				toDispose.dispose();
+
+				done();
+			});
+		}, error => onError(error, done));
+	});
+
 	test('touchFile', function (done: () => void) {
 		service.touchFile(uri.file(path.join(testDir, 'test.txt'))).done(s => {
 			assert.equal(s.name, 'test.txt');
@@ -156,6 +183,28 @@ suite('FileService', () => {
 		}, error => onError(error, done));
 	});
 
+	test('touchFile - multi folder', function (done: () => void) {
+		const multiFolderPaths = ['a', 'couple', 'of', 'folders'];
+
+		service.touchFile(uri.file(path.join(testDir, ...multiFolderPaths, 'test.txt'))).done(s => {
+			assert.equal(s.name, 'test.txt');
+			assert.equal(fs.existsSync(s.resource.fsPath), true);
+			assert.equal(fs.readFileSync(s.resource.fsPath).length, 0);
+
+			const stat = fs.statSync(s.resource.fsPath);
+
+			return TPromise.timeout(10).then(() => {
+				return service.touchFile(s.resource).done(s => {
+					const statNow = fs.statSync(s.resource.fsPath);
+					assert.ok(statNow.mtime.getTime() >= stat.mtime.getTime()); // one some OS the resolution seems to be 1s, so we use >= here
+					assert.equal(statNow.size, stat.size);
+
+					done();
+				});
+			});
+		}, error => onError(error, done));
+	});
+
 	test('renameFile', function (done: () => void) {
 		let event: FileOperationEvent;
 		const toDispose = service.onAfterOperation(e => {
@@ -179,6 +228,32 @@ suite('FileService', () => {
 		}, error => onError(error, done));
 	});
 
+	test('renameFile - multi folder', function (done: () => void) {
+		let event: FileOperationEvent;
+		const toDispose = service.onAfterOperation(e => {
+			event = e;
+		});
+
+		const multiFolderPaths = ['a', 'couple', 'of', 'folders'];
+		const renameToPath = path.join(...multiFolderPaths, 'other.html');
+
+		const resource = uri.file(path.join(testDir, 'index.html'));
+		service.resolveFile(resource).done(source => {
+			return service.rename(source.resource, renameToPath).then(renamed => {
+				assert.equal(fs.existsSync(renamed.resource.fsPath), true);
+				assert.equal(fs.existsSync(source.resource.fsPath), false);
+
+				assert.ok(event);
+				assert.equal(event.resource.fsPath, resource.fsPath);
+				assert.equal(event.operation, FileOperation.MOVE);
+				assert.equal(event.target.resource.fsPath, renamed.resource.fsPath);
+				toDispose.dispose();
+
+				done();
+			});
+		}, error => onError(error, done));
+	});
+
 	test('renameFolder', function (done: () => void) {
 		let event: FileOperationEvent;
 		const toDispose = service.onAfterOperation(e => {
@@ -202,6 +277,31 @@ suite('FileService', () => {
 		});
 	});
 
+	test('renameFolder - multi folder', function (done: () => void) {
+		let event: FileOperationEvent;
+		const toDispose = service.onAfterOperation(e => {
+			event = e;
+		});
+
+		const multiFolderPaths = ['a', 'couple', 'of', 'folders'];
+		const renameToPath = path.join(...multiFolderPaths);
+
+		const resource = uri.file(path.join(testDir, 'deep'));
+		service.resolveFile(resource).done(source => {
+			return service.rename(source.resource, renameToPath).then(renamed => {
+				assert.equal(fs.existsSync(renamed.resource.fsPath), true);
+				assert.equal(fs.existsSync(source.resource.fsPath), false);
+
+				assert.ok(event);
+				assert.equal(event.resource.fsPath, resource.fsPath);
+				assert.equal(event.operation, FileOperation.MOVE);
+				assert.equal(event.target.resource.fsPath, renamed.resource.fsPath);
+				toDispose.dispose();
+
+				done();
+			});
+		});
+	});
 	test('renameFile - MIX CASE', function (done: () => void) {
 		let event: FileOperationEvent;
 		const toDispose = service.onAfterOperation(e => {
@@ -910,7 +1010,7 @@ suite('FileService', () => {
 
 			const textResourceConfigurationService = new TestTextResourceConfigurationService(configurationService);
 
-			const _service = new FileService(new TestContextService(new Workspace(_testDir, _testDir, toWorkspaceFolders([{ path: _testDir }]))), textResourceConfigurationService, configurationService, new TestLifecycleService(), {
+			const _service = new FileService(new TestContextService(new Workspace(_testDir, _testDir, toWorkspaceFolders([{ path: _testDir }]))), TestEnvironmentService, textResourceConfigurationService, configurationService, new TestLifecycleService(), {
 				encodingOverride,
 				disableWatcher: true
 			});
@@ -937,7 +1037,7 @@ suite('FileService', () => {
 		const _sourceDir = require.toUrl('./fixtures/service');
 		const resource = uri.file(path.join(testDir, 'index.html'));
 
-		const _service = new FileService(new TestContextService(new Workspace(_testDir, _testDir, toWorkspaceFolders([{ path: _testDir }]))), new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), {
+		const _service = new FileService(new TestContextService(new Workspace(_testDir, _testDir, toWorkspaceFolders([{ path: _testDir }]))), TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), {
 			disableWatcher: true
 		});
 
diff --git a/src/vs/workbench/services/files/test/node/resolver.test.ts b/src/vs/workbench/services/files/test/node/resolver.test.ts
index a6ed59a578b..4b9298f83fd 100644
--- a/src/vs/workbench/services/files/test/node/resolver.test.ts
+++ b/src/vs/workbench/services/files/test/node/resolver.test.ts
@@ -19,7 +19,7 @@ function create(relativePath: string): StatResolver {
 	let absolutePath = relativePath ? path.join(basePath, relativePath) : basePath;
 	let fsStat = fs.statSync(absolutePath);
 
-	return new StatResolver(uri.file(absolutePath), fsStat.isDirectory(), fsStat.mtime.getTime(), fsStat.size, void 0);
+	return new StatResolver(uri.file(absolutePath), fsStat.isSymbolicLink(), fsStat.isDirectory(), fsStat.mtime.getTime(), fsStat.size, void 0);
 }
 
 function toResource(relativePath: string): uri {
@@ -183,4 +183,4 @@ suite('Stat Resolver', () => {
 		})
 			.done(() => done(), done);
 	});
-});
\ No newline at end of file
+});
diff --git a/src/vs/workbench/services/keybinding/common/keybindingEditing.ts b/src/vs/workbench/services/keybinding/common/keybindingEditing.ts
index 80f789d35bc..98b80945993 100644
--- a/src/vs/workbench/services/keybinding/common/keybindingEditing.ts
+++ b/src/vs/workbench/services/keybinding/common/keybindingEditing.ts
@@ -225,7 +225,7 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 
 		// Target cannot be dirty if not writing into buffer
 		if (this.textFileService.isDirty(this.resource)) {
-			return TPromise.wrapError<IReference<ITextEditorModel>>(new Error(localize('errorKeybindingsFileDirty', "Unable to write because the file is dirty. Please save the **Keybindings** file and try again.")));
+			return TPromise.wrapError<IReference<ITextEditorModel>>(new Error(localize('errorKeybindingsFileDirty', "Unable to write because the keybindings configuration file is dirty. Please save it first and then try again.")));
 		}
 
 		return this.resolveModelReference()
@@ -235,11 +235,11 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 				if (model.getValue()) {
 					const parsed = this.parse(model);
 					if (parsed.parseErrors.length) {
-						return TPromise.wrapError<IReference<ITextEditorModel>>(new Error(localize('parseErrors', "Unable to write keybindings. Please open **Keybindings file** to correct errors/warnings in the file and try again.")));
+						return TPromise.wrapError<IReference<ITextEditorModel>>(new Error(localize('parseErrors', "Unable to write to the keybindings configuration file. Please open it to correct errors/warnings in the file and try again.")));
 					}
 					if (parsed.result) {
 						if (!isArray(parsed.result)) {
-							return TPromise.wrapError<IReference<ITextEditorModel>>(new Error(localize('errorInvalidConfiguration', "Unable to write keybindings. **Keybindings file** has an object which is not of type Array. Please open the file to clean up and try again.")));
+							return TPromise.wrapError<IReference<ITextEditorModel>>(new Error(localize('errorInvalidConfiguration', "Unable to write to the keybindings configuration file. It has an object which is not of type Array. Please open the file to clean up and try again.")));
 						}
 					} else {
 						const content = EOL + '[]';
diff --git a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts b/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
index f33d45cb29d..d15ea1d8888 100644
--- a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
+++ b/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
@@ -20,7 +20,6 @@ import { IKeybindingItem, KeybindingsRegistry, IKeybindingRule2 } from 'vs/platf
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { keybindingsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IMessageService } from 'vs/platform/message/common/message';
 import { ConfigWatcher } from 'vs/base/node/config';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import * as dom from 'vs/base/browser/dom';
@@ -37,6 +36,7 @@ import { Extensions as ConfigExtensions, IConfigurationRegistry, IConfigurationN
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { release } from 'os';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class KeyboardMapperFactory {
 	public static readonly INSTANCE = new KeyboardMapperFactory();
@@ -263,12 +263,12 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@ICommandService commandService: ICommandService,
 		@ITelemetryService telemetryService: ITelemetryService,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@IEnvironmentService environmentService: IEnvironmentService,
 		@IStatusbarService statusBarService: IStatusbarService,
 		@IConfigurationService configurationService: IConfigurationService
 	) {
-		super(contextKeyService, commandService, telemetryService, messageService, statusBarService);
+		super(contextKeyService, commandService, telemetryService, notificationService, statusBarService);
 
 		let dispatchConfig = getDispatchConfig(configurationService);
 		configurationService.onDidChangeConfiguration((e) => {
diff --git a/src/vs/workbench/services/keybinding/test/node/keybindingEditing.test.ts b/src/vs/workbench/services/keybinding/test/node/keybindingEditing.test.ts
index 2d603d901f1..9228229b7d6 100644
--- a/src/vs/workbench/services/keybinding/test/node/keybindingEditing.test.ts
+++ b/src/vs/workbench/services/keybinding/test/node/keybindingEditing.test.ts
@@ -16,7 +16,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { KeyCode, SimpleKeybinding, ChordKeybinding } from 'vs/base/common/keyCodes';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import extfs = require('vs/base/node/extfs');
-import { TestTextFileService, TestEditorGroupService, TestLifecycleService, TestBackupFileService, TestContextService, TestTextResourceConfigurationService, TestHashService } from 'vs/workbench/test/workbenchTestServices';
+import { TestTextFileService, TestEditorGroupService, TestLifecycleService, TestBackupFileService, TestContextService, TestTextResourceConfigurationService, TestHashService, TestEnvironmentService } from 'vs/workbench/test/workbenchTestServices';
 import { IWorkspaceContextService, Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
 import uuid = require('vs/base/common/uuid');
 import { ConfigurationService } from 'vs/platform/configuration/node/configurationService';
@@ -80,7 +80,7 @@ suite('Keybindings Editing', () => {
 			instantiationService.stub(ITelemetryService, NullTelemetryService);
 			instantiationService.stub(IModeService, ModeServiceImpl);
 			instantiationService.stub(IModelService, instantiationService.createInstance(ModelServiceImpl));
-			instantiationService.stub(IFileService, new FileService(new TestContextService(new Workspace(testDir, testDir, toWorkspaceFolders([{ path: testDir }]))), new TestTextResourceConfigurationService(), new TestConfigurationService(), lifecycleService, { disableWatcher: true }));
+			instantiationService.stub(IFileService, new FileService(new TestContextService(new Workspace(testDir, testDir, toWorkspaceFolders([{ path: testDir }]))), TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), lifecycleService, { disableWatcher: true }));
 			instantiationService.stub(IUntitledEditorService, instantiationService.createInstance(UntitledEditorService));
 			instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
 			instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
@@ -109,28 +109,28 @@ suite('Keybindings Editing', () => {
 		fs.writeFileSync(keybindingsFile, ',,,,,,,,,,,,,,');
 		return testObject.editKeybinding('alt+c', aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape } }))
 			.then(() => assert.fail('Should fail with parse errors'),
-			error => assert.equal(error.message, 'Unable to write keybindings. Please open **Keybindings file** to correct errors/warnings in the file and try again.'));
+			error => assert.equal(error.message, 'Unable to write to the keybindings configuration file. Please open it to correct errors/warnings in the file and try again.'));
 	});
 
 	test('errors cases - parse errors 2', () => {
 		fs.writeFileSync(keybindingsFile, '[{"key": }]');
 		return testObject.editKeybinding('alt+c', aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape } }))
 			.then(() => assert.fail('Should fail with parse errors'),
-			error => assert.equal(error.message, 'Unable to write keybindings. Please open **Keybindings file** to correct errors/warnings in the file and try again.'));
+			error => assert.equal(error.message, 'Unable to write to the keybindings configuration file. Please open it to correct errors/warnings in the file and try again.'));
 	});
 
 	test('errors cases - dirty', () => {
 		instantiationService.stub(ITextFileService, 'isDirty', true);
 		return testObject.editKeybinding('alt+c', aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape } }))
 			.then(() => assert.fail('Should fail with dirty error'),
-			error => assert.equal(error.message, 'Unable to write because the file is dirty. Please save the **Keybindings** file and try again.'));
+			error => assert.equal(error.message, 'Unable to write because the keybindings configuration file is dirty. Please save it first and then try again.'));
 	});
 
 	test('errors cases - did not find an array', () => {
 		fs.writeFileSync(keybindingsFile, '{"key": "alt+c", "command": "hello"}');
 		return testObject.editKeybinding('alt+c', aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape } }))
 			.then(() => assert.fail('Should fail with dirty error'),
-			error => assert.equal(error.message, 'Unable to write keybindings. **Keybindings file** has an object which is not of type Array. Please open the file to clean up and try again.'));
+			error => assert.equal(error.message, 'Unable to write to the keybindings configuration file. It has an object which is not of type Array. Please open the file to clean up and try again.'));
 	});
 
 	test('edit a default keybinding to an empty file', () => {
diff --git a/src/vs/workbench/services/message/browser/media/messageList.css b/src/vs/workbench/services/message/browser/media/messageList.css
deleted file mode 100644
index f8013820d26..00000000000
--- a/src/vs/workbench/services/message/browser/media/messageList.css
+++ /dev/null
@@ -1,117 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-.global-message-list {
-	font-size: 12px;
-	position: absolute;
-	z-index: 300;
-	list-style-type: none;
-	line-height: 35px;
-	margin: 0;
-	padding: 0;
-	width: 70%;
-	left: 15%;
-}
-
-.hc-black .global-message-list {
-	outline: 2px solid;
-	outline-offset: -2px;
-	box-shadow: none;
-}
-
-.global-message-list.transition {
-	-webkit-transition:	top 200ms linear;
-	-ms-transition:		top 200ms linear;
-	-moz-transition:	top 200ms linear;
-	-khtml-transition:	top 200ms linear;
-	-o-transition:		top 200ms linear;
-	transition:			top 200ms linear;
-}
-
-.global-message-list ul.message-list {
-	margin: 0;
-	padding: 0;
-}
-
-.global-message-list li.message-list-entry {
-	padding-left: 10px;
-	padding-right: 10px;
-	overflow: hidden;
-	-webkit-box-sizing:	border-box;
-	-o-box-sizing:		border-box;
-	-moz-box-sizing:	border-box;
-	-ms-box-sizing:		border-box;
-	box-sizing: 		border-box; /* Important so that borders added don't add to the overal size */
-	height: 35px;
-}
-
-.global-message-list li.message-list-entry-with-action {
-	padding-right: 0;
-}
-
-.global-message-list li.message-list-entry .message-left-side {
-	-webkit-user-select: text;
-	-ms-user-select: text;
-	-khtml-user-select: text;
-	-moz-user-select: text;
-	-o-user-select: text;
-	user-select: text;
-}
-
-.global-message-list li.message-list-entry .message-left-side.severity {
-	padding: 2px 4px;
-	margin-right: 10px;
-	font-weight: bold;
-	font-size: 11px;
-	-webkit-user-select: none;
-	-ms-user-select: none;
-	-khtml-user-select: none;
-	-moz-user-select: -moz-none;
-	-o-user-select: none;
-	user-select: none;
-}
-
-.global-message-list li.message-list-entry .message-left-side.message-overflow-ellipsis {
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	display: block;
-}
-
-.global-message-list li.message-list-entry .actions-container {
-	float: right;
-}
-
-.global-message-list li.message-list-entry .actions-container .message-action {
-	display: inline-block;
-}
-
-.global-message-list li.message-list-entry .actions-container .message-action .action-button {
-	padding-left: 10px;
-	padding-right: 10px;
-	display: inline-block;
-	color: inherit;
-	text-decoration: none;
-	cursor: pointer;
-}
-
-.hc-black .global-message-list li.message-list-entry .message-left-side.severity {
-	border: 1px solid;
-}
-
-.hc-black .global-message-list li.message-list-entry .actions-container .message-action .action-button {
-	border: 1px solid;
-}
-
-.hc-black .global-message-list li.message-list-entry .actions-container .message-action .action-button:focus {
-	outline-offset: -4px; /* Helps high-contrast outline avoid clipping. */
-}
-
-/* TODO@theme */
-
-.vs .global-message-list li.message-list-entry .actions-container .message-action .action-button:focus,
-.vs-dark .global-message-list li.message-list-entry .actions-container .message-action .action-button:focus {
-	outline-color: rgba(255, 255, 255, .5); /* buttons have a blue color, so focus indication needs to be different */
-}
\ No newline at end of file
diff --git a/src/vs/workbench/services/message/browser/messageList.ts b/src/vs/workbench/services/message/browser/messageList.ts
deleted file mode 100644
index d1741a65088..00000000000
--- a/src/vs/workbench/services/message/browser/messageList.ts
+++ /dev/null
@@ -1,508 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import 'vs/css!./media/messageList';
-import nls = require('vs/nls');
-import { TPromise } from 'vs/base/common/winjs.base';
-import { Builder, $ } from 'vs/base/browser/builder';
-import DOM = require('vs/base/browser/dom');
-import * as browser from 'vs/base/browser/browser';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import aria = require('vs/base/browser/ui/aria/aria');
-import types = require('vs/base/common/types');
-import Event, { Emitter } from 'vs/base/common/event';
-import { Action } from 'vs/base/common/actions';
-import htmlRenderer = require('vs/base/browser/htmlContentRenderer');
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { NOTIFICATIONS_FOREGROUND, NOTIFICATIONS_BACKGROUND, NOTIFICATIONS_BUTTON_BACKGROUND, NOTIFICATIONS_BUTTON_HOVER_BACKGROUND, NOTIFICATIONS_BUTTON_FOREGROUND, NOTIFICATIONS_INFO_BACKGROUND, NOTIFICATIONS_WARNING_BACKGROUND, NOTIFICATIONS_ERROR_BACKGROUND, NOTIFICATIONS_INFO_FOREGROUND, NOTIFICATIONS_WARNING_FOREGROUND, NOTIFICATIONS_ERROR_FOREGROUND } from 'vs/workbench/common/theme';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { contrastBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { Color } from 'vs/base/common/color';
-
-export enum Severity {
-	Info,
-	Warning,
-	Error
-}
-
-export interface IMessageWithAction {
-	message: string;
-	actions: Action[];
-	source: string;
-}
-
-interface IMessageEntry {
-	id: any;
-	text: string;
-	source: string;
-	severity: Severity;
-	time: number;
-	count?: number;
-	actions: Action[];
-	onHide: () => void;
-}
-
-export class IMessageListOptions {
-	purgeInterval: number;
-	maxMessages: number;
-	maxMessageLength: number;
-}
-
-const DEFAULT_MESSAGE_LIST_OPTIONS = {
-	purgeInterval: 10000,
-	maxMessages: 5,
-	maxMessageLength: 500
-};
-
-export class MessageList {
-	private messages: IMessageEntry[];
-	private messageListPurger: TPromise<void>;
-	private messageListContainer: Builder;
-
-	private container: HTMLElement;
-	private options: IMessageListOptions;
-
-	private _onMessagesShowing: Emitter<void>;
-	private _onMessagesCleared: Emitter<void>;
-
-	private toDispose: IDisposable[];
-
-	private background = Color.fromHex('#333333');
-	private foreground = Color.fromHex('#EEEEEE');
-	private widgetShadow = Color.fromHex('#000000');
-	private outlineBorder: Color;
-	private buttonBackground = Color.fromHex('#0E639C');
-	private buttonForeground = this.foreground;
-	private infoBackground = Color.fromHex('#007ACC');
-	private infoForeground = this.foreground;
-	private warningBackground = Color.fromHex('#B89500');
-	private warningForeground = this.foreground;
-	private errorBackground = Color.fromHex('#BE1100');
-	private errorForeground = this.foreground;
-
-	constructor(
-		container: HTMLElement,
-		private telemetryService: ITelemetryService,
-		options: IMessageListOptions = DEFAULT_MESSAGE_LIST_OPTIONS
-	) {
-		this.toDispose = [];
-		this.messages = [];
-		this.messageListPurger = null;
-		this.container = container;
-		this.options = options;
-
-		this._onMessagesShowing = new Emitter<void>();
-		this._onMessagesCleared = new Emitter<void>();
-
-		this.registerListeners();
-	}
-
-	private registerListeners(): void {
-		this.toDispose.push(browser.onDidChangeFullscreen(() => this.positionMessageList()));
-		this.toDispose.push(browser.onDidChangeZoomLevel(() => this.positionMessageList()));
-		this.toDispose.push(registerThemingParticipant((theme, collector) => {
-			this.background = theme.getColor(NOTIFICATIONS_BACKGROUND);
-			this.foreground = theme.getColor(NOTIFICATIONS_FOREGROUND);
-			this.widgetShadow = theme.getColor(widgetShadow);
-			this.outlineBorder = theme.getColor(contrastBorder);
-			this.buttonBackground = theme.getColor(NOTIFICATIONS_BUTTON_BACKGROUND);
-			this.buttonForeground = theme.getColor(NOTIFICATIONS_BUTTON_FOREGROUND);
-			this.infoBackground = theme.getColor(NOTIFICATIONS_INFO_BACKGROUND);
-			this.infoForeground = theme.getColor(NOTIFICATIONS_INFO_FOREGROUND);
-			this.warningBackground = theme.getColor(NOTIFICATIONS_WARNING_BACKGROUND);
-			this.warningForeground = theme.getColor(NOTIFICATIONS_WARNING_FOREGROUND);
-			this.errorBackground = theme.getColor(NOTIFICATIONS_ERROR_BACKGROUND);
-			this.errorForeground = theme.getColor(NOTIFICATIONS_ERROR_FOREGROUND);
-
-			const buttonHoverBackgroundColor = theme.getColor(NOTIFICATIONS_BUTTON_HOVER_BACKGROUND);
-			if (buttonHoverBackgroundColor) {
-				collector.addRule(`.global-message-list li.message-list-entry .actions-container .message-action .action-button:hover { background-color: ${buttonHoverBackgroundColor} !important; }`);
-			}
-
-			this.updateStyles();
-		}));
-	}
-
-	public get onMessagesShowing(): Event<void> {
-		return this._onMessagesShowing.event;
-	}
-
-	public get onMessagesCleared(): Event<void> {
-		return this._onMessagesCleared.event;
-	}
-
-	public updateStyles(): void {
-		if (this.messageListContainer) {
-			this.messageListContainer.style('background-color', this.background ? this.background.toString() : null);
-			this.messageListContainer.style('color', this.foreground ? this.foreground.toString() : null);
-			this.messageListContainer.style('outline-color', this.outlineBorder ? this.outlineBorder.toString() : null);
-			this.messageListContainer.style('box-shadow', this.widgetShadow ? `0 5px 8px ${this.widgetShadow}` : null);
-		}
-	}
-
-	public showMessage(severity: Severity, message: string, onHide?: () => void): () => void;
-	public showMessage(severity: Severity, message: Error, onHide?: () => void): () => void;
-	public showMessage(severity: Severity, message: string[], onHide?: () => void): () => void;
-	public showMessage(severity: Severity, message: Error[], onHide?: () => void): () => void;
-	public showMessage(severity: Severity, message: IMessageWithAction, onHide?: () => void): () => void;
-	public showMessage(severity: Severity, message: any, onHide?: () => void): () => void {
-		if (Array.isArray(message)) {
-			const closeFns: Function[] = [];
-			message.forEach((msg: any) => closeFns.push(this.showMessage(severity, msg, onHide)));
-
-			return () => closeFns.forEach((fn) => fn());
-		}
-
-		// Return only if we are unable to extract a message text
-		const messageText = this.getMessageText(message);
-		if (!messageText || typeof messageText !== 'string') {
-			return () => {/* empty */ };
-		}
-
-		// Show message
-		return this.doShowMessage(message, messageText, severity, onHide);
-	}
-
-	private getMessageText(message: any): string {
-		if (types.isString(message)) {
-			return message;
-		}
-
-		if (message instanceof Error) {
-			return toErrorMessage(message, false);
-		}
-
-		if (message && (<IMessageWithAction>message).message) {
-			return (<IMessageWithAction>message).message;
-		}
-
-		return null;
-	}
-
-	private doShowMessage(id: string, message: string, severity: Severity, onHide: () => void): () => void;
-	private doShowMessage(id: Error, message: string, severity: Severity, onHide: () => void): () => void;
-	private doShowMessage(id: IMessageWithAction, message: string, severity: Severity, onHide: () => void): () => void;
-	private doShowMessage(id: any, message: string, severity: Severity, onHide: () => void): () => void {
-		const actions = (<IMessageWithAction>id).actions;
-		const source = (<IMessageWithAction>id).source || 'vscode';
-
-		// Telemetry (TODO@Ben remove me later)
-		/* __GDPR__
-			"showMessage" : {
-				"message" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				"source" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				"buttons" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			}
-		*/
-		this.telemetryService.publicLog('showMessage', { message, source, buttons: actions ? actions.map(a => a.label) : void 0 });
-
-		// Trigger Auto-Purge of messages to keep list small
-		this.purgeMessages();
-
-		// Store in Memory (new messages come first so that they show up on top)
-		this.messages.unshift({
-			id: id,
-			text: message,
-			severity: severity,
-			time: Date.now(),
-			actions,
-			source,
-			onHide
-		});
-
-		// Render
-		this.renderMessages(true, 1);
-
-		// Support in Screen Readers too
-		let alertText: string;
-		if (severity === Severity.Error) {
-			alertText = nls.localize('alertErrorMessage', "Error: {0}", message);
-		} else if (severity === Severity.Warning) {
-			alertText = nls.localize('alertWarningMessage', "Warning: {0}", message);
-		} else {
-			alertText = nls.localize('alertInfoMessage', "Info: {0}", message);
-		}
-
-		aria.alert(alertText);
-
-		return () => this.hideMessage(id);
-	}
-
-	private renderMessages(animate: boolean, delta: number): void {
-		const container = $(this.container);
-
-		// Lazily create, otherwise clear old
-		if (!this.messageListContainer) {
-			this.messageListContainer = $('.global-message-list').appendTo(container);
-		} else {
-			$(this.messageListContainer).empty();
-			$(this.messageListContainer).removeClass('transition');
-		}
-
-		// Support animation for messages by moving the container out of view and then in
-		if (animate) {
-			$(this.messageListContainer).style('top', '-35px');
-		}
-
-		// Render Messages as List Items
-		$(this.messageListContainer).ul({ 'class': 'message-list' }, ul => {
-			const messages = this.prepareMessages();
-			if (messages.length > 0) {
-				this._onMessagesShowing.fire();
-			} else {
-				this._onMessagesCleared.fire();
-			}
-
-			messages.forEach((message: IMessageEntry, index: number) => {
-				this.renderMessage(message, $(ul), messages.length, delta);
-			});
-
-			// Support animation for messages by moving the container out of view and then in
-			if (animate) {
-				setTimeout(() => {
-					this.positionMessageList();
-					$(this.messageListContainer).addClass('transition');
-				}, 50 /* Need this delay to reliably get the animation on some browsers */);
-			}
-		});
-
-		// Styles
-		this.updateStyles();
-	}
-
-	private positionMessageList(animate?: boolean): void {
-		if (!this.messageListContainer) {
-			return; // not yet created
-		}
-
-		$(this.messageListContainer).removeClass('transition'); // disable any animations
-
-		let position = 0;
-		if (!browser.isFullscreen() && DOM.hasClass(this.container, 'titlebar-style-custom')) {
-			position = 22 / browser.getZoomFactor(); // adjust the position based on title bar size and zoom factor
-		}
-
-		$(this.messageListContainer).style('top', `${position}px`);
-	}
-
-	private renderMessage(message: IMessageEntry, container: Builder, total: number, delta: number): void {
-		container.li({ class: 'message-list-entry message-list-entry-with-action' }, li => {
-
-			// Actions (if none provided, add one default action to hide message)
-			const messageActions = this.getMessageActions(message);
-			li.div({ class: 'actions-container' }, actionContainer => {
-				for (let i = 0; i < messageActions.length; i++) {
-					const action = messageActions[i];
-					actionContainer.div({ class: 'message-action' }, div => {
-						div.a({ class: 'action-button', tabindex: '0', role: 'button' })
-							.style('border-color', this.outlineBorder ? this.outlineBorder.toString() : null)
-							.style('background-color', this.buttonBackground ? this.buttonBackground.toString() : null)
-							.style('color', this.buttonForeground ? this.buttonForeground.toString() : null)
-							.text(action.label)
-							.on([DOM.EventType.CLICK, DOM.EventType.KEY_DOWN], e => {
-								if (e instanceof KeyboardEvent) {
-									const event = new StandardKeyboardEvent(e);
-									if (!event.equals(KeyCode.Enter) && !event.equals(KeyCode.Space)) {
-										return; // Only handle Enter/Escape for keyboard access
-									}
-								}
-
-								DOM.EventHelper.stop(e, true);
-
-								/* __GDPR__
-									"workbenchActionExecuted" : {
-										"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-										"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-									}
-								*/
-								this.telemetryService.publicLog('workbenchActionExecuted', { id: action.id, from: 'message' });
-
-								(action.run() || TPromise.as(null))
-									.then(null, error => this.showMessage(Severity.Error, error))
-									.done(r => {
-										if (typeof r === 'boolean' && r === false) {
-											return;
-										}
-
-										this.hideMessage(message.text); // hide all matching the text since there may be duplicates
-									});
-							});
-					});
-				}
-			});
-
-			// Text
-			const text = message.text.substr(0, this.options.maxMessageLength);
-			li.div({ class: 'message-left-side' }, div => {
-				div.addClass('message-overflow-ellipsis');
-
-				// Severity indicator
-				const sev = message.severity;
-				const label = (sev === Severity.Error) ? nls.localize('error', "Error") : (sev === Severity.Warning) ? nls.localize('warning', "Warn") : nls.localize('info', "Info");
-				const color = (sev === Severity.Error) ? this.errorBackground : (sev === Severity.Warning) ? this.warningBackground : this.infoBackground;
-				const foregroundColor = (sev === Severity.Error) ? this.errorForeground : (sev === Severity.Warning) ? this.warningForeground : this.infoForeground;
-				const sevLabel = $().span({ class: `message-left-side severity ${sev === Severity.Error ? 'app-error' : sev === Severity.Warning ? 'app-warning' : 'app-info'}`, text: label });
-				sevLabel.style('border-color', this.outlineBorder ? this.outlineBorder.toString() : null);
-				sevLabel.style('background-color', color ? color.toString() : null);
-				sevLabel.style('color', foregroundColor ? foregroundColor.toString() : null);
-				sevLabel.appendTo(div);
-
-				// Error message
-				const messageContentElement = htmlRenderer.renderFormattedText(text, {
-					inline: true,
-					className: 'message-left-side',
-				});
-
-				// Hover title
-				const title = message.source ? `[${message.source}] ${messageContentElement.textContent}` : messageContentElement.textContent;
-
-				sevLabel.title(title);
-
-				$(messageContentElement).title(title).appendTo(div);
-			});
-		});
-	}
-
-	private getMessageActions(message: IMessageEntry): Action[] {
-		let messageActions: Action[];
-		if (message.actions && message.actions.length > 0) {
-			messageActions = message.actions;
-		} else {
-			messageActions = [
-				new Action('close.message.action', nls.localize('close', "Close"), null, true, () => {
-					this.hideMessage(message.text); // hide all matching the text since there may be duplicates
-
-					return TPromise.as(true);
-				})
-			];
-		}
-
-		return messageActions;
-	}
-
-	private prepareMessages(): IMessageEntry[] {
-
-		// Aggregate Messages by text to reduce their count
-		const messages: IMessageEntry[] = [];
-		const handledMessages: { [message: string]: number; } = {};
-
-		let offset = 0;
-		for (let i = 0; i < this.messages.length; i++) {
-			const message = this.messages[i];
-			if (types.isUndefinedOrNull(handledMessages[message.text])) {
-				message.count = 1;
-				messages.push(message);
-				handledMessages[message.text] = offset++;
-			} else {
-				messages[handledMessages[message.text]].count++;
-			}
-		}
-
-		if (messages.length > this.options.maxMessages) {
-			return messages.splice(messages.length - this.options.maxMessages, messages.length);
-		}
-
-		return messages;
-	}
-
-	private disposeMessages(messages: IMessageEntry[]): void {
-		messages.forEach(message => {
-			if (message.onHide) {
-				message.onHide();
-			}
-
-			if (message.actions) {
-				message.actions.forEach(action => {
-					action.dispose();
-				});
-			}
-		});
-	}
-
-	public hideMessages(): void {
-		this.hideMessage();
-	}
-
-	public show(): void {
-		if (this.messageListContainer && this.messageListContainer.isHidden()) {
-			this.messageListContainer.show();
-		}
-	}
-
-	public hide(): void {
-		if (this.messageListContainer && !this.messageListContainer.isHidden()) {
-			this.messageListContainer.hide();
-		}
-	}
-
-	private hideMessage(messageText?: string): void;
-	private hideMessage(messageObj?: any): void {
-		let messageFound = false;
-
-		for (let i = 0; i < this.messages.length; i++) {
-			const message = this.messages[i];
-			let hide = false;
-
-			// Hide specific message
-			if (messageObj) {
-				hide = ((types.isString(messageObj) && message.text === messageObj) || message.id === messageObj);
-			}
-
-			// Hide all messages
-			else {
-				hide = true;
-			}
-
-			if (hide) {
-				this.disposeMessages(this.messages.splice(i, 1));
-				i--;
-				messageFound = true;
-			}
-		}
-
-		if (messageFound) {
-			this.renderMessages(false, -1);
-		}
-	}
-
-	private purgeMessages(): void {
-
-		// Cancel previous
-		if (this.messageListPurger) {
-			this.messageListPurger.cancel();
-		}
-
-		// Configure
-		this.messageListPurger = TPromise.timeout(this.options.purgeInterval).then(() => {
-			let needsUpdate = false;
-			let counter = 0;
-
-			for (let i = 0; i < this.messages.length; i++) {
-				const message = this.messages[i];
-
-				// Only purge infos and warnings and only if they are not providing actions
-				if (message.severity !== Severity.Error && !message.actions) {
-					this.disposeMessages(this.messages.splice(i, 1));
-					counter--;
-					i--;
-					needsUpdate = true;
-				}
-			}
-
-			if (needsUpdate) {
-				this.renderMessages(false, counter);
-			}
-		});
-	}
-
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
-	}
-}
diff --git a/src/vs/workbench/services/message/browser/messageService.ts b/src/vs/workbench/services/message/browser/messageService.ts
deleted file mode 100644
index 26b29d8e4c0..00000000000
--- a/src/vs/workbench/services/message/browser/messageService.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import errors = require('vs/base/common/errors');
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import types = require('vs/base/common/types');
-import { MessageList, Severity as BaseSeverity } from 'vs/workbench/services/message/browser/messageList';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { IMessageService, IMessageWithAction, IConfirmation, Severity, IConfirmationResult } from 'vs/platform/message/common/message';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import Event from 'vs/base/common/event';
-import { TPromise } from 'vs/base/common/winjs.base';
-
-interface IBufferedMessage {
-	severity: Severity;
-	message: any;
-	onHide: () => void;
-	disposeFn: () => void;
-}
-
-export class WorkbenchMessageService implements IMessageService {
-
-	public _serviceBrand: any;
-
-	private handler: MessageList;
-	private toDispose: IDisposable[];
-
-	private canShowMessages: boolean;
-	private messageBuffer: IBufferedMessage[];
-
-	constructor(
-		container: HTMLElement,
-		telemetryService: ITelemetryService
-	) {
-		this.handler = new MessageList(container, telemetryService);
-		this.messageBuffer = [];
-		this.canShowMessages = true;
-		this.toDispose = [this.handler];
-	}
-
-	public get onMessagesShowing(): Event<void> {
-		return this.handler.onMessagesShowing;
-	}
-
-	public get onMessagesCleared(): Event<void> {
-		return this.handler.onMessagesCleared;
-	}
-
-	public suspend(): void {
-		this.canShowMessages = false;
-		this.handler.hide();
-	}
-
-	public resume(): void {
-		this.canShowMessages = true;
-		this.handler.show();
-
-		// Release messages from buffer
-		while (this.messageBuffer.length) {
-			const bufferedMessage = this.messageBuffer.pop();
-			bufferedMessage.disposeFn = this.show(bufferedMessage.severity, bufferedMessage.message, bufferedMessage.onHide);
-		}
-	}
-
-	private toBaseSeverity(severity: Severity): BaseSeverity {
-		switch (severity) {
-			case Severity.Info:
-				return BaseSeverity.Info;
-
-			case Severity.Warning:
-				return BaseSeverity.Warning;
-		}
-
-		return BaseSeverity.Error;
-	}
-
-	public show(sev: Severity, message: string, onHide?: () => void): () => void;
-	public show(sev: Severity, message: Error, onHide?: () => void): () => void;
-	public show(sev: Severity, message: string[], onHide?: () => void): () => void;
-	public show(sev: Severity, message: Error[], onHide?: () => void): () => void;
-	public show(sev: Severity, message: IMessageWithAction, onHide?: () => void): () => void;
-	public show(sev: Severity, message: any, onHide?: () => void): () => void {
-		if (!message) {
-			return () => void 0; // guard against undefined messages
-		}
-
-		if (Array.isArray(message)) {
-			let closeFns: Function[] = [];
-			message.forEach((msg: any) => closeFns.push(this.show(sev, msg, onHide)));
-
-			return () => closeFns.forEach((fn) => fn());
-		}
-
-		if (errors.isPromiseCanceledError(message)) {
-			return () => void 0; // this kind of error should not be shown
-		}
-
-		if (types.isNumber(message.severity)) {
-			sev = message.severity;
-		}
-
-		return this.doShow(sev, message, onHide);
-	}
-
-	private doShow(sev: Severity, message: any, onHide?: () => void): () => void {
-
-		// Check flag if we can show a message now
-		if (!this.canShowMessages) {
-			const messageObj: IBufferedMessage = {
-				severity: sev,
-				message,
-				onHide,
-				disposeFn: () => this.messageBuffer.splice(this.messageBuffer.indexOf(messageObj), 1)
-			};
-			this.messageBuffer.push(messageObj);
-
-			// Return function that allows to remove message from buffer
-			return () => messageObj.disposeFn();
-		}
-
-		// Show in Console
-		if (sev === Severity.Error) {
-			console.error(toErrorMessage(message, true));
-		}
-
-		// Show in Global Handler
-		return this.handler.showMessage(this.toBaseSeverity(sev), message, onHide);
-	}
-
-	public hideAll(): void {
-		if (this.handler) {
-			this.handler.hideMessages();
-		}
-	}
-
-	public confirm(confirmation: IConfirmation): TPromise<boolean> {
-		let messageText = confirmation.message;
-		if (confirmation.detail) {
-			messageText = messageText + '\n\n' + confirmation.detail;
-		}
-
-		return TPromise.wrap(window.confirm(messageText));
-	}
-
-	public confirmWithCheckbox(confirmation: IConfirmation): TPromise<IConfirmationResult> {
-		return this.confirm(confirmation).then(confirmed => {
-			return {
-				confirmed,
-				checkboxChecked: false // unsupported
-			} as IConfirmationResult;
-		});
-	}
-
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
-	}
-}
\ No newline at end of file
diff --git a/src/vs/workbench/services/notification/common/notificationService.ts b/src/vs/workbench/services/notification/common/notificationService.ts
new file mode 100644
index 00000000000..3781071048f
--- /dev/null
+++ b/src/vs/workbench/services/notification/common/notificationService.ts
@@ -0,0 +1,68 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { INotificationService, INotification, INotificationHandle, Severity, NotificationMessage } from 'vs/platform/notification/common/notification';
+import { INotificationsModel, NotificationsModel } from 'vs/workbench/common/notifications';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+
+export class NotificationService implements INotificationService {
+
+	public _serviceBrand: any;
+
+	private _model: INotificationsModel;
+	private toDispose: IDisposable[];
+
+	constructor() {
+		this.toDispose = [];
+
+		const model = new NotificationsModel();
+		this.toDispose.push(model);
+		this._model = model;
+	}
+
+	public get model(): INotificationsModel {
+		return this._model;
+	}
+
+	public info(message: NotificationMessage | NotificationMessage[]): void {
+		if (Array.isArray(message)) {
+			message.forEach(m => this.info(m));
+
+			return;
+		}
+
+		this.model.notify({ severity: Severity.Info, message });
+	}
+
+	public warn(message: NotificationMessage | NotificationMessage[]): void {
+		if (Array.isArray(message)) {
+			message.forEach(m => this.warn(m));
+
+			return;
+		}
+
+		this.model.notify({ severity: Severity.Warning, message });
+	}
+
+	public error(message: NotificationMessage | NotificationMessage[]): void {
+		if (Array.isArray(message)) {
+			message.forEach(m => this.error(m));
+
+			return;
+		}
+
+		this.model.notify({ severity: Severity.Error, message });
+	}
+
+	public notify(notification: INotification): INotificationHandle {
+		return this.model.notify(notification);
+	}
+
+	public dispose(): void {
+		this.toDispose = dispose(this.toDispose);
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/services/part/common/partService.ts b/src/vs/workbench/services/part/common/partService.ts
index 0199e49527f..b56e8c8fe1d 100644
--- a/src/vs/workbench/services/part/common/partService.ts
+++ b/src/vs/workbench/services/part/common/partService.ts
@@ -129,6 +129,16 @@ export interface IPartService {
 	 */
 	toggleZenMode(): void;
 
+	/**
+	 * Returns whether the centered editor layout is active.
+	 */
+	isEditorLayoutCentered(): boolean;
+
+	/**
+	 * Toggles the workbench in and out of centered editor layout.
+	 */
+	toggleCenteredEditorLayout(): void;
+
 	/**
 	 * Resizes currently focused part on main access
 	 */
diff --git a/src/vs/workbench/services/progress/browser/progressService2.ts b/src/vs/workbench/services/progress/browser/progressService2.ts
index cf356213af6..b728fbc0e01 100644
--- a/src/vs/workbench/services/progress/browser/progressService2.ts
+++ b/src/vs/workbench/services/progress/browser/progressService2.ts
@@ -61,8 +61,8 @@ export class ProgressService2 implements IProgressService2 {
 	private _stack: [IProgressOptions, Progress<IProgressStep>][] = [];
 
 	constructor(
-		@IActivityService private _activityBar: IActivityService,
-		@IViewletService private _viewletService: IViewletService
+		@IActivityService private readonly _activityBar: IActivityService,
+		@IViewletService private readonly _viewletService: IViewletService
 	) {
 		//
 	}
diff --git a/src/vs/workbench/services/search/node/searchService.ts b/src/vs/workbench/services/search/node/searchService.ts
index 74dc6cccde9..8348a36db72 100644
--- a/src/vs/workbench/services/search/node/searchService.ts
+++ b/src/vs/workbench/services/search/node/searchService.ts
@@ -22,6 +22,7 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Schemas } from 'vs/base/common/network';
+import * as pfs from 'vs/base/node/pfs';
 import { ILogService } from 'vs/platform/log/common/log';
 
 export class SearchService implements ISearchService {
@@ -267,7 +268,7 @@ export class DiskSearch implements ISearchResultProvider {
 		this.raw = new SearchChannelClient(channel);
 	}
 
-	public search(query: ISearchQuery): PPromise<ISearchComplete, ISearchProgressItem> {
+	public async search(query: ISearchQuery): PPromise<ISearchComplete, ISearchProgressItem> {
 		let request: PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem>;
 
 		let rawSearch: IRawSearch = {
@@ -287,7 +288,7 @@ export class DiskSearch implements ISearchResultProvider {
 
 		if (query.folderQueries) {
 			for (const q of query.folderQueries) {
-				if (q.folder.scheme === Schemas.file) {
+				if (q.folder.scheme === Schemas.file && await pfs.exists(q.folder.fsPath)) {
 					rawSearch.folderQueries.push({
 						excludePattern: q.excludePattern,
 						includePattern: q.includePattern,
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
index 981d07eaca2..ff4e0414531 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -25,7 +25,6 @@ import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel'
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { IFileService, IFileStat, FileOperationError, FileOperationResult, CONTENT_CHANGE_EVENT_BUFFER_DELAY, FileChangesEvent, FileChangeType } from 'vs/platform/files/common/files';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -33,6 +32,7 @@ import { RunOnceScheduler } from 'vs/base/common/async';
 import { ITextBufferFactory } from 'vs/editor/common/model';
 import { IHashService } from 'vs/workbench/services/hash/common/hashService';
 import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 /**
  * The text file editor model listens to changes to its underlying code editor model and saves these changes through the file service back to the disk.
@@ -73,7 +73,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 	constructor(
 		resource: URI,
 		preferredEncoding: string,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@IModeService modeService: IModeService,
 		@IModelService modelService: IModelService,
 		@IFileService private fileService: IFileService,
@@ -189,7 +189,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			return;
 		}
 
-		const firstLineText = this.getFirstLineText(this.textEditorModel.createSnapshot());
+		const firstLineText = this.getFirstLineText(this.textEditorModel);
 		const mode = this.getOrCreateMode(this.modeService, modeId, firstLineText);
 
 		this.modelService.setMode(this.textEditorModel, mode);
@@ -390,6 +390,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			mtime: content.mtime,
 			etag: content.etag,
 			isDirectory: false,
+			isSymbolicLink: false,
 			children: void 0
 		};
 		this.updateLastResolvedDiskStat(resolvedStat);
@@ -913,7 +914,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		// Decode: Load with encoding
 		else {
 			if (this.isDirty()) {
-				this.messageService.show(Severity.Info, nls.localize('saveFileFirst', "The file is dirty. Please save it first before reopening it with another encoding."));
+				this.notificationService.info(nls.localize('saveFileFirst', "The file is dirty. Please save it first before reopening it with another encoding."));
 
 				return;
 			}
@@ -1081,10 +1082,10 @@ export class SaveSequentializer {
 
 class DefaultSaveErrorHandler implements ISaveErrorHandler {
 
-	constructor( @IMessageService private messageService: IMessageService) { }
+	constructor( @INotificationService private notificationService: INotificationService) { }
 
 	public onSaveError(error: any, model: TextFileEditorModel): void {
-		this.messageService.show(Severity.Error, nls.localize('genericSaveError', "Failed to save '{0}': {1}", paths.basename(model.getResource().fsPath), toErrorMessage(error, false)));
+		this.notificationService.error(nls.localize('genericSaveError', "Failed to save '{0}': {1}", paths.basename(model.getResource().fsPath), toErrorMessage(error, false)));
 	}
 }
 
diff --git a/src/vs/workbench/services/textfile/common/textFileService.ts b/src/vs/workbench/services/textfile/common/textFileService.ts
index 6aa4e0f9073..6b73f366329 100644
--- a/src/vs/workbench/services/textfile/common/textFileService.ts
+++ b/src/vs/workbench/services/textfile/common/textFileService.ts
@@ -26,7 +26,6 @@ import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/un
 import { UntitledEditorModel } from 'vs/workbench/common/editor/untitledEditorModel';
 import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { ResourceMap } from 'vs/base/common/map';
 import { Schemas } from 'vs/base/common/network';
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
@@ -34,6 +33,7 @@ import { IRevertOptions } from 'vs/platform/editor/common/editor';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
 import { IModelService } from 'vs/editor/common/services/modelService';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export interface IBackupResult {
 	didBackup: boolean;
@@ -70,7 +70,7 @@ export abstract class TextFileService implements ITextFileService {
 		protected fileService: IFileService,
 		private untitledEditorService: IUntitledEditorService,
 		private instantiationService: IInstantiationService,
-		private messageService: IMessageService,
+		private notificationService: INotificationService,
 		protected environmentService: IEnvironmentService,
 		private backupFileService: IBackupFileService,
 		private windowsService: IWindowsService,
@@ -161,7 +161,7 @@ export abstract class TextFileService implements ITextFileService {
 							return this.confirmBeforeShutdown();
 						}, errors => {
 							const firstError = errors[0];
-							this.messageService.show(Severity.Error, nls.localize('files.backup.failSave', "Files that are dirty could not be written to the backup location (Error: {0}). Try saving your files first and then exit.", firstError.message));
+							this.notificationService.error(nls.localize('files.backup.failSave', "Files that are dirty could not be written to the backup location (Error: {0}). Try saving your files first and then exit.", firstError.message));
 
 							return true; // veto, the backups failed
 						});
diff --git a/src/vs/workbench/services/textfile/electron-browser/textFileService.ts b/src/vs/workbench/services/textfile/electron-browser/textFileService.ts
index 1dcfc4c6334..219d075fe7e 100644
--- a/src/vs/workbench/services/textfile/electron-browser/textFileService.ts
+++ b/src/vs/workbench/services/textfile/electron-browser/textFileService.ts
@@ -24,13 +24,14 @@ import { createTextBufferFactoryFromStream } from 'vs/editor/common/model/textMo
 import product from 'vs/platform/node/product';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IMessageService, getConfirmMessage } from 'vs/platform/message/common/message';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { IWindowsService, IWindowService } from 'vs/platform/windows/common/windows';
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
 import { mnemonicButtonLabel } from 'vs/base/common/labels';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IModelService } from 'vs/editor/common/services/modelService';
+import { getConfirmMessage } from 'vs/workbench/services/dialogs/electron-browser/dialogs';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class TextFileService extends AbstractTextFileService {
 
@@ -45,13 +46,13 @@ export class TextFileService extends AbstractTextFileService {
 		@IModelService modelService: IModelService,
 		@IWindowService private windowService: IWindowService,
 		@IEnvironmentService environmentService: IEnvironmentService,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@IBackupFileService backupFileService: IBackupFileService,
 		@IWindowsService windowsService: IWindowsService,
 		@IHistoryService historyService: IHistoryService,
 		@IContextKeyService contextKeyService: IContextKeyService
 	) {
-		super(lifecycleService, contextService, configurationService, fileService, untitledEditorService, instantiationService, messageService, environmentService, backupFileService, windowsService, historyService, contextKeyService, modelService);
+		super(lifecycleService, contextService, configurationService, fileService, untitledEditorService, instantiationService, notificationService, environmentService, backupFileService, windowsService, historyService, contextKeyService, modelService);
 	}
 
 	public resolveTextContent(resource: URI, options?: IResolveContentOptions): TPromise<IRawTextContent> {
diff --git a/src/vs/workbench/services/workspace/node/workspaceEditingService.ts b/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
index 6cf2752ff79..0804cd41139 100644
--- a/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
+++ b/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
@@ -23,11 +23,12 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { IExtensionService } from 'vs/platform/extensions/common/extensions';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { BackupFileService } from 'vs/workbench/services/backup/node/backupFileService';
-import { IChoiceService, Severity, IMessageService } from 'vs/platform/message/common/message';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { distinct } from 'vs/base/common/arrays';
 import { isLinux } from 'vs/base/common/platform';
 import { isEqual } from 'vs/base/common/resources';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
+import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 
 export class WorkspaceEditingService implements IWorkspaceEditingService {
 
@@ -42,7 +43,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 		@IExtensionService private extensionService: IExtensionService,
 		@IBackupFileService private backupFileService: IBackupFileService,
 		@IChoiceService private choiceService: IChoiceService,
-		@IMessageService private messageService: IMessageService,
+		@INotificationService private notificationService: INotificationService,
 		@ICommandService private commandService: ICommandService
 	) {
 	}
@@ -160,7 +161,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 			case JSONEditingErrorCode.ERROR_FILE_DIRTY:
 				return this.onWorkspaceConfigurationFileDirtyError();
 		}
-		this.messageService.show(Severity.Error, error.message);
+		this.notificationService.error(error.message);
 		return TPromise.as(void 0);
 	}
 
@@ -175,12 +176,10 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 	}
 
 	private askToOpenWorkspaceConfigurationFile(message: string): TPromise<void> {
-		return this.choiceService.choose(Severity.Error, message, [nls.localize('openWorkspaceConfigurationFile', "Open Workspace Configuration File"), nls.localize('close', "Close")], 1)
+		return this.choiceService.choose(Severity.Error, message, [nls.localize('openWorkspaceConfigurationFile', "Open Workspace Configuration")])
 			.then(option => {
-				switch (option) {
-					case 0:
-						this.commandService.executeCommand('workbench.action.openWorkspaceConfigFile');
-						break;
+				if (option === 0) {
+					this.commandService.executeCommand('workbench.action.openWorkspaceConfigFile');
 				}
 			});
 	}
diff --git a/src/vs/workbench/test/common/notifications.test.ts b/src/vs/workbench/test/common/notifications.test.ts
new file mode 100644
index 00000000000..c14367ab9b6
--- /dev/null
+++ b/src/vs/workbench/test/common/notifications.test.ts
@@ -0,0 +1,178 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as assert from 'assert';
+import { NotificationsModel, NotificationViewItem, INotificationChangeEvent, NotificationChangeType, NotificationViewItemLabelKind } from 'vs/workbench/common/notifications';
+import { Action } from 'vs/base/common/actions';
+import { INotification, Severity } from 'vs/platform/notification/common/notification';
+import { create } from 'vs/base/common/errors';
+
+suite('Notifications', () => {
+
+	test('Items', () => {
+
+		// Invalid
+		assert.ok(!NotificationViewItem.create({ severity: Severity.Error, message: '' }));
+		assert.ok(!NotificationViewItem.create({ severity: Severity.Error, message: null }));
+		assert.ok(!NotificationViewItem.create({ severity: Severity.Error, message: { value: '', isTrusted: true } }));
+
+		// Duplicates
+		let item1 = NotificationViewItem.create({ severity: Severity.Error, message: 'Error Message' });
+		let item2 = NotificationViewItem.create({ severity: Severity.Error, message: 'Error Message' });
+		let item3 = NotificationViewItem.create({ severity: Severity.Info, message: 'Info Message' });
+		let item4 = NotificationViewItem.create({ severity: Severity.Error, message: 'Error Message', source: 'Source' });
+		let item5 = NotificationViewItem.create({ severity: Severity.Error, message: 'Error Message', actions: { primary: [new Action('id', 'label')] } });
+
+		assert.equal(item1.equals(item1), true);
+		assert.equal(item2.equals(item2), true);
+		assert.equal(item3.equals(item3), true);
+		assert.equal(item4.equals(item4), true);
+		assert.equal(item5.equals(item5), true);
+
+		assert.equal(item1.equals(item2), true);
+		assert.equal(item1.equals(item3), false);
+		assert.equal(item1.equals(item4), false);
+		assert.equal(item1.equals(item5), false);
+
+		// Message Box
+		assert.equal(item5.canCollapse, false);
+		assert.equal(item5.expanded, true);
+
+		// Events
+		let called = 0;
+		item1.onDidExpansionChange(() => {
+			called++;
+		});
+
+		item1.expand();
+		item1.expand();
+		item1.collapse();
+		item1.collapse();
+
+		assert.equal(called, 2);
+
+		called = 0;
+		item1.onDidLabelChange(e => {
+			if (e.kind === NotificationViewItemLabelKind.PROGRESS) {
+				called++;
+			}
+		});
+
+		item1.progress.infinite();
+		item1.progress.done();
+
+		assert.equal(called, 2);
+
+		called = 0;
+		item1.onDidLabelChange(e => {
+			if (e.kind === NotificationViewItemLabelKind.MESSAGE) {
+				called++;
+			}
+		});
+
+		item1.updateMessage('message update');
+
+		called = 0;
+		item1.onDidLabelChange(e => {
+			if (e.kind === NotificationViewItemLabelKind.SEVERITY) {
+				called++;
+			}
+		});
+
+		item1.updateSeverity(Severity.Error);
+
+		called = 0;
+		item1.onDidLabelChange(e => {
+			if (e.kind === NotificationViewItemLabelKind.ACTIONS) {
+				called++;
+			}
+		});
+
+		item1.updateActions({ primary: [new Action('id2', 'label')] });
+
+		assert.equal(called, 1);
+
+		called = 0;
+		item1.onDidDispose(() => {
+			called++;
+		});
+
+		item1.dispose();
+		assert.equal(called, 1);
+
+		// Error with Action
+		let item6 = NotificationViewItem.create({ severity: Severity.Error, message: create('Hello Error', { actions: [new Action('id', 'label')] }) });
+		assert.equal(item6.actions.primary.length, 1);
+	});
+
+	test('Model', () => {
+		const model = new NotificationsModel();
+
+		let lastEvent: INotificationChangeEvent;
+		model.onDidNotificationChange(e => {
+			lastEvent = e;
+		});
+
+		let item1: INotification = { severity: Severity.Error, message: 'Error Message', actions: { primary: [new Action('id', 'label')] } };
+		let item2: INotification = { severity: Severity.Warning, message: 'Warning Message', source: 'Some Source' };
+		let item2Duplicate: INotification = { severity: Severity.Warning, message: 'Warning Message', source: 'Some Source' };
+		let item3: INotification = { severity: Severity.Info, message: 'Info Message' };
+
+		let item1Handle = model.notify(item1);
+		assert.equal(lastEvent.item.severity, item1.severity);
+		assert.equal(lastEvent.item.message.value, item1.message);
+		assert.equal(lastEvent.index, 0);
+		assert.equal(lastEvent.kind, NotificationChangeType.ADD);
+
+		let item2Handle = model.notify(item2);
+		assert.equal(lastEvent.item.severity, item2.severity);
+		assert.equal(lastEvent.item.message.value, item2.message);
+		assert.equal(lastEvent.index, 0);
+		assert.equal(lastEvent.kind, NotificationChangeType.ADD);
+
+		model.notify(item3);
+		assert.equal(lastEvent.item.severity, item3.severity);
+		assert.equal(lastEvent.item.message.value, item3.message);
+		assert.equal(lastEvent.index, 0);
+		assert.equal(lastEvent.kind, NotificationChangeType.ADD);
+
+		assert.equal(model.notifications.length, 3);
+
+		let called = 0;
+		item1Handle.onDidDispose(() => {
+			called++;
+		});
+
+		item1Handle.dispose();
+		assert.equal(called, 1);
+		assert.equal(model.notifications.length, 2);
+		assert.equal(lastEvent.item.severity, item1.severity);
+		assert.equal(lastEvent.item.message.value, item1.message);
+		assert.equal(lastEvent.index, 2);
+		assert.equal(lastEvent.kind, NotificationChangeType.REMOVE);
+
+		model.notify(item2Duplicate);
+		assert.equal(model.notifications.length, 2);
+		assert.equal(lastEvent.item.severity, item2Duplicate.severity);
+		assert.equal(lastEvent.item.message.value, item2Duplicate.message);
+		assert.equal(lastEvent.index, 0);
+		assert.equal(lastEvent.kind, NotificationChangeType.ADD);
+
+		item2Handle.dispose();
+		assert.equal(model.notifications.length, 1);
+		assert.equal(lastEvent.item.severity, item2Duplicate.severity);
+		assert.equal(lastEvent.item.message.value, item2Duplicate.message);
+		assert.equal(lastEvent.index, 0);
+		assert.equal(lastEvent.kind, NotificationChangeType.REMOVE);
+
+		model.notifications[0].expand();
+		assert.equal(lastEvent.item.severity, item3.severity);
+		assert.equal(lastEvent.item.message.value, item3.message);
+		assert.equal(lastEvent.index, 0);
+		assert.equal(lastEvent.kind, NotificationChangeType.CHANGE);
+	});
+});
\ No newline at end of file
diff --git a/src/vs/workbench/test/electron-browser/api/extHostConfiguration.test.ts b/src/vs/workbench/test/electron-browser/api/extHostConfiguration.test.ts
index 9449ad6c56a..4377228a0b8 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostConfiguration.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostConfiguration.test.ts
@@ -40,7 +40,7 @@ suite('ExtHostConfiguration', function () {
 			user: new ConfigurationModel(contents),
 			workspace: new ConfigurationModel(),
 			folders: Object.create(null),
-			configurationScopes: []
+			configurationScopes: {}
 		};
 	}
 
@@ -149,7 +149,7 @@ suite('ExtHostConfiguration', function () {
 				}, ['editor.wordWrap']),
 				workspace: new ConfigurationModel({}, []),
 				folders: Object.create(null),
-				configurationScopes: []
+				configurationScopes: {}
 			}
 		);
 
@@ -195,7 +195,7 @@ suite('ExtHostConfiguration', function () {
 				}, ['editor.wordWrap']),
 				workspace,
 				folders,
-				configurationScopes: []
+				configurationScopes: {}
 			}
 		);
 
@@ -269,7 +269,7 @@ suite('ExtHostConfiguration', function () {
 				}, ['editor.wordWrap']),
 				workspace,
 				folders,
-				configurationScopes: []
+				configurationScopes: {}
 			}
 		);
 
diff --git a/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts b/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts
index d50d46f226a..a6b65c6508e 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts
@@ -10,7 +10,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { ExtHostDocuments } from 'vs/workbench/api/node/extHostDocuments';
 import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
 import { TextDocumentSaveReason, TextEdit, Position, EndOfLine } from 'vs/workbench/api/node/extHostTypes';
-import { MainThreadEditorsShape, WorkspaceEditDto } from 'vs/workbench/api/node/extHost.protocol';
+import { MainThreadTextEditorsShape, WorkspaceEditDto } from 'vs/workbench/api/node/extHost.protocol';
 import { ExtHostDocumentSaveParticipant } from 'vs/workbench/api/node/extHostDocumentSaveParticipant';
 import { SingleProxyRPCProtocol } from './testRPCProtocol';
 import { SaveReason } from 'vs/workbench/services/textfile/common/textfiles';
@@ -23,7 +23,7 @@ import { isResourceTextEdit, ResourceTextEdit } from 'vs/editor/common/modes';
 suite('ExtHostDocumentSaveParticipant', () => {
 
 	let resource = URI.parse('foo:bar');
-	let mainThreadEditors = new class extends mock<MainThreadEditorsShape>() { };
+	let mainThreadEditors = new class extends mock<MainThreadTextEditorsShape>() { };
 	let documents: ExtHostDocuments;
 	let nullLogService = new NullLogService();
 	let nullExtensionDescription: IExtensionDescription = {
@@ -264,7 +264,7 @@ suite('ExtHostDocumentSaveParticipant', () => {
 	test('event delivery, pushEdits sync', () => {
 
 		let dto: WorkspaceEditDto;
-		const participant = new ExtHostDocumentSaveParticipant(nullLogService, documents, new class extends mock<MainThreadEditorsShape>() {
+		const participant = new ExtHostDocumentSaveParticipant(nullLogService, documents, new class extends mock<MainThreadTextEditorsShape>() {
 			$tryApplyWorkspaceEdit(_edits: WorkspaceEditDto) {
 				dto = _edits;
 				return TPromise.as(true);
@@ -288,7 +288,7 @@ suite('ExtHostDocumentSaveParticipant', () => {
 	test('event delivery, concurrent change', () => {
 
 		let edits: WorkspaceEditDto;
-		const participant = new ExtHostDocumentSaveParticipant(nullLogService, documents, new class extends mock<MainThreadEditorsShape>() {
+		const participant = new ExtHostDocumentSaveParticipant(nullLogService, documents, new class extends mock<MainThreadTextEditorsShape>() {
 			$tryApplyWorkspaceEdit(_edits: WorkspaceEditDto) {
 				edits = _edits;
 				return TPromise.as(true);
@@ -322,7 +322,7 @@ suite('ExtHostDocumentSaveParticipant', () => {
 
 	test('event delivery, two listeners -> two document states', () => {
 
-		const participant = new ExtHostDocumentSaveParticipant(nullLogService, documents, new class extends mock<MainThreadEditorsShape>() {
+		const participant = new ExtHostDocumentSaveParticipant(nullLogService, documents, new class extends mock<MainThreadTextEditorsShape>() {
 			$tryApplyWorkspaceEdit(dto: WorkspaceEditDto) {
 
 				for (const edit of dto.edits) {
diff --git a/src/vs/workbench/test/electron-browser/api/extHostMessagerService.test.ts b/src/vs/workbench/test/electron-browser/api/extHostMessagerService.test.ts
index 8b5142d85ee..428d21ddcaf 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostMessagerService.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostMessagerService.test.ts
@@ -6,10 +6,11 @@
 'use strict';
 
 import * as assert from 'assert';
-import { Action } from 'vs/base/common/actions';
 import { MainThreadMessageService } from 'vs/workbench/api/electron-browser/mainThreadMessageService';
-import { TPromise as Promise } from 'vs/base/common/winjs.base';
-import { IMessageService, IChoiceService } from 'vs/platform/message/common/message';
+import { TPromise as Promise, TPromise } from 'vs/base/common/winjs.base';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
+import { INotificationService, INotification, NoOpNotification, INotificationHandle } from 'vs/platform/notification/common/notification';
+import { ICommandService } from 'vs/platform/commands/common/commands';
 
 const emptyChoiceService = new class implements IChoiceService {
 	_serviceBrand: 'choiceService';
@@ -18,87 +19,70 @@ const emptyChoiceService = new class implements IChoiceService {
 	}
 };
 
-
-const emptyMesssageService = new class implements IMessageService {
-	_serviceBrand: 'messageService';
-	show(...args: any[]): never {
-		throw new Error('not implemented');
-	}
-	hideAll(): void {
-		throw new Error('not implemented.');
-	}
-	confirm(confirmation): never {
-		throw new Error('not implemented.');
-	}
-	confirmWithCheckbox(confirmation): never {
-		throw new Error('not implemented.');
+const emptyCommandService: ICommandService = {
+	_serviceBrand: undefined,
+	onWillExecuteCommand: () => ({ dispose: () => { } }),
+	executeCommand: (commandId: string, ...args: any[]): TPromise<any> => {
+		return TPromise.as(void 0);
 	}
 };
 
+const emptyNotificationService = new class implements INotificationService {
+	_serviceBrand: 'notificiationService';
+	notify(...args: any[]): never {
+		throw new Error('not implemented');
+	}
+	info(...args: any[]): never {
+		throw new Error('not implemented');
+	}
+	warn(...args: any[]): never {
+		throw new Error('not implemented');
+	}
+	error(...args: any[]): never {
+		throw new Error('not implemented');
+	}
+};
+
+class EmptyNotificationService implements INotificationService {
+
+	_serviceBrand: any;
+
+	constructor(private withNotify: (notification: INotification) => void) {
+	}
+
+	notify(notification: INotification): INotificationHandle {
+		this.withNotify(notification);
+
+		return new NoOpNotification();
+	}
+	info(message: any): void {
+		throw new Error('Method not implemented.');
+	}
+	warn(message: any): void {
+		throw new Error('Method not implemented.');
+	}
+	error(message: any): void {
+		throw new Error('Method not implemented.');
+	}
+}
+
 suite('ExtHostMessageService', function () {
 
 	test('propagte handle on select', function () {
 
-		let service = new MainThreadMessageService(null, {
-			show(sev: number, m: { actions: Action[] }) {
-				assert.equal(m.actions.length, 1);
-				setImmediate(() => m.actions[0].run());
-				return () => { };
-			}
-		} as IMessageService, emptyChoiceService);
+		let service = new MainThreadMessageService(null, new EmptyNotificationService(notification => {
+			assert.equal(notification.actions.primary.length, 1);
+			setImmediate(() => notification.actions.primary[0].run());
+		}), emptyCommandService, emptyChoiceService);
 
 		return service.$showMessage(1, 'h', {}, [{ handle: 42, title: 'a thing', isCloseAffordance: true }]).then(handle => {
 			assert.equal(handle, 42);
 		});
 	});
 
-	test('isCloseAffordance', function () {
-
-		let actions: Action[];
-		let service = new MainThreadMessageService(null, {
-			show(sev: number, m: { actions: Action[] }) {
-				actions = m.actions;
-			}
-		} as IMessageService, emptyChoiceService);
-
-		// default close action
-		service.$showMessage(1, '', {}, [{ title: 'a thing', isCloseAffordance: false, handle: 0 }]);
-		assert.equal(actions.length, 2);
-		let [first, second] = actions;
-		assert.equal(first.label, 'a thing');
-		assert.equal(second.label, 'Close');
-
-		// override close action
-		service.$showMessage(1, '', {}, [{ title: 'a thing', isCloseAffordance: true, handle: 0 }]);
-		assert.equal(actions.length, 1);
-		first = actions[0];
-		assert.equal(first.label, 'a thing');
-	});
-
-	test('hide on select', function () {
-
-		let actions: Action[];
-		let c: number;
-		let service = new MainThreadMessageService(null, {
-			show(sev: number, m: { actions: Action[] }) {
-				c = 0;
-				actions = m.actions;
-				return () => {
-					c += 1;
-				};
-			}
-		} as IMessageService, emptyChoiceService);
-
-		service.$showMessage(1, '', {}, [{ title: 'a thing', isCloseAffordance: true, handle: 0 }]);
-		assert.equal(actions.length, 1);
-
-		actions[0].run();
-		assert.equal(c, 1);
-	});
-
 	suite('modal', () => {
 		test('calls choice service', () => {
-			const service = new MainThreadMessageService(null, emptyMesssageService, {
+			const service = new MainThreadMessageService(null, emptyNotificationService, emptyCommandService, {
 				choose(severity, message, options, modal) {
 					assert.equal(severity, 1);
 					assert.equal(message, 'h');
@@ -114,7 +98,7 @@ suite('ExtHostMessageService', function () {
 		});
 
 		test('returns undefined when cancelled', () => {
-			const service = new MainThreadMessageService(null, emptyMesssageService, {
+			const service = new MainThreadMessageService(null, emptyNotificationService, emptyCommandService, {
 				choose(severity, message, options, modal) {
 					return Promise.as(1);
 				}
@@ -126,7 +110,7 @@ suite('ExtHostMessageService', function () {
 		});
 
 		test('hides Cancel button when not needed', () => {
-			const service = new MainThreadMessageService(null, emptyMesssageService, {
+			const service = new MainThreadMessageService(null, emptyNotificationService, emptyCommandService, {
 				choose(severity, message, options, modal) {
 					assert.equal(options.length, 1);
 					return Promise.as(0);
diff --git a/src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts b/src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts
index 48d6e46c0c7..4ab480bbaff 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts
@@ -8,7 +8,7 @@ import * as assert from 'assert';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { TextEditorLineNumbersStyle } from 'vs/workbench/api/node/extHostTypes';
 import { TextEditorCursorStyle } from 'vs/editor/common/config/editorOptions';
-import { MainThreadEditorsShape, IResolvedTextEditorConfiguration, ITextEditorConfigurationUpdate } from 'vs/workbench/api/node/extHost.protocol';
+import { MainThreadTextEditorsShape, IResolvedTextEditorConfiguration, ITextEditorConfigurationUpdate } from 'vs/workbench/api/node/extHost.protocol';
 import { ExtHostTextEditorOptions, ExtHostTextEditor } from 'vs/workbench/api/node/extHostTextEditor';
 import { ExtHostDocumentData } from 'vs/workbench/api/node/extHostDocumentData';
 import URI from 'vs/base/common/uri';
@@ -48,7 +48,7 @@ suite('ExtHostTextEditorOptions', () => {
 
 	setup(() => {
 		calls = [];
-		let mockProxy: MainThreadEditorsShape = {
+		let mockProxy: MainThreadTextEditorsShape = {
 			dispose: undefined,
 			$trySetOptions: (id: string, options: ITextEditorConfigurationUpdate) => {
 				assert.equal(id, '1');
diff --git a/src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts b/src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts
index 41663d277ef..8f6d051243b 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts
@@ -7,7 +7,7 @@
 import * as assert from 'assert';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as extHostTypes from 'vs/workbench/api/node/extHostTypes';
-import { MainContext, MainThreadEditorsShape, WorkspaceEditDto } from 'vs/workbench/api/node/extHost.protocol';
+import { MainContext, MainThreadTextEditorsShape, WorkspaceEditDto } from 'vs/workbench/api/node/extHost.protocol';
 import URI from 'vs/base/common/uri';
 import { mock } from 'vs/workbench/test/electron-browser/api/mock';
 import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
@@ -25,7 +25,7 @@ suite('ExtHostTextEditors.applyWorkspaceEdit', () => {
 		workspaceResourceEdits = null;
 
 		let rpcProtocol = new TestRPCProtocol();
-		rpcProtocol.set(MainContext.MainThreadEditors, new class extends mock<MainThreadEditorsShape>() {
+		rpcProtocol.set(MainContext.MainThreadTextEditors, new class extends mock<MainThreadTextEditorsShape>() {
 			$tryApplyWorkspaceEdit(_workspaceResourceEdits: WorkspaceEditDto): TPromise<boolean> {
 				workspaceResourceEdits = _workspaceResourceEdits;
 				return TPromise.as(true);
diff --git a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts b/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
index 38e3479a08e..63ea913af41 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
@@ -163,6 +163,7 @@ suite('ExtHostTreeView', function () {
 				assert.deepEqual(removeUnsetKeys(actuals['0/0:b']), {
 					handle: '0/0:b',
 					label: 'b',
+					collapsibleState: TreeItemCollapsibleState.Collapsed
 				});
 				c(null);
 			});
@@ -176,7 +177,8 @@ suite('ExtHostTreeView', function () {
 			assert.deepEqual(removeUnsetKeys(actuals['0/0:b/0:bb']), {
 				handle: '0/0:b/0:bb',
 				parentHandle: '0/0:b',
-				label: 'bb'
+				label: 'bb',
+				collapsibleState: TreeItemCollapsibleState.None
 			});
 			done();
 		});
@@ -189,11 +191,13 @@ suite('ExtHostTreeView', function () {
 			assert.deepEqual(removeUnsetKeys(actuals['0/0:b']), {
 				handle: '0/0:b',
 				label: 'b',
+				collapsibleState: TreeItemCollapsibleState.Collapsed
 			});
 			assert.deepEqual(removeUnsetKeys(actuals['0/0:a/0:aa']), {
 				handle: '0/0:a/0:aa',
 				parentHandle: '0/0:a',
 				label: 'aa',
+				collapsibleState: TreeItemCollapsibleState.None
 			});
 			done();
 		});
@@ -208,11 +212,13 @@ suite('ExtHostTreeView', function () {
 			assert.deepEqual(removeUnsetKeys(actuals['0/0:b']), {
 				handle: '0/0:b',
 				label: 'b',
+				collapsibleState: TreeItemCollapsibleState.Collapsed
 			});
 			assert.deepEqual(removeUnsetKeys(actuals['0/0:a/0:aa']), {
 				handle: '0/0:a/0:aa',
 				parentHandle: '0/0:a',
 				label: 'aa',
+				collapsibleState: TreeItemCollapsibleState.None
 			});
 			done();
 		});
@@ -228,6 +234,7 @@ suite('ExtHostTreeView', function () {
 			assert.deepEqual(removeUnsetKeys(actuals['0/0:a']), {
 				handle: '0/0:aa',
 				label: 'aa',
+				collapsibleState: TreeItemCollapsibleState.Collapsed
 			});
 			done();
 		});
@@ -403,12 +410,7 @@ suite('ExtHostTreeView', function () {
 		}
 		let treeElement = getTreeElement(key);
 		if (treeElement) {
-			const children = Object.keys(treeElement);
-			const collapsibleStateIndex = children.indexOf('collapsibleState');
-			if (collapsibleStateIndex !== -1) {
-				children.splice(collapsibleStateIndex, 1);
-			}
-			return children;
+			return Object.keys(treeElement);
 		}
 		return [];
 	}
@@ -417,7 +419,7 @@ suite('ExtHostTreeView', function () {
 		const treeElement = getTreeElement(key);
 		return {
 			label: labels[key] || key,
-			collapsibleState: treeElement ? treeElement['collapsibleState'] : TreeItemCollapsibleState.Collapsed
+			collapsibleState: treeElement && Object.keys(treeElement).length ? TreeItemCollapsibleState.Collapsed : TreeItemCollapsibleState.None
 		};
 	}
 
diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts
index 03ad3ac7926..cc6327963d0 100644
--- a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts
@@ -17,7 +17,7 @@ import { ExtHostDocumentsAndEditorsShape, ExtHostContext, ExtHostDocumentsShape
 import { mock } from 'vs/workbench/test/electron-browser/api/mock';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import Event from 'vs/base/common/event';
-import { MainThreadEditors } from 'vs/workbench/api/electron-browser/mainThreadEditors';
+import { MainThreadTextEditors } from 'vs/workbench/api/electron-browser/mainThreadEditors';
 import URI from 'vs/base/common/uri';
 import { Range } from 'vs/editor/common/core/range';
 import { Position } from 'vs/editor/common/core/position';
@@ -33,7 +33,7 @@ suite('MainThreadEditors', () => {
 	const resource = URI.parse('foo:bar');
 
 	let modelService: IModelService;
-	let editors: MainThreadEditors;
+	let editors: MainThreadTextEditors;
 
 	const movedResources = new Map<URI, URI>();
 	const createdResources = new Set<URI>();
@@ -103,7 +103,7 @@ suite('MainThreadEditors', () => {
 			editorGroupService,
 		);
 
-		editors = new MainThreadEditors(
+		editors = new MainThreadTextEditors(
 			documentAndEditor,
 			SingleProxyRPCProtocol(null),
 			codeEditorService,
diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts
index 0910cc68b03..67cdf00b9bb 100644
--- a/src/vs/workbench/test/workbenchTestServices.ts
+++ b/src/vs/workbench/test/workbenchTestServices.ts
@@ -25,7 +25,6 @@ import { TextModelResolverService } from 'vs/workbench/services/textmodelResolve
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { IEditorInput, IEditorOptions, Position, IEditor, IResourceInput } from 'vs/platform/editor/common/editor';
 import { IUntitledEditorService, UntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
-import { IMessageService, IConfirmation, IConfirmationResult, IChoiceService } from 'vs/platform/message/common/message';
 import { IWorkspaceContextService, IWorkspace as IWorkbenchWorkspace, WorkbenchState, IWorkspaceFolder, IWorkspaceFoldersChangeEvent } from 'vs/platform/workspace/common/workspace';
 import { ILifecycleService, ShutdownEvent, ShutdownReason, StartupKind, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { EditorStacksModel } from 'vs/workbench/common/editor/editorStacksModel';
@@ -63,6 +62,8 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
 import { ITextBufferFactory, DefaultEndOfLine, EndOfLinePreference } from 'vs/editor/common/model';
 import { Range } from 'vs/editor/common/core/range';
+import { IChoiceService, IConfirmation, IConfirmationResult, IConfirmationService } from 'vs/platform/dialogs/common/dialogs';
+import { INotificationService, INotificationHandle, INotification, NoOpNotification } from 'vs/platform/notification/common/notification';
 
 export function createFileInput(instantiationService: IInstantiationService, resource: URI): FileEditorInput {
 	return instantiationService.createInstance(FileEditorInput, resource, void 0);
@@ -176,14 +177,14 @@ export class TestTextFileService extends TextFileService {
 		@IFileService fileService: IFileService,
 		@IUntitledEditorService untitledEditorService: IUntitledEditorService,
 		@IInstantiationService instantiationService: IInstantiationService,
-		@IMessageService messageService: IMessageService,
+		@INotificationService notificationService: INotificationService,
 		@IBackupFileService backupFileService: IBackupFileService,
 		@IWindowsService windowsService: IWindowsService,
 		@IHistoryService historyService: IHistoryService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IModelService modelService: IModelService
 	) {
-		super(lifecycleService, contextService, configurationService, fileService, untitledEditorService, instantiationService, messageService, TestEnvironmentService, backupFileService, windowsService, historyService, contextKeyService, modelService);
+		super(lifecycleService, contextService, configurationService, fileService, untitledEditorService, instantiationService, notificationService, TestEnvironmentService, backupFileService, windowsService, historyService, contextKeyService, modelService);
 	}
 
 	public setPromptPath(path: string): void {
@@ -254,7 +255,7 @@ export function workbenchInstantiationService(): IInstantiationService {
 	instantiationService.stub(IFileService, new TestFileService());
 	instantiationService.stub(IBackupFileService, new TestBackupFileService());
 	instantiationService.stub(ITelemetryService, NullTelemetryService);
-	instantiationService.stub(IMessageService, new TestMessageService());
+	instantiationService.stub(INotificationService, new TestNotificationService());
 	instantiationService.stub(IUntitledEditorService, instantiationService.createInstance(UntitledEditorService));
 	instantiationService.stub(IWindowsService, new TestWindowsService());
 	instantiationService.stub(ITextFileService, <ITextFileService>instantiationService.createInstance(TestTextFileService));
@@ -309,29 +310,32 @@ export class TestHistoryService implements IHistoryService {
 	}
 }
 
-export class TestMessageService implements IMessageService {
+export class TestNotificationService implements INotificationService {
 
 	public _serviceBrand: any;
 
-	private counter: number;
+	private static readonly NO_OP: INotificationHandle = new NoOpNotification();
 
-	constructor() {
-		this.counter = 0;
+	public info(message: string): INotificationHandle {
+		return this.notify({ severity: Severity.Info, message });
 	}
 
-	public show(sev: Severity, message: any): () => void {
-		this.counter++;
-
-		return null;
+	public warn(message: string): INotificationHandle {
+		return this.notify({ severity: Severity.Warning, message });
 	}
 
-	public getCounter() {
-		return this.counter;
+	public error(error: string | Error): INotificationHandle {
+		return this.notify({ severity: Severity.Error, message: error });
 	}
 
-	public hideAll(): void {
-		// No-op
+	public notify(notification: INotification): INotificationHandle {
+		return TestNotificationService.NO_OP;
 	}
+}
+
+export class TestConfirmationService implements IConfirmationService {
+
+	public _serviceBrand: any;
 
 	public confirm(confirmation: IConfirmation): TPromise<boolean> {
 		return TPromise.wrap(false);
@@ -429,6 +433,10 @@ export class TestPartService implements IPartService {
 
 	public toggleZenMode(): void { }
 
+	public isEditorLayoutCentered(): boolean { return false; }
+	public toggleCenteredEditorLayout(): void { }
+
+
 	public resizePart(part: Parts, sizeChange: number): void { }
 }
 
diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts
index e0e2837dfc8..f482d74a723 100644
--- a/src/vs/workbench/workbench.main.ts
+++ b/src/vs/workbench/workbench.main.ts
@@ -31,6 +31,7 @@ import 'vs/workbench/browser/actions/toggleSidebarVisibility';
 import 'vs/workbench/browser/actions/toggleSidebarPosition';
 import 'vs/workbench/browser/actions/toggleEditorLayout';
 import 'vs/workbench/browser/actions/toggleZenMode';
+import 'vs/workbench/browser/actions/toggleCenteredLayout';
 import 'vs/workbench/browser/actions/toggleTabsVisibility';
 import 'vs/workbench/parts/preferences/electron-browser/preferences.contribution';
 import 'vs/workbench/parts/preferences/browser/keybindingsEditorContribution';
diff --git a/yarn.lock b/yarn.lock
index 416ceab8be1..d8c1242ae5b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6001,9 +6001,9 @@ vscode-nls-dev@3.0.7:
     xml2js "^0.4.19"
     yargs "^10.1.1"
 
-vscode-ripgrep@0.7.1-patch.1.1:
-  version "0.7.1-patch.1.1"
-  resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-0.7.1-patch.1.1.tgz#d5fd19979998ccd040fd54c144c4190135e9e5c2"
+vscode-ripgrep@^0.7.1-patch.1.5:
+  version "0.7.1-patch.1.5"
+  resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-0.7.1-patch.1.5.tgz#a1f1b037709de087533b003b13cb526bb39be876"
 
 vscode-textmate@^3.2.0:
   version "3.2.0"
@@ -6012,9 +6012,9 @@ vscode-textmate@^3.2.0:
     fast-plist "^0.1.2"
     oniguruma "^6.0.1"
 
-vscode-xterm@3.2.0-beta1:
-  version "3.2.0-beta1"
-  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.2.0-beta1.tgz#31ef2abaad87dd654cc538780d450a399e687469"
+vscode-xterm@3.2.0-beta3:
+  version "3.2.0-beta3"
+  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.2.0-beta3.tgz#f82a54dd56f33b8875b68651cdcdd950317c8fb4"
 
 vso-node-api@^6.1.2-preview:
   version "6.1.2-preview"