diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 2043e48c7aa..a0435cb1d3e 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -1,9 +1,9 @@
 ---
 name: Question
-about: The issue tracker is not for questions. Please ask questions on https://stackoverflow.com/questions/tagged/vscode.
+about: The issue tracker is not for questions. Please ask questions on https://stackoverflow.com/questions/tagged/visual-studio-code.
 
 ---
 
 🚨 The issue tracker is not for questions 🚨
 
-If you have a question, please ask it on https://stackoverflow.com/questions/tagged/vscode.
+If you have a question, please ask it on https://stackoverflow.com/questions/tagged/visual-studio-code.
diff --git a/.github/classifier.yml b/.github/classifier.yml
index af9e2f84e41..c1c067e5c53 100644
--- a/.github/classifier.yml
+++ b/.github/classifier.yml
@@ -1,43 +1,69 @@
 {
     perform: true,
     alwaysRequireAssignee: false,
-    labelsRequiringAssignee: [ feature-request ],
+    labelsRequiringAssignee: [],
     autoAssignees: {
+        L10N: [],
+        VIM: [],
         api: {
             assignees: [ jrieken ],
             assignLabel: false
         },
-        color-picker: [],
-        css-less-sass: [ aeschli ],
+        cli: [],
+        color-palette: [],
+        config: [],
+        css-less-scss: [ aeschli ],
+        debug-console: [],
         debug: {
             assignees: [ weinand ],
             assignLabel: false
         },
         diff-editor: [],
+        dropdown: [],
         editor: [],
         editor-1000-limit: [],
         editor-autoclosing: [],
         editor-autoindent: [],
         editor-brackets: [],
         editor-clipboard: [],
+        editor-code-actions: [],
+        editor-code-lens: [],
+        editor-color-picker: [],
+        editor-colors: [],
         editor-columnselect: [],
+        editor-commands: [],
         editor-contrib: [],
-        editor-core: [],
-        editor-find-widget: [],
+        editor-drag-and-drop: [],
+        editor-find: [],
         editor-folding: [],
+        editor-hover: [],
         editor-ime: [],
         editor-input: [],
+        editor-ligatures: [],
+        editor-links: [],
         editor-minimap: [],
         editor-multicursor: [],
+        editor-parameter-hints: [],
+        editor-rendering: [],
         editor-smooth: [],
+        editor-symbols: [],
+        editor-textbuffer: [],
         editor-wrapping: [],
         emmet: [ ramya-rao-a ],
         error-list: [],
+        explorer-custom: [],
+        extension-host: [],
         extensions: [],
+        file-decorations: [],
         file-encoding: {
             assignees: [],
             assignLabel: false
         },
+        file-explorer: {
+            assignees: [ isidorn ],
+            assignLabel: false
+        },
+        file-glob: [],
         file-io: {
             assignees: [],
             assignLabel: false
@@ -46,45 +72,73 @@
             assignees: [],
             assignLabel: false
         },
-        file-explorer: {
-            assignees: [ isidorn ],
-            assignLabel: false
-        },
-        format: [],
+        formatting: [],
         git: [ joaomoreno ],
+        grammar: [],
         hot-exit: [ Tyriar ],
         html: [ aeschli ],
-        i18n: [],
         install-update: [],
         integrated-terminal: [ Tyriar ],
+        integration-test: [],
+        intellisense-config: [],
+        issue-reporter: [ RMacfarlane ],
         javascript: [ mjbvz ],
         json: [],
-        keybindings: [],
         keyboard-layout: [],
+        keybindings: [],
+        keybindings-editor: [],
+        lang-diagnostics: [],
         languages basic: [],
+        list: [],
+        log: [],
         markdown: [ mjbvz ],
+        marketplace: [],
+        menus: [],
         merge-conflict: [ chrmarti ],
         multi-root: {
             assignees: [],
             assignLabel: false
         },
+        os-integration: [],
+        outline: [],
+        output: [],
         perf-profile: [],
+        perf-bloat: [],
+        perf-startup: [],
         php: [ roblourens ],
         proxy: [],
+        quick-pick: [ chrmarti ],
+        release-notes: [],
         remote: {
             assignees: [ jrieken ],
             assignLabel: false
         },
+        rename: [],
+        run-as-admin: [],
+        samples: [],
         scm: [],
         search: [ roblourens ],
+        search-replace: [],
+        settings-editor: [],
+        shared-process: [],
+        smart-select: [],
+        smoke-test: [],
         snippets: {
             assignees: [ jrieken ],
             assignLabel: false
         },
+        suggest: [],
         tasks: [ dbaeumer ],
         telemetry: [],
         themes: [],
+        tokenization: [],
+        tree: [],
         typescript: [ mjbvz ],
+        unit-test: [],
+        uri: [],
+        ux: [],
+        vscode-build: [],
+        webview: [],
         workbench: {
             assignees: [],
             assignLabel: false
@@ -109,6 +163,10 @@
             assignees: [],
             assignLabel: false
         },
+        workbench-grid: {
+            assignees: [],
+            assignLabel: false
+        },
         workbench-history: {
             assignees: [],
             assignLabel: false
@@ -145,6 +203,10 @@
             assignees: [],
             assignLabel: false
         },
+        workbench-views: {
+            assignees: [],
+            assignLabel: false
+        },
         workbench-welcome: [ chrmarti ]
     }
 }
diff --git a/build/builtInExtensions.json b/build/builtInExtensions.json
index ad7d8680ade..2d53c46e935 100644
--- a/build/builtInExtensions.json
+++ b/build/builtInExtensions.json
@@ -1,12 +1,12 @@
 [
 	{
 		"name": "ms-vscode.node-debug",
-		"version": "1.25.3",
+		"version": "1.26.0",
 		"repo": "https://github.com/Microsoft/vscode-node-debug"
 	},
 	{
 		"name": "ms-vscode.node-debug2",
-		"version": "1.25.4",
+		"version": "1.26.0",
 		"repo": "https://github.com/Microsoft/vscode-node-debug2"
 	}
 ]
diff --git a/build/gulpfile.hygiene.js b/build/gulpfile.hygiene.js
index a84e78dece1..6a4cd05d17f 100644
--- a/build/gulpfile.hygiene.js
+++ b/build/gulpfile.hygiene.js
@@ -82,6 +82,7 @@ const indentationFilter = [
 	'!build/{lib,tslintRules}/**/*.js',
 	'!build/**/*.sh',
 	'!build/tfs/**/*.js',
+	'!build/tfs/**/*.config',
 	'!**/Dockerfile',
 	'!extensions/markdown-language-features/media/*.js'
 ];
@@ -104,6 +105,7 @@ const copyrightFilter = [
 	'!**/*.code-workspace',
 	'!build/**/*.init',
 	'!resources/linux/snap/snapcraft.yaml',
+	'!resources/linux/snap/electron-launch',
 	'!resources/win32/bin/code.js',
 	'!extensions/markdown-language-features/media/highlight.css',
 	'!extensions/html-language-features/server/src/modes/typescript/*',
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 47f243676b5..526e5e56f5a 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -71,7 +71,7 @@ const vscodeResources = [
 	'out-build/paths.js',
 	'out-build/vs/**/*.{svg,png,cur,html}',
 	'out-build/vs/base/common/performance.js',
-	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh, cpuUsage.sh}',
+	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh}',
 	'out-build/vs/base/browser/ui/octiconLabel/octicons/**',
 	'out-build/vs/workbench/browser/media/*-theme.css',
 	'out-build/vs/workbench/electron-browser/bootstrap/**',
@@ -265,10 +265,17 @@ function packageTask(platform, arch, opts) {
 		const packageJsonStream = gulp.src(['package.json'], { base: '.' })
 			.pipe(json({ name, version }));
 
-		const settingsSearchBuildId = getSettingsSearchBuildId(packageJson);
 		const date = new Date().toISOString();
+		const productJsonUpdate = { commit, date, checksums };
+
+		try {
+			productJsonUpdate.settingsSearchBuildId = getSettingsSearchBuildId(packageJson);
+		} catch (err) {
+			console.warn(err);
+		}
+
 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
-			.pipe(json({ commit, date, checksums, settingsSearchBuildId }));
+			.pipe(json(productJsonUpdate));
 
 		const license = gulp.src(['LICENSES.chromium.html', 'LICENSE.txt', 'ThirdPartyNotices.txt', 'licenses/**'], { base: '.' });
 
@@ -508,6 +515,10 @@ gulp.task('generate-vscode-configuration', () => {
 			return reject(new Error('$AGENT_BUILDDIRECTORY not set'));
 		}
 
+		if (process.env.VSCODE_QUALITY !== 'insider' && process.env.VSCODE_QUALITY !== 'stable') {
+			return resolve();
+		}
+
 		const userDataDir = path.join(os.tmpdir(), 'tmpuserdata');
 		const extensionsDir = path.join(os.tmpdir(), 'tmpextdir');
 		const appName = process.env.VSCODE_QUALITY === 'insider' ? 'Visual\\ Studio\\ Code\\ -\\ Insiders.app' : 'Visual\\ Studio\\ Code.app';
diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
index 49595d5f078..a4268e7ce34 100644
--- a/build/gulpfile.vscode.win32.js
+++ b/build/gulpfile.vscode.win32.js
@@ -26,6 +26,7 @@ const zipPath = arch => path.join(zipDir(arch), `VSCode-win32-${arch}.zip`);
 const setupDir = (arch, target) => path.join(repoPath, '.build', `win32-${arch}`, `${target}-setup`);
 const issPath = path.join(__dirname, 'win32', 'code.iss');
 const innoSetupPath = path.join(path.dirname(path.dirname(require.resolve('innosetup-compiler'))), 'bin', 'ISCC.exe');
+const signPS1 = path.join(repoPath, 'build', 'tfs', 'win32', 'sign.ps1');
 
 function packageInnoSetup(iss, options, cb) {
 	options = options || {};
@@ -42,7 +43,11 @@ function packageInnoSetup(iss, options, cb) {
 	keys.forEach(key => assert(typeof definitions[key] === 'string', `Missing value for '${key}' in Inno Setup package step`));
 
 	const defs = keys.map(key => `/d${key}=${definitions[key]}`);
-	const args = [iss].concat(defs);
+	const args = [
+		iss,
+		...defs,
+		`/sesrp=powershell.exe -ExecutionPolicy bypass ${signPS1} $f`
+	];
 
 	cp.spawn(innoSetupPath, args, { stdio: ['ignore', 'inherit', 'inherit'] })
 		.on('error', cb)
@@ -74,14 +79,15 @@ function buildWin32Setup(arch, target) {
 			DirName: product.win32DirName,
 			Version: pkg.version,
 			RawVersion: pkg.version.replace(/-\w+$/, ''),
-			NameVersion: product.win32NameVersion,
+			NameVersion: product.win32NameVersion + (target === 'user' ? ' (User)' : ''),
 			ExeBasename: product.nameShort,
 			RegValueName: product.win32RegValueName,
 			ShellNameShort: product.win32ShellNameShort,
 			AppMutex: product.win32MutexName,
 			Arch: arch,
 			AppId: arch === 'ia32' ? ia32AppId : x64AppId,
-			IncompatibleAppId: arch === 'ia32' ? x64AppId : ia32AppId,
+			IncompatibleTargetAppId: arch === 'ia32' ? product.win32AppId : product.win32x64AppId,
+			IncompatibleArchAppId: arch === 'ia32' ? x64AppId : ia32AppId,
 			AppUserId: product.win32AppUserModelId,
 			ArchitecturesAllowed: arch === 'ia32' ? '' : 'x64',
 			ArchitecturesInstallIn64BitMode: arch === 'ia32' ? '' : 'x64',
@@ -108,7 +114,7 @@ defineWin32SetupTasks('x64', 'user');
 
 function archiveWin32Setup(arch) {
 	return cb => {
-		const args = ['a', '-tzip', zipPath(arch), '.', '-r'];
+		const args = ['a', '-tzip', zipPath(arch), '-x!CodeSignSummary*.md', '.', '-r'];
 
 		cp.spawn(_7z, args, { stdio: 'inherit', cwd: buildPath(arch) })
 			.on('error', cb)
diff --git a/build/lib/i18n.resources.json b/build/lib/i18n.resources.json
index 87da5e9bb0d..81fda4c4e9e 100644
--- a/build/lib/i18n.resources.json
+++ b/build/lib/i18n.resources.json
@@ -78,6 +78,10 @@
 			"name": "vs/workbench/parts/logs",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/parts/navigation",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/parts/output",
 			"project": "vscode-workbench"
diff --git a/build/tfs/product-build.yml b/build/tfs/product-build.yml
index dec69a68a11..e0ac588a85a 100644
--- a/build/tfs/product-build.yml
+++ b/build/tfs/product-build.yml
@@ -125,91 +125,29 @@ phases:
         ]
       SessionTimeout: 120
 
+  - task: NuGetCommand@2
+    displayName: Install ESRPClient.exe
+    inputs:
+      restoreSolution: 'build\tfs\win32\ESRPClient\packages.config'
+      feedsToUse: config
+      nugetConfigPath: 'build\tfs\win32\ESRPClient\NuGet.config'
+      externalFeedCredentials: 3fc0b7f7-da09-4ae7-a9c8-d69824b1819b
+      restoreDirectory: packages
+
+  - task: ESRPImportCertTask@1
+    displayName: Import ESRP Request Signing Certificate
+    inputs:
+      ESRP: 'ESRP CodeSign'
+
+  - powershell: |
+      $ErrorActionPreference = "Stop"
+      .\build\tfs\win32\import-esrp-auth-cert.ps1 -AuthCertificateBase64 $(ESRP_AUTH_CERTIFICATE) -AuthCertificateKey $(ESRP_AUTH_CERTIFICATE_KEY)
+    displayName: Import ESRP Auth Certificate
+
   - powershell: |
       $ErrorActionPreference = "Stop"
       npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-archive" "vscode-win32-$(VSCODE_ARCH)-system-setup" "vscode-win32-$(VSCODE_ARCH)-user-setup"
 
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-    inputs:
-      ConnectedServiceName: 'ESRP CodeSign'
-      FolderPath: '$(agent.builddirectory)'
-      Pattern: VSCodeSetup.exe
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-          {
-            "keyCode": "CP-229803",
-            "operationSetCode": "SigntoolSign",
-            "parameters": [
-              {
-                "parameterName": "OpusName",
-                "parameterValue": "VS Code"
-              },
-              {
-                "parameterName": "OpusInfo",
-                "parameterValue": "https://code.visualstudio.com/"
-              },
-              {
-                "parameterName": "PageHash",
-                "parameterValue": "/NPH"
-              },
-              {
-                "parameterName": "TimeStamp",
-                "parameterValue": "/t \"http://ts4096.gtm.microsoft.com/TSS/AuthenticodeTS\""
-              }
-            ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          },
-          {
-            "keyCode": "CP-230012",
-            "operationSetCode": "SigntoolSign",
-            "parameters": [
-              {
-                "parameterName": "OpusName",
-                "parameterValue": "VS Code"
-              },
-              {
-                "parameterName": "OpusInfo",
-                "parameterValue": "https://code.visualstudio.com/"
-              },
-              {
-                "parameterName": "Append",
-                "parameterValue": "/as"
-              },
-              {
-                "parameterName": "FileDigest",
-                "parameterValue": "/fd \"SHA256\""
-              },
-              {
-                "parameterName": "PageHash",
-                "parameterValue": "/NPH"
-              },
-              {
-                "parameterName": "TimeStamp",
-                "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-              }
-            ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          },
-          {
-            "keyCode": "CP-230012",
-            "operationSetCode": "SigntoolVerify",
-            "parameters": [
-              {
-                "parameterName": "VerifyAll",
-                "parameterValue": "/all"
-              }
-            ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          }
-        ]
-      SessionTimeout: 120
-
-  - powershell: |
-      $ErrorActionPreference = "Stop"
       $Repo = "$(pwd)"
       $Root = "$Repo\.."
       $SystemExe = "$Repo\.build\win32-$(VSCODE_ARCH)\system-setup\VSCodeSetup.exe"
diff --git a/build/tfs/win32/ESRPClient/NuGet.config b/build/tfs/win32/ESRPClient/NuGet.config
new file mode 100644
index 00000000000..6d6da347fd2
--- /dev/null
+++ b/build/tfs/win32/ESRPClient/NuGet.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <add key="ESRP" value="https://microsoft.pkgs.visualstudio.com/_packaging/ESRP/nuget/v3/index.json" />
+    </packageSources>
+</configuration>
\ No newline at end of file
diff --git a/build/tfs/win32/ESRPClient/packages.config b/build/tfs/win32/ESRPClient/packages.config
new file mode 100644
index 00000000000..d7a6f144f47
--- /dev/null
+++ b/build/tfs/win32/ESRPClient/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="EsrpClient" version="1.0.27" />
+</packages>
diff --git a/build/tfs/win32/import-esrp-auth-cert.ps1 b/build/tfs/win32/import-esrp-auth-cert.ps1
new file mode 100644
index 00000000000..c345c780231
--- /dev/null
+++ b/build/tfs/win32/import-esrp-auth-cert.ps1
@@ -0,0 +1,14 @@
+Param(
+  [string]$AuthCertificateBase64,
+  [string]$AuthCertificateKey
+)
+
+# Import auth certificate
+$AuthCertificateFileName = [System.IO.Path]::GetTempFileName()
+$AuthCertificateBytes = [Convert]::FromBase64String($AuthCertificateBase64)
+[IO.File]::WriteAllBytes($AuthCertificateFileName, $AuthCertificateBytes)
+$AuthCertificate = Import-PfxCertificate -FilePath $AuthCertificateFileName -CertStoreLocation Cert:\LocalMachine\My -Password (ConvertTo-SecureString $AuthCertificateKey -AsPlainText -Force)
+rm $AuthCertificateFileName
+$ESRPAuthCertificateSubjectName = $AuthCertificate.Subject
+
+Write-Output ("##vso[task.setvariable variable=ESRPAuthCertificateSubjectName;]$ESRPAuthCertificateSubjectName")
\ No newline at end of file
diff --git a/build/tfs/win32/sign.ps1 b/build/tfs/win32/sign.ps1
new file mode 100644
index 00000000000..d888a7d104f
--- /dev/null
+++ b/build/tfs/win32/sign.ps1
@@ -0,0 +1,82 @@
+function Create-TmpJson($Obj) {
+	$FileName = [System.IO.Path]::GetTempFileName()
+	ConvertTo-Json -Depth 100 $Obj | Out-File -Encoding UTF8 $FileName
+	return $FileName
+}
+
+$Auth = Create-TmpJson @{
+	Version = "1.0.0"
+	AuthenticationType = "AAD_CERT"
+	ClientId = $env:ESRPClientId
+	AuthCert = @{
+		SubjectName = $env:ESRPAuthCertificateSubjectName
+		StoreLocation = "LocalMachine"
+		StoreName = "My"
+	}
+	RequestSigningCert = @{
+		SubjectName = $env:ESRPCertificateSubjectName
+		StoreLocation = "LocalMachine"
+		StoreName = "My"
+	}
+}
+
+$Policy = Create-TmpJson @{
+	Version = "1.0.0"
+}
+
+$Input = Create-TmpJson @{
+	Version = "1.0.0"
+	SignBatches = @(
+		@{
+			SourceLocationType = "UNC"
+			SignRequestFiles = @(
+				@{
+					SourceLocation = $args[0]
+				}
+			)
+			SigningInfo = @{
+				Operations = @(
+					@{
+						KeyCode = "CP-229803"
+						OperationCode = "SigntoolSign"
+						Parameters = @{
+							OpusName = "VS Code"
+							OpusInfo = "https://code.visualstudio.com/"
+							PageHash = "/NPH"
+							TimeStamp = "/t `"http://ts4096.gtm.microsoft.com/TSS/AuthenticodeTS`""
+						}
+						ToolName = "sign"
+						ToolVersion = "1.0"
+					},
+					@{
+						KeyCode = "CP-230012"
+						OperationCode = "SigntoolSign"
+						Parameters = @{
+							OpusName = "VS Code"
+							OpusInfo = "https://code.visualstudio.com/"
+							Append = "/as"
+							FileDigest = "/fd `"SHA256`""
+							PageHash = "/NPH"
+							TimeStamp = "/tr `"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer`" /td sha256"
+						}
+						ToolName = "sign"
+						ToolVersion = "1.0"
+					},
+					@{
+						KeyCode = "CP-230012"
+						OperationCode = "SigntoolVerify"
+						Parameters = @{
+							VerifyAll = "/all"
+						}
+						ToolName = "sign"
+						ToolVersion = "1.0"
+					}
+				)
+			}
+		}
+	)
+}
+
+$Output = [System.IO.Path]::GetTempFileName()
+$ScriptPath = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
+& "$ScriptPath\ESRPClient\packages\EsrpClient.1.0.27\tools\ESRPClient.exe" Sign -a $Auth -p $Policy -i $Input -o $Output
\ No newline at end of file
diff --git a/build/win32/OSSREADME.json b/build/win32/OSSREADME.json
index 5e1078b9519..6e9bb4b251a 100755
--- a/build/win32/OSSREADME.json
+++ b/build/win32/OSSREADME.json
@@ -545,33 +545,6 @@
 		],
 		"isProd": true
 	},
-	{
-		"name": "retep998/winapi-rs",
-		"version": "0.3.4",
-		"repositoryUrl": "https://github.com/retep998/winapi-rs",
-		"licenseDetail": [
-			"Copyright (c) 2015 The winapi-rs Developers",
-			"",
-			"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."
-		],
-		"isProd": true
-	},
 	{
 		"name": "retep998/winapi-rs",
 		"version": "0.2.8",
@@ -707,6 +680,33 @@
 		],
 		"isProd": true
 	},
+	{
+		"name": "retep998/winapi-rs",
+		"version": "0.3.4",
+		"repositoryUrl": "https://github.com/retep998/winapi-rs",
+		"licenseDetail": [
+			"Copyright (c) 2015 The winapi-rs Developers",
+			"",
+			"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."
+		],
+		"isProd": true
+	},
 	{
 		"name": "rust-lang-nursery/lazy-static.rs",
 		"version": "1.0.0",
@@ -1791,4 +1791,4 @@
 		],
 		"isProd": true
 	}
-]
+]
\ No newline at end of file
diff --git a/build/win32/code.iss b/build/win32/code.iss
index 3126cb76789..cad2e27d65e 100644
--- a/build/win32/code.iss
+++ b/build/win32/code.iss
@@ -32,6 +32,7 @@ VersionInfoVersion={#RawVersion}
 ShowLanguageDialog=auto
 ArchitecturesAllowed={#ArchitecturesAllowed}
 ArchitecturesInstallIn64BitMode={#ArchitecturesInstallIn64BitMode}
+SignTool=esrp
 
 #if "user" == InstallTarget
 DefaultDirName={userpf}\{#DirName}
@@ -91,7 +92,7 @@ Filename: "{app}\{#ExeBasename}.exe"; Description: "{cm:LaunchProgram,{#NameLong
 #if "user" == InstallTarget
 #define SoftwareClassesRootKey "HKCU"
 #else
-#define SoftwareClassesRootKey "HKCR"
+#define SoftwareClassesRootKey "HKLM"
 #endif
 
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ascx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
@@ -945,7 +946,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValu
 #define Uninstall64RootKey "HKCU64"
 #define Uninstall32RootKey "HKCU32"
 #else
-#define EnvironmentRootKey "HKCR"
+#define EnvironmentRootKey "HKLM"
 #define EnvironmentKey "System\CurrentControlSet\Control\Session Manager\Environment"
 #define Uninstall64RootKey "HKLM64"
 #define Uninstall32RootKey "HKLM32"
@@ -963,8 +964,26 @@ var
 begin
   Result := True;
 
-  if IsWin64 then begin
-    RegKey := 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\' + copy('{#IncompatibleAppId}', 2, 38) + '_is1';
+  #if "user" == InstallTarget
+    #if "ia32" == Arch
+      #define IncompatibleArchRootKey "HKLM32"
+    #else
+      #define IncompatibleArchRootKey "HKLM64"
+    #endif
+
+    if not WizardSilent() then begin
+      RegKey := 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\' + copy('{#IncompatibleTargetAppId}', 2, 38) + '_is1';
+
+      if RegKeyExists({#IncompatibleArchRootKey}, RegKey) then begin
+        if MsgBox('{#NameShort} is already installed on this system for all users. Are you sure you want to install it for this user?', mbConfirmation, MB_YESNO) = IDNO then begin
+          Result := false;
+        end;
+      end;
+    end;
+  #endif
+
+  if Result and IsWin64 then begin
+    RegKey := 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\' + copy('{#IncompatibleArchAppId}', 2, 38) + '_is1';
 
     if '{#Arch}' = 'ia32' then begin
       Result := not RegKeyExists({#Uninstall64RootKey}, RegKey);
diff --git a/build/win32/inno_updater.exe b/build/win32/inno_updater.exe
index 6d83b2b748b..d2715b864f5 100755
Binary files a/build/win32/inno_updater.exe and b/build/win32/inno_updater.exe differ
diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json
index e66a313c9f6..f63d8c84087 100644
--- a/extensions/configuration-editing/package.json
+++ b/extensions/configuration-editing/package.json
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "jsonc-parser": "^1.0.0",
-    "vscode-nls": "^3.2.1"
+    "vscode-nls": "^3.2.4"
   },
   "contributes": {
     "languages": [
diff --git a/extensions/configuration-editing/yarn.lock b/extensions/configuration-editing/yarn.lock
index 29d3d43ae80..bcf4ddb12d8 100644
--- a/extensions/configuration-editing/yarn.lock
+++ b/extensions/configuration-editing/yarn.lock
@@ -10,6 +10,6 @@ jsonc-parser@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.0.tgz#ddcc864ae708e60a7a6dd36daea00172fa8d9272"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json
index 9bfc56b2e3f..dc78673bf07 100644
--- a/extensions/css-language-features/package.json
+++ b/extensions/css-language-features/package.json
@@ -709,7 +709,7 @@
   "dependencies": {
     "vscode-languageclient": "^4.1.4",
     "vscode-languageserver-protocol-foldingprovider": "^2.0.1",
-    "vscode-nls": "^3.2.2"
+    "vscode-nls": "^3.2.4"
   },
   "devDependencies": {
     "@types/node": "7.0.43",
diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json
index 661b18831b2..59fb5eefee2 100644
--- a/extensions/css-language-features/server/package.json
+++ b/extensions/css-language-features/server/package.json
@@ -8,7 +8,7 @@
     "node": "*"
   },
   "dependencies": {
-    "vscode-css-languageservice": "^3.0.9-next.18",
+    "vscode-css-languageservice": "^3.0.9-next.20",
     "vscode-languageserver": "^4.1.3",
     "vscode-languageserver-protocol-foldingprovider": "^2.0.1"
   },
diff --git a/extensions/css-language-features/server/yarn.lock b/extensions/css-language-features/server/yarn.lock
index 7003f400a78..dd17147de5b 100644
--- a/extensions/css-language-features/server/yarn.lock
+++ b/extensions/css-language-features/server/yarn.lock
@@ -194,9 +194,9 @@ supports-color@5.4.0:
   dependencies:
     has-flag "^3.0.0"
 
-vscode-css-languageservice@^3.0.9-next.18:
-  version "3.0.9-next.18"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9-next.18.tgz#f8f25123b5a8cdc9f72fafcd2c0088f726322437"
+vscode-css-languageservice@^3.0.9-next.20:
+  version "3.0.9-next.20"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9-next.20.tgz#8229aee66aa877929af5d2fd81a21731b415c92e"
   dependencies:
     vscode-languageserver-types "^3.7.2"
     vscode-nls "^3.2.2"
diff --git a/extensions/css-language-features/yarn.lock b/extensions/css-language-features/yarn.lock
index 840422a34db..ac76cfede80 100644
--- a/extensions/css-language-features/yarn.lock
+++ b/extensions/css-language-features/yarn.lock
@@ -161,9 +161,9 @@ vscode-languageserver-types@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.7.2.tgz#aad8846f8e3e27962648554de5a8417e358f34eb"
 
-vscode-nls@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.2.tgz#3817eca5b985c2393de325197cf4e15eb2aa5350"
+vscode-nls@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
 
 wrappy@1:
   version "1.0.2"
diff --git a/extensions/css/package.json b/extensions/css/package.json
index 9517029a69f..13f737e92fc 100644
--- a/extensions/css/package.json
+++ b/extensions/css/package.json
@@ -8,7 +8,7 @@
     "vscode": "0.10.x"
   },
   "scripts": {
-    "update-grammar": "node ../../build/npm/update-grammar.js atom/language-css grammars/css.cson ./syntaxes/css.tmLanguage.json"
+    "update-grammar": "node ../../build/npm/update-grammar.js octref/language-css grammars/css.cson ./syntaxes/css.tmLanguage.json"
   },
   "contributes": {
     "languages": [
diff --git a/extensions/css/syntaxes/css.tmLanguage.json b/extensions/css/syntaxes/css.tmLanguage.json
index d1be44fc3d9..ec7659719bb 100644
--- a/extensions/css/syntaxes/css.tmLanguage.json
+++ b/extensions/css/syntaxes/css.tmLanguage.json
@@ -1,10 +1,10 @@
 {
 	"information_for_contributors": [
-		"This file has been converted from https://github.com/atom/language-css/blob/master/grammars/css.cson",
+		"This file has been converted from https://github.com/octref/language-css/blob/master/grammars/css.cson",
 		"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-css/commit/17ad55bc5f65c16585e80ea1c7c19e0c0814f6d5",
+	"version": "https://github.com/octref/language-css/commit/ea1d7e3619966e47c57498913a5eabea0cce7538",
 	"name": "CSS",
 	"scopeName": "source.css",
 	"patterns": [
@@ -604,6 +604,45 @@
 							"include": "#string"
 						}
 					]
+				},
+				{
+					"begin": "(?i)(?=@[\\w-]+(\\s|\\(|/\\*|$))",
+					"end": "(?<=})(?!\\G)",
+					"patterns": [
+						{
+							"begin": "(?i)\\G(@)[\\w-]+",
+							"beginCaptures": {
+								"0": {
+									"name": "keyword.control.at-rule.css"
+								},
+								"1": {
+									"name": "punctuation.definition.keyword.css"
+								}
+							},
+							"end": "(?=\\s*[{;])",
+							"name": "meta.at-rule.header.css"
+						},
+						{
+							"begin": "{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.begin.bracket.curly.css"
+								}
+							},
+							"end": "}",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.end.bracket.curly.css"
+								}
+							},
+							"name": "meta.at-rule.body.css",
+							"patterns": [
+								{
+									"include": "$self"
+								}
+							]
+						}
+					]
 				}
 			]
 		},
@@ -1411,7 +1450,7 @@
 					"name": "invalid.illegal.colon.css"
 				}
 			},
-			"match": "(?xi)\n(:)(:*)\n(?: active|any-link|checked|default|disabled|empty|enabled|first\n  | (?:first|last|only)-(?:child|of-type)|focus|focus-within|fullscreen|host|hover\n  | in-range|indeterminate|invalid|left|link|optional|out-of-range\n  | read-only|read-write|required|right|root|scope|target|unresolved\n  | valid|visited\n)(?![\\w-]|\\s*[;}])",
+			"match": "(?xi)\n(:)(:*)\n(?: active|any-link|checked|default|defined|disabled|empty|enabled|first\n  | (?:first|last|only)-(?:child|of-type)|focus|focus-visible|focus-within\n  | fullscreen|host|hover|in-range|indeterminate|invalid|left|link\n  | optional|out-of-range|placeholder-shown|read-only|read-write\n  | required|right|root|scope|target|unresolved\n  | valid|visited\n)(?![\\w-]|\\s*[;}])",
 			"name": "entity.other.attribute-name.pseudo-class.css"
 		},
 		"pseudo-elements": {
diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index 397a5a35a09..406b25c97d2 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -449,6 +449,6 @@
         "image-size": "^0.5.2",
         "vscode-emmet-helper": "^1.2.10",
         "vscode-languageserver-types": "^3.5.0",
-        "vscode-nls": "3.2.1"
+        "vscode-nls": "3.2.4"
     }
 }
diff --git a/extensions/emmet/src/balance.ts b/extensions/emmet/src/balance.ts
index 5e323f29e22..4687b734524 100644
--- a/extensions/emmet/src/balance.ts
+++ b/extensions/emmet/src/balance.ts
@@ -61,7 +61,7 @@ function balance(out: boolean) {
 }
 
 function getRangeToBalanceOut(document: vscode.TextDocument, selection: vscode.Selection, rootNode: HtmlNode): vscode.Selection {
-	let nodeToBalance = getHtmlNode(document, rootNode, selection.start);
+	let nodeToBalance = getHtmlNode(document, rootNode, selection.start, false);
 	if (!nodeToBalance) {
 		return selection;
 	}
diff --git a/extensions/emmet/src/mergeLines.ts b/extensions/emmet/src/mergeLines.ts
index 848966de4d1..cebcea3010f 100644
--- a/extensions/emmet/src/mergeLines.ts
+++ b/extensions/emmet/src/mergeLines.ts
@@ -34,7 +34,7 @@ function getRangesToReplace(document: vscode.TextDocument, selection: vscode.Sel
 	let endNodeToUpdate: Node | null;
 
 	if (selection.isEmpty) {
-		startNodeToUpdate = endNodeToUpdate = getNode(rootNode, selection.start);
+		startNodeToUpdate = endNodeToUpdate = getNode(rootNode, selection.start, true);
 	} else {
 		startNodeToUpdate = getNode(rootNode, selection.start, true);
 		endNodeToUpdate = getNode(rootNode, selection.end, true);
diff --git a/extensions/emmet/src/removeTag.ts b/extensions/emmet/src/removeTag.ts
index 0ea6e4dde96..9209a6d75e8 100644
--- a/extensions/emmet/src/removeTag.ts
+++ b/extensions/emmet/src/removeTag.ts
@@ -38,7 +38,7 @@ export function removeTag() {
 
 function getRangeToRemove(editor: vscode.TextEditor, rootNode: HtmlNode, selection: vscode.Selection, indentInSpaces: string): vscode.Range[] {
 
-	let nodeToUpdate = getHtmlNode(editor.document, rootNode, selection.start);
+	let nodeToUpdate = getHtmlNode(editor.document, rootNode, selection.start, true);
 	if (!nodeToUpdate) {
 		return [];
 	}
diff --git a/extensions/emmet/src/selectItemHTML.ts b/extensions/emmet/src/selectItemHTML.ts
index d5dbbf33d05..6fe1825fd87 100644
--- a/extensions/emmet/src/selectItemHTML.ts
+++ b/extensions/emmet/src/selectItemHTML.ts
@@ -8,7 +8,7 @@ import { getDeepestNode, findNextWord, findPrevWord, getHtmlNode } from './util'
 import { HtmlNode } from 'EmmetNode';
 
 export function nextItemHTML(selectionStart: vscode.Position, selectionEnd: vscode.Position, editor: vscode.TextEditor, rootNode: HtmlNode): vscode.Selection | undefined {
-	let currentNode = getHtmlNode(editor.document, rootNode, selectionEnd);
+	let currentNode = getHtmlNode(editor.document, rootNode, selectionEnd, false);
 	let nextNode: HtmlNode | undefined = undefined;
 
 	if (!currentNode) {
@@ -31,7 +31,7 @@ export function nextItemHTML(selectionStart: vscode.Position, selectionEnd: vsco
 
 		// Get the first child of current node which is right after the cursor and is not a comment
 		nextNode = currentNode.firstChild;
-		while (nextNode && (selectionEnd.isAfterOrEqual(nextNode.start) || nextNode.type === 'comment')) {
+		while (nextNode && (selectionEnd.isAfterOrEqual(nextNode.end) || nextNode.type === 'comment')) {
 			nextNode = nextNode.nextSibling;
 		}
 	}
@@ -54,7 +54,7 @@ export function nextItemHTML(selectionStart: vscode.Position, selectionEnd: vsco
 }
 
 export function prevItemHTML(selectionStart: vscode.Position, selectionEnd: vscode.Position, editor: vscode.TextEditor, rootNode: HtmlNode): vscode.Selection | undefined {
-	let currentNode = getHtmlNode(editor.document, rootNode, selectionStart);
+	let currentNode = getHtmlNode(editor.document, rootNode, selectionStart, false);
 	let prevNode: HtmlNode | undefined = undefined;
 
 	if (!currentNode) {
@@ -63,7 +63,7 @@ export function prevItemHTML(selectionStart: vscode.Position, selectionEnd: vsco
 
 	if (currentNode.type !== 'comment' && selectionStart.translate(0, -1).isAfter(currentNode.open.start)) {
 
-		if (selectionStart.isBefore(currentNode.open.end) || !currentNode.firstChild) {
+		if (selectionStart.isBefore(currentNode.open.end) || !currentNode.firstChild || selectionEnd.isBeforeOrEqual(currentNode.firstChild.start)) {
 			prevNode = currentNode;
 		} else {
 			// Select the child that appears just before the cursor and is not a comment
diff --git a/extensions/emmet/src/selectItemStylesheet.ts b/extensions/emmet/src/selectItemStylesheet.ts
index 3a63a8cb79f..29df659c564 100644
--- a/extensions/emmet/src/selectItemStylesheet.ts
+++ b/extensions/emmet/src/selectItemStylesheet.ts
@@ -51,7 +51,7 @@ export function nextItemStylesheet(startOffset: vscode.Position, endOffset: vsco
 }
 
 export function prevItemStylesheet(startOffset: vscode.Position, endOffset: vscode.Position, editor: vscode.TextEditor, rootNode: CssNode): vscode.Selection | undefined {
-	let currentNode = <CssNode>getNode(rootNode, startOffset);
+	let currentNode = <CssNode>getNode(rootNode, startOffset, false);
 	if (!currentNode) {
 		currentNode = rootNode;
 	}
diff --git a/extensions/emmet/src/splitJoinTag.ts b/extensions/emmet/src/splitJoinTag.ts
index c437d5d14f3..a5f1d255c85 100644
--- a/extensions/emmet/src/splitJoinTag.ts
+++ b/extensions/emmet/src/splitJoinTag.ts
@@ -20,7 +20,7 @@ export function splitJoinTag() {
 
 	return editor.edit(editBuilder => {
 		editor.selections.reverse().forEach(selection => {
-			let nodeToUpdate = getHtmlNode(editor.document, rootNode, selection.start);
+			let nodeToUpdate = getHtmlNode(editor.document, rootNode, selection.start, true);
 			if (nodeToUpdate) {
 				let textEdit = getRangesToReplace(editor.document, nodeToUpdate);
 				editBuilder.replace(textEdit.range, textEdit.newText);
diff --git a/extensions/emmet/src/test/editPointSelectItemBalance.test.ts b/extensions/emmet/src/test/editPointSelectItemBalance.test.ts
index a9f25685b91..f05469ab440 100644
--- a/extensions/emmet/src/test/editPointSelectItemBalance.test.ts
+++ b/extensions/emmet/src/test/editPointSelectItemBalance.test.ts
@@ -113,6 +113,22 @@ suite('Tests for Next/Previous Select/Edit point and Balance actions', () => {
 		});
 	});
 
+	test('Emmet Select Next/Prev item at boundary', function(): any {
+		return withRandomFileEditor(htmlContents, '.html', (editor, doc) => {
+			editor.selections = [new Selection(4, 1, 4, 1)];
+
+			fetchSelectItem('next');
+			testSelection(editor.selection, 2, 4, 6);
+
+			editor.selections = [new Selection(4, 1, 4, 1)];
+
+			fetchSelectItem('prev');
+			testSelection(editor.selection, 1, 3, 5);
+
+			return Promise.resolve();
+		});
+	});
+
 	test('Emmet Next/Prev Item in html template', function (): any {
 		const templateContents = `
 <script type="text/template">
diff --git a/extensions/emmet/src/test/reflectCssValue.test.ts b/extensions/emmet/src/test/reflectCssValue.test.ts
index 5a905da6e6c..17cae8b73ec 100644
--- a/extensions/emmet/src/test/reflectCssValue.test.ts
+++ b/extensions/emmet/src/test/reflectCssValue.test.ts
@@ -56,6 +56,16 @@ suite('Tests for Emmet: Reflect CSS Value command', () => {
 		});
 	});
 
+	test('Reflect Css Value in css file, selecting entire property', function (): any {
+		return withRandomFileEditor(cssContents, '.css', (editor, doc) => {
+			editor.selections = [new Selection(5, 2, 5, 32)];
+			return reflectCssValue().then(() => {
+				assert.equal(doc.getText(), cssContents.replace(/\(50deg\)/g, '(20deg)'));
+				return Promise.resolve();
+			});
+		});
+	});
+
 	test('Reflect Css Value in html file', function (): any {
 		return withRandomFileEditor(htmlContents, '.html', (editor, doc) => {
 			editor.selections = [new Selection(7, 20, 7, 20)];
@@ -66,4 +76,14 @@ suite('Tests for Emmet: Reflect CSS Value command', () => {
 		});
 	});
 
+	test('Reflect Css Value in html file, selecting entire property', function (): any {
+		return withRandomFileEditor(htmlContents, '.html', (editor, doc) => {
+			editor.selections = [new Selection(7, 4, 7, 34)];
+			return reflectCssValue().then(() => {
+				assert.equal(doc.getText(), htmlContents.replace(/\(50deg\)/g, '(20deg)'));
+				return Promise.resolve();
+			});
+		});
+	});
+
 });
\ No newline at end of file
diff --git a/extensions/emmet/src/test/tagActions.test.ts b/extensions/emmet/src/test/tagActions.test.ts
index 6c60eaae2a9..a5d5ca291d7 100644
--- a/extensions/emmet/src/test/tagActions.test.ts
+++ b/extensions/emmet/src/test/tagActions.test.ts
@@ -66,6 +66,31 @@ suite('Tests for Emmet actions on html tags', () => {
 		});
 	});
 
+	// #region update tag
+	test('update tag with entire node selected', () => {
+		const expectedContents = `
+	<div class="hello">
+		<ul>
+			<li><section>Hello</section></li>
+			<li><span>There</span></li>
+			<section><li><span>Bye</span></li></section>
+		</ul>
+		<span/>
+	</div>
+	`;
+		return withRandomFileEditor(contents, 'html', (editor, doc) => {
+			editor.selections = [
+				new Selection(3, 7, 3, 25),
+				new Selection(5, 3, 5, 39),
+			];
+
+			return updateTag('section')!.then(() => {
+				assert.equal(doc.getText(), expectedContents);
+				return Promise.resolve();
+			});
+		});
+	});
+
 	test('update tag with template', () => {
 		const expectedContents = `
 	<script type="text/template">
@@ -89,8 +114,9 @@ suite('Tests for Emmet actions on html tags', () => {
 			});
 		});
 	});
+	// #endregion
 
-
+	// #region remove tag
 	test('remove tag with mutliple cursors', () => {
 		const expectedContents = `
 	<div class="hello">
@@ -116,6 +142,31 @@ suite('Tests for Emmet actions on html tags', () => {
 		});
 	});
 
+	test('remove tag with boundary conditions', () => {
+		const expectedContents = `
+	<div class="hello">
+		<ul>
+			<li>Hello</li>
+			<li><span>There</span></li>
+			<li><span>Bye</span></li>
+		</ul>
+		<span/>
+	</div>
+	`;
+
+		return withRandomFileEditor(contents, 'html', (editor, doc) => {
+			editor.selections = [
+				new Selection(3, 7, 3, 25),
+				new Selection(5, 3, 5, 39),
+			];
+
+			return removeTag()!.then(() => {
+				assert.equal(doc.getText(), expectedContents);
+				return Promise.resolve();
+			});
+		});
+	});
+
 
 	test('remove tag with template', () => {
 		const expectedContents = `
@@ -139,7 +190,9 @@ suite('Tests for Emmet actions on html tags', () => {
 			});
 		});
 	});
+	// #endregion
 
+	// #region split/join tag
 	test('split/join tag with mutliple cursors', () => {
 		const expectedContents = `
 	<div class="hello">
@@ -164,6 +217,30 @@ suite('Tests for Emmet actions on html tags', () => {
 		});
 	});
 
+	test('split/join tag with boundary selection', () => {
+		const expectedContents = `
+	<div class="hello">
+		<ul>
+			<li><span/></li>
+			<li><span>There</span></li>
+			<div><li><span>Bye</span></li></div>
+		</ul>
+		<span></span>
+	</div>
+	`;
+		return withRandomFileEditor(contents, 'html', (editor, doc) => {
+			editor.selections = [
+				new Selection(3, 7, 3, 25), // join tag
+				new Selection(7, 2, 7, 9), // split tag
+			];
+
+			return splitJoinTag()!.then(() => {
+				assert.equal(doc.getText(), expectedContents);
+				return Promise.resolve();
+			});
+		});
+	});
+
 	test('split/join tag with templates', () => {
 		const expectedContents = `
 	<script type="text/template">
@@ -214,7 +291,9 @@ suite('Tests for Emmet actions on html tags', () => {
 			});
 		});
 	});
+	// #endregion
 
+	// #region match tag
 	test('match tag with mutliple cursors', () => {
 		return withRandomFileEditor(contents, 'html', (editor, doc) => {
 			editor.selections = [
@@ -265,6 +344,9 @@ suite('Tests for Emmet actions on html tags', () => {
 		});
 	});
 
+	// #endregion
+
+	// #region merge lines
 	test('merge lines of tag with children when empty selection', () => {
 		const expectedContents = `
 	<div class="hello">
@@ -284,6 +366,25 @@ suite('Tests for Emmet actions on html tags', () => {
 		});
 	});
 
+	test('merge lines of tag with children when full node selection', () => {
+		const expectedContents = `
+	<div class="hello">
+		<ul><li><span>Hello</span></li><li><span>There</span></li><div><li><span>Bye</span></li></div></ul>
+		<span/>
+	</div>
+	`;
+		return withRandomFileEditor(contents, 'html', (editor, doc) => {
+			editor.selections = [
+				new Selection(2, 3, 6, 7)
+			];
+
+			return mergeLines()!.then(() => {
+				assert.equal(doc.getText(), expectedContents);
+				return Promise.resolve();
+			});
+		});
+	});
+
 	test('merge lines is no-op when start and end nodes are on the same line', () => {
 		return withRandomFileEditor(contents, 'html', (editor, doc) => {
 			editor.selections = [
@@ -298,5 +399,6 @@ suite('Tests for Emmet actions on html tags', () => {
 			});
 		});
 	});
+	// #endregion
 });
 
diff --git a/extensions/emmet/src/updateImageSize.ts b/extensions/emmet/src/updateImageSize.ts
index 17959c07460..ba674b5ebc9 100644
--- a/extensions/emmet/src/updateImageSize.ts
+++ b/extensions/emmet/src/updateImageSize.ts
@@ -73,13 +73,13 @@ function updateImageSizeHTML(editor: TextEditor, position: Position): Promise<Te
 function updateImageSizeStyleTag(editor: TextEditor, position: Position): Promise<TextEdit[] | undefined> {
 	const getPropertyInsiderStyleTag = (editor: TextEditor): Property | null => {
 		const rootNode = parseDocument(editor.document);
-		const currentNode = <HtmlNode>getNode(rootNode, position);
+		const currentNode = <HtmlNode>getNode(rootNode, position, true);
 		if (currentNode && currentNode.name === 'style'
 			&& currentNode.open.end.isBefore(position)
 			&& currentNode.close.start.isAfter(position)) {
 			let buffer = new DocumentStreamReader(editor.document, currentNode.open.end, new Range(currentNode.open.end, currentNode.close.start));
 			let rootNode = parseStylesheet(buffer);
-			const node = getNode(rootNode, position);
+			const node = getNode(rootNode, position, true);
 			return (node && node.type === 'property') ? <Property>node : null;
 		}
 		return null;
diff --git a/extensions/emmet/src/updateTag.ts b/extensions/emmet/src/updateTag.ts
index f260d3f1082..b8f568e9e52 100644
--- a/extensions/emmet/src/updateTag.ts
+++ b/extensions/emmet/src/updateTag.ts
@@ -30,7 +30,7 @@ export function updateTag(tagName: string): Thenable<boolean> | undefined {
 }
 
 function getRangesToUpdate(editor: vscode.TextEditor, selection: vscode.Selection, rootNode: HtmlNode): vscode.Range[] {
-	let nodeToUpdate = getHtmlNode(editor.document, rootNode, selection.start);
+	let nodeToUpdate = getHtmlNode(editor.document, rootNode, selection.start, true);
 	if (!nodeToUpdate) {
 		return [];
 	}
diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
index 6031ffcbbff..b51d04d6cec 100644
--- a/extensions/emmet/src/util.ts
+++ b/extensions/emmet/src/util.ts
@@ -285,7 +285,7 @@ function findClosingCommentAfterPosition(document: vscode.TextDocument, position
 /**
  * Returns node corresponding to given position in the given root node
  */
-export function getNode(root: Node | undefined, position: vscode.Position, includeNodeBoundary: boolean = false) {
+export function getNode(root: Node | undefined, position: vscode.Position, includeNodeBoundary: boolean) {
 	if (!root) {
 		return null;
 	}
@@ -310,7 +310,7 @@ export function getNode(root: Node | undefined, position: vscode.Position, inclu
 	return foundNode;
 }
 
-export function getHtmlNode(document: vscode.TextDocument, root: Node | undefined, position: vscode.Position, includeNodeBoundary: boolean = false): HtmlNode | undefined {
+export function getHtmlNode(document: vscode.TextDocument, root: Node | undefined, position: vscode.Position, includeNodeBoundary: boolean): HtmlNode | undefined {
 	let currentNode = <HtmlNode>getNode(root, position, includeNodeBoundary);
 	if (!currentNode) { return; }
 
@@ -532,7 +532,7 @@ export function getCssPropertyFromRule(rule: Rule, name: string): Property | und
  */
 export function getCssPropertyFromDocument(editor: vscode.TextEditor, position: vscode.Position): Property | null | undefined {
 	const rootNode = parseDocument(editor.document);
-	const node = getNode(rootNode, position);
+	const node = getNode(rootNode, position, true);
 
 	if (isStyleSheet(editor.document.languageId)) {
 		return node && node.type === 'property' ? <Property>node : null;
@@ -545,7 +545,7 @@ export function getCssPropertyFromDocument(editor: vscode.TextEditor, position:
 		&& htmlNode.close.start.isAfter(position)) {
 		let buffer = new DocumentStreamReader(editor.document, htmlNode.start, new vscode.Range(htmlNode.start, htmlNode.end));
 		let rootNode = parseStylesheet(buffer);
-		const node = getNode(rootNode, position);
+		const node = getNode(rootNode, position, true);
 		return (node && node.type === 'property') ? <Property>node : null;
 	}
 }
diff --git a/extensions/emmet/yarn.lock b/extensions/emmet/yarn.lock
index 35b7ef8973f..040417ab779 100644
--- a/extensions/emmet/yarn.lock
+++ b/extensions/emmet/yarn.lock
@@ -2131,9 +2131,9 @@ 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"
+vscode-nls@3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
 
 vscode@1.0.1:
   version "1.0.1"
diff --git a/extensions/extension-editing/package.json b/extensions/extension-editing/package.json
index e5c502426c0..88b339023b2 100644
--- a/extensions/extension-editing/package.json
+++ b/extensions/extension-editing/package.json
@@ -21,7 +21,7 @@
 		"jsonc-parser": "^1.0.0",
 		"markdown-it": "^8.3.1",
 		"parse5": "^3.0.2",
-		"vscode-nls": "^3.2.1"
+		"vscode-nls": "^3.2.4"
 	},
 	"contributes": {
 		"jsonValidation": [
diff --git a/extensions/extension-editing/yarn.lock b/extensions/extension-editing/yarn.lock
index 350fdcb5fe3..cdc02d1e035 100644
--- a/extensions/extension-editing/yarn.lock
+++ b/extensions/extension-editing/yarn.lock
@@ -58,6 +58,6 @@ uc.micro@^1.0.1, uc.micro@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
diff --git a/extensions/git/package.json b/extensions/git/package.json
index d4a9ebb0d58..9a723045468 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -1140,7 +1140,7 @@
     "iconv-lite": "0.4.19",
     "jschardet": "^1.6.0",
     "vscode-extension-telemetry": "0.0.17",
-    "vscode-nls": "^3.2.1",
+    "vscode-nls": "^3.2.4",
     "which": "^1.3.0"
   },
   "devDependencies": {
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 2d0b52d2bc6..0e697949e70 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -137,6 +137,22 @@ const ImageMimetypes = [
 	'image/bmp'
 ];
 
+async function categorizeResourceByResolution(resources: Resource[]): Promise<{ merge: Resource[], resolved: Resource[], unresolved: Resource[] }> {
+	const selection = resources.filter(s => s instanceof Resource) as Resource[];
+	const merge = selection.filter(s => s.resourceGroupType === ResourceGroupType.Merge);
+	const isBothAddedOrModified = (s: Resource) => s.type === Status.BOTH_MODIFIED || s.type === Status.BOTH_ADDED;
+	const possibleUnresolved = merge.filter(isBothAddedOrModified);
+	const promises = possibleUnresolved.map(s => grep(s.resourceUri.fsPath, /^<{7}|^={7}|^>{7}/));
+	const unresolvedBothModified = await Promise.all<boolean>(promises);
+	const resolved = possibleUnresolved.filter((s, i) => !unresolvedBothModified[i]);
+	const unresolved = [
+		...merge.filter(s => !isBothAddedOrModified(s)),
+		...possibleUnresolved.filter((s, i) => unresolvedBothModified[i])
+	];
+
+	return { merge, resolved, unresolved };
+}
+
 export class CommandCenter {
 
 	private disposables: Disposable[];
@@ -629,20 +645,12 @@ export class CommandCenter {
 		}
 
 		const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
-		const merge = selection.filter(s => s.resourceGroupType === ResourceGroupType.Merge);
-		const bothModified = merge.filter(s => s.type === Status.BOTH_MODIFIED);
-		const promises = bothModified.map(s => grep(s.resourceUri.fsPath, /^<{7}|^={7}|^>{7}/));
-		const unresolvedBothModified = await Promise.all<boolean>(promises);
-		const resolvedConflicts = bothModified.filter((s, i) => !unresolvedBothModified[i]);
-		const unresolvedConflicts = [
-			...merge.filter(s => s.type !== Status.BOTH_MODIFIED),
-			...bothModified.filter((s, i) => unresolvedBothModified[i])
-		];
+		const { resolved, unresolved } = await categorizeResourceByResolution(selection);
 
-		if (unresolvedConflicts.length > 0) {
-			const message = unresolvedConflicts.length > 1
-				? localize('confirm stage files with merge conflicts', "Are you sure you want to stage {0} files with merge conflicts?", unresolvedConflicts.length)
-				: localize('confirm stage file with merge conflicts', "Are you sure you want to stage {0} with merge conflicts?", path.basename(unresolvedConflicts[0].resourceUri.fsPath));
+		if (unresolved.length > 0) {
+			const message = unresolved.length > 1
+				? localize('confirm stage files with merge conflicts', "Are you sure you want to stage {0} files with merge conflicts?", unresolved.length)
+				: localize('confirm stage file with merge conflicts', "Are you sure you want to stage {0} with merge conflicts?", path.basename(unresolved[0].resourceUri.fsPath));
 
 			const yes = localize('yes', "Yes");
 			const pick = await window.showWarningMessage(message, { modal: true }, yes);
@@ -653,7 +661,7 @@ export class CommandCenter {
 		}
 
 		const workingTree = selection.filter(s => s.resourceGroupType === ResourceGroupType.WorkingTree);
-		const scmResources = [...workingTree, ...resolvedConflicts, ...unresolvedConflicts];
+		const scmResources = [...workingTree, ...resolved, ...unresolved];
 
 		this.outputChannel.appendLine(`git.stage.scmResources ${scmResources.length}`);
 		if (!scmResources.length) {
@@ -667,12 +675,12 @@ export class CommandCenter {
 	@command('git.stageAll', { repository: true })
 	async stageAll(repository: Repository): Promise<void> {
 		const resources = repository.mergeGroup.resourceStates.filter(s => s instanceof Resource) as Resource[];
-		const mergeConflicts = resources.filter(s => s.resourceGroupType === ResourceGroupType.Merge);
+		const { merge, unresolved } = await categorizeResourceByResolution(resources);
 
-		if (mergeConflicts.length > 0) {
-			const message = mergeConflicts.length > 1
-				? localize('confirm stage files with merge conflicts', "Are you sure you want to stage {0} files with merge conflicts?", mergeConflicts.length)
-				: localize('confirm stage file with merge conflicts', "Are you sure you want to stage {0} with merge conflicts?", path.basename(mergeConflicts[0].resourceUri.fsPath));
+		if (unresolved.length > 0) {
+			const message = unresolved.length > 1
+				? localize('confirm stage files with merge conflicts', "Are you sure you want to stage {0} files with merge conflicts?", merge.length)
+				: localize('confirm stage file with merge conflicts', "Are you sure you want to stage {0} with merge conflicts?", path.basename(merge[0].resourceUri.fsPath));
 
 			const yes = localize('yes', "Yes");
 			const pick = await window.showWarningMessage(message, { modal: true }, yes);
@@ -1273,16 +1281,7 @@ export class CommandCenter {
 			return;
 		}
 
-		try {
-			await choice.run(repository);
-		} catch (err) {
-			if (err.gitErrorCode !== GitErrorCodes.Conflict) {
-				throw err;
-			}
-
-			const message = localize('merge conflicts', "There are merge conflicts. Resolve them before committing.");
-			await window.showWarningMessage(message);
-		}
+		await choice.run(repository);
 	}
 
 	@command('git.createTag', { repository: true })
@@ -1655,10 +1654,11 @@ export class CommandCenter {
 
 			return result.catch(async err => {
 				const options: MessageOptions = {
-					modal: err.gitErrorCode === GitErrorCodes.DirtyWorkTree
+					modal: true
 				};
 
 				let message: string;
+				let type: 'error' | 'warning' = 'error';
 
 				switch (err.gitErrorCode) {
 					case GitErrorCodes.DirtyWorkTree:
@@ -1667,6 +1667,11 @@ export class CommandCenter {
 					case GitErrorCodes.PushRejected:
 						message = localize('cant push', "Can't push refs to remote. Try running 'Pull' first to integrate your changes.");
 						break;
+					case GitErrorCodes.Conflict:
+						message = localize('merge conflicts', "There are merge conflicts. Resolve them before committing.");
+						type = 'warning';
+						options.modal = false;
+						break;
 					default:
 						const hint = (err.stderr || err.message || String(err))
 							.replace(/^error: /mi, '')
@@ -1687,11 +1692,11 @@ export class CommandCenter {
 					return;
 				}
 
-				options.modal = true;
-
 				const outputChannel = this.outputChannel as OutputChannel;
 				const openOutputChannelChoice = localize('open git log', "Open Git Log");
-				const choice = await window.showErrorMessage(message, options, openOutputChannelChoice);
+				const choice = type === 'error'
+					? await window.showErrorMessage(message, options, openOutputChannelChoice)
+					: await window.showWarningMessage(message, options, openOutputChannelChoice);
 
 				if (choice === openOutputChannelChoice) {
 					outputChannel.show();
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 71a8cbc9014..7f65a849ecc 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -336,7 +336,7 @@ export const GitErrorCodes = {
 	NoStashFound: 'NoStashFound',
 	LocalChangesOverwritten: 'LocalChangesOverwritten',
 	NoUpstreamBranch: 'NoUpstreamBranch',
-	IsInSubmodule: 'IsInSubmodule'
+	IsInSubmodule: 'IsInSubmodule',
 };
 
 function getGitErrorCode(stderr: string): string | undefined {
@@ -876,27 +876,41 @@ export class Repository {
 		try {
 			await this.run(args, { input: message || '' });
 		} catch (commitErr) {
-			if (/not possible because you have unmerged files/.test(commitErr.stderr || '')) {
-				commitErr.gitErrorCode = GitErrorCodes.UnmergedChanges;
-				throw commitErr;
-			}
+			await this.handleCommitError(commitErr);
+		}
+	}
 
-			try {
-				await this.run(['config', '--get-all', 'user.name']);
-			} catch (err) {
-				err.gitErrorCode = GitErrorCodes.NoUserNameConfigured;
-				throw err;
-			}
+	async rebaseContinue(): Promise<void> {
+		const args = ['rebase', '--continue'];
 
-			try {
-				await this.run(['config', '--get-all', 'user.email']);
-			} catch (err) {
-				err.gitErrorCode = GitErrorCodes.NoUserEmailConfigured;
-				throw err;
-			}
+		try {
+			await this.run(args);
+		} catch (commitErr) {
+			await this.handleCommitError(commitErr);
+		}
+	}
 
+	private async handleCommitError(commitErr: any): Promise<void> {
+		if (/not possible because you have unmerged files/.test(commitErr.stderr || '')) {
+			commitErr.gitErrorCode = GitErrorCodes.UnmergedChanges;
 			throw commitErr;
 		}
+
+		try {
+			await this.run(['config', '--get-all', 'user.name']);
+		} catch (err) {
+			err.gitErrorCode = GitErrorCodes.NoUserNameConfigured;
+			throw err;
+		}
+
+		try {
+			await this.run(['config', '--get-all', 'user.email']);
+		} catch (err) {
+			err.gitErrorCode = GitErrorCodes.NoUserEmailConfigured;
+			throw err;
+		}
+
+		throw commitErr;
 	}
 
 	async branch(name: string, checkout: boolean): Promise<void> {
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 5c5fd6814a3..6051cc3cb48 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -299,7 +299,8 @@ export enum Operation {
 	Stash = 'Stash',
 	CheckIgnore = 'CheckIgnore',
 	LSTree = 'LSTree',
-	SubmoduleUpdate = 'SubmoduleUpdate'
+	SubmoduleUpdate = 'SubmoduleUpdate',
+	RebaseContinue = 'RebaseContinue',
 }
 
 function isReadOnly(operation: Operation): boolean {
@@ -479,6 +480,22 @@ export class Repository implements Disposable {
 		return this._submodules;
 	}
 
+	private _rebaseCommit: Commit | undefined = undefined;
+
+	set rebaseCommit(rebaseCommit: Commit | undefined) {
+		if (this._rebaseCommit && !rebaseCommit) {
+			this.inputBox.value = '';
+		} else if (rebaseCommit && (!this._rebaseCommit || this._rebaseCommit.hash !== rebaseCommit.hash)) {
+			this.inputBox.value = rebaseCommit.message;
+		}
+
+		this._rebaseCommit = rebaseCommit;
+	}
+
+	get rebaseCommit(): Commit | undefined {
+		return this._rebaseCommit;
+	}
+
 	private _operations = new OperationsImpl();
 	get operations(): Operations { return this._operations; }
 
@@ -553,6 +570,15 @@ export class Repository implements Disposable {
 	}
 
 	validateInput(text: string, position: number): SourceControlInputBoxValidation | undefined {
+		if (this.rebaseCommit) {
+			if (this.rebaseCommit.message !== text) {
+				return {
+					message: localize('commit in rebase', "It's not possible to change the commit message in the middle of a rebase. Please complete the rebase operation and use interactive rebase instead."),
+					type: SourceControlInputBoxValidationType.Warning
+				};
+			}
+		}
+
 		const config = workspace.getConfiguration('git');
 		const setting = config.get<'always' | 'warn' | 'off'>('inputValidation');
 
@@ -636,13 +662,23 @@ export class Repository implements Disposable {
 	}
 
 	async commit(message: string, opts: CommitOptions = Object.create(null)): Promise<void> {
-		await this.run(Operation.Commit, async () => {
-			if (opts.all) {
-				await this.repository.add([]);
-			}
+		if (this.rebaseCommit) {
+			await this.run(Operation.RebaseContinue, async () => {
+				if (opts.all) {
+					await this.repository.add([]);
+				}
 
-			await this.repository.commit(message, opts);
-		});
+				await this.repository.rebaseContinue();
+			});
+		} else {
+			await this.run(Operation.Commit, async () => {
+				if (opts.all) {
+					await this.repository.add([]);
+				}
+
+				await this.repository.commit(message, opts);
+			});
+		}
 	}
 
 	async clean(resources: Uri[]): Promise<void> {
@@ -1025,12 +1061,13 @@ export class Repository implements Disposable {
 			// noop
 		}
 
-		const [refs, remotes, submodules] = await Promise.all([this.repository.getRefs(), this.repository.getRemotes(), this.repository.getSubmodules()]);
+		const [refs, remotes, submodules, rebaseCommit] = await Promise.all([this.repository.getRefs(), this.repository.getRemotes(), this.repository.getSubmodules(), this.getRebaseCommit()]);
 
 		this._HEAD = HEAD;
 		this._refs = refs;
 		this._remotes = remotes;
 		this._submodules = submodules;
+		this.rebaseCommit = rebaseCommit;
 
 		const index: Resource[] = [];
 		const workingTree: Resource[] = [];
@@ -1089,6 +1126,17 @@ export class Repository implements Disposable {
 		this._onDidChangeStatus.fire();
 	}
 
+	private async getRebaseCommit(): Promise<Commit | undefined> {
+		const rebaseHeadPath = path.join(this.repository.root, '.git', 'REBASE_HEAD');
+
+		try {
+			const rebaseHead = await new Promise<string>((c, e) => fs.readFile(rebaseHeadPath, 'utf8', (err, result) => err ? e(err) : c(result)));
+			return await this.getCommit(rebaseHead.trim());
+		} catch (err) {
+			return undefined;
+		}
+	}
+
 	private onFSChange(uri: Uri): void {
 		const config = workspace.getConfiguration('git');
 		const autorefresh = config.get<boolean>('autorefresh');
diff --git a/extensions/git/src/statusbar.ts b/extensions/git/src/statusbar.ts
index be97b3355cb..979c961f64d 100644
--- a/extensions/git/src/statusbar.ts
+++ b/extensions/git/src/statusbar.ts
@@ -24,7 +24,8 @@ class CheckoutStatusBar {
 	}
 
 	get command(): Command | undefined {
-		const title = `$(git-branch) ${this.repository.headLabel}`;
+		const rebasing = !!this.repository.rebaseCommit;
+		const title = `$(git-branch) ${this.repository.headLabel}${rebasing ? ` (${localize('rebasing', 'Rebasing')})` : ''}`;
 
 		return {
 			command: 'git.checkout',
diff --git a/extensions/git/yarn.lock b/extensions/git/yarn.lock
index 3fb8a6f087a..d8a4d64e743 100644
--- a/extensions/git/yarn.lock
+++ b/extensions/git/yarn.lock
@@ -263,9 +263,9 @@ vscode-extension-telemetry@0.0.17:
   dependencies:
     applicationinsights "1.0.1"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
 
 which@^1.3.0:
   version "1.3.0"
diff --git a/extensions/grunt/package.json b/extensions/grunt/package.json
index 182fe384325..18c5c21e0cb 100644
--- a/extensions/grunt/package.json
+++ b/extensions/grunt/package.json
@@ -1,8 +1,8 @@
 {
   "name": "grunt",
   "publisher": "vscode",
-  "description": "Extension to add Grunt capabilities to VSCode.",
-  "displayName": "Grunt support for VSCode",
+  "description": "Extension to add Grunt capabilities to VS Code.",
+  "displayName": "Grunt support for VS Code",
   "version": "1.0.0",
   "icon": "images/grunt.png",
   "engines": {
@@ -16,7 +16,7 @@
     "watch": "gulp watch-extension:grunt"
   },
   "dependencies": {
-    "vscode-nls": "^3.2.1"
+    "vscode-nls": "^3.2.4"
   },
   "devDependencies": {
     "@types/node": "7.0.43"
diff --git a/extensions/grunt/package.nls.json b/extensions/grunt/package.nls.json
index 31f3b369af5..7f1b68bbe0b 100644
--- a/extensions/grunt/package.nls.json
+++ b/extensions/grunt/package.nls.json
@@ -1,6 +1,6 @@
 {
-	"description": "Extension to add Grunt capabilities to VSCode.",
-	"displayName": "Grunt support for VSCode",
+	"description": "Extension to add Grunt capabilities to VS Code.",
+	"displayName": "Grunt support for VS Code",
 	"config.grunt.autoDetect": "Controls whether auto detection of Grunt tasks is on or off. Default is on.",
 	"grunt.taskDefinition.type.description": "The Grunt task to customize.",
 	"grunt.taskDefinition.file.description": "The Grunt file that provides the task. Can be omitted."
diff --git a/extensions/grunt/yarn.lock b/extensions/grunt/yarn.lock
index 112e5f2ac8d..573098d7d26 100644
--- a/extensions/grunt/yarn.lock
+++ b/extensions/grunt/yarn.lock
@@ -6,6 +6,6 @@
   version "7.0.43"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
diff --git a/extensions/gulp/package.json b/extensions/gulp/package.json
index bc53fe127f7..65d9197a0d9 100644
--- a/extensions/gulp/package.json
+++ b/extensions/gulp/package.json
@@ -16,7 +16,7 @@
     "watch": "gulp watch-extension:gulp"
   },
   "dependencies": {
-    "vscode-nls": "^3.2.1"
+    "vscode-nls": "^3.2.4"
   },
   "devDependencies": {
     "@types/node": "7.0.43"
diff --git a/extensions/gulp/yarn.lock b/extensions/gulp/yarn.lock
index 112e5f2ac8d..573098d7d26 100644
--- a/extensions/gulp/yarn.lock
+++ b/extensions/gulp/yarn.lock
@@ -6,6 +6,6 @@
   version "7.0.43"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json
index 5781a2d2faa..9ac18e38fbb 100644
--- a/extensions/html-language-features/package.json
+++ b/extensions/html-language-features/package.json
@@ -176,7 +176,7 @@
     "vscode-extension-telemetry": "0.0.17",
     "vscode-languageclient": "^4.1.4",
     "vscode-languageserver-protocol-foldingprovider": "^2.0.1",
-    "vscode-nls": "^3.2.2"
+    "vscode-nls": "^3.2.4"
   },
   "devDependencies": {
     "@types/node": "7.0.43"
diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json
index 8dc64310848..e9586c7ad34 100644
--- a/extensions/html-language-features/server/package.json
+++ b/extensions/html-language-features/server/package.json
@@ -8,12 +8,12 @@
     "node": "*"
   },
   "dependencies": {
-    "vscode-css-languageservice": "^3.0.9-next.18",
+    "vscode-css-languageservice": "^3.0.9-next.20",
     "vscode-html-languageservice": "^2.1.3-next.5",
     "vscode-languageserver": "^4.1.3",
     "vscode-languageserver-protocol-foldingprovider": "^2.0.1",
     "vscode-languageserver-types": "^3.7.2",
-    "vscode-nls": "^3.2.2",
+    "vscode-nls": "^3.2.4",
     "vscode-uri": "^1.0.3"
   },
   "devDependencies": {
diff --git a/extensions/html-language-features/server/yarn.lock b/extensions/html-language-features/server/yarn.lock
index a239f421cdc..32e736c53c2 100644
--- a/extensions/html-language-features/server/yarn.lock
+++ b/extensions/html-language-features/server/yarn.lock
@@ -194,9 +194,9 @@ supports-color@5.4.0:
   dependencies:
     has-flag "^3.0.0"
 
-vscode-css-languageservice@^3.0.9-next.18:
-  version "3.0.9-next.18"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9-next.18.tgz#f8f25123b5a8cdc9f72fafcd2c0088f726322437"
+vscode-css-languageservice@^3.0.9-next.20:
+  version "3.0.9-next.20"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9-next.20.tgz#8229aee66aa877929af5d2fd81a21731b415c92e"
   dependencies:
     vscode-languageserver-types "^3.7.2"
     vscode-nls "^3.2.2"
@@ -242,6 +242,10 @@ vscode-nls@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.2.tgz#3817eca5b985c2393de325197cf4e15eb2aa5350"
 
+vscode-nls@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
+
 vscode-uri@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.1.tgz#11a86befeac3c4aa3ec08623651a3c81a6d0bbc8"
diff --git a/extensions/html-language-features/yarn.lock b/extensions/html-language-features/yarn.lock
index 36c0c89cd28..1e7214749f2 100644
--- a/extensions/html-language-features/yarn.lock
+++ b/extensions/html-language-features/yarn.lock
@@ -62,9 +62,9 @@ vscode-languageserver-types@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.7.2.tgz#aad8846f8e3e27962648554de5a8417e358f34eb"
 
-vscode-nls@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.2.tgz#3817eca5b985c2393de325197cf4e15eb2aa5350"
+vscode-nls@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
 
 zone.js@0.7.6:
   version "0.7.6"
diff --git a/extensions/jake/package.json b/extensions/jake/package.json
index 2330f353026..6befa9fbd9e 100644
--- a/extensions/jake/package.json
+++ b/extensions/jake/package.json
@@ -16,7 +16,7 @@
     "watch": "gulp watch-extension:jake"
   },
   "dependencies": {
-    "vscode-nls": "^3.2.1"
+    "vscode-nls": "^3.2.4"
   },
   "devDependencies": {
     "@types/node": "7.0.43"
diff --git a/extensions/jake/package.nls.json b/extensions/jake/package.nls.json
index b8cdb170d33..8150f471e6d 100644
--- a/extensions/jake/package.nls.json
+++ b/extensions/jake/package.nls.json
@@ -1,6 +1,6 @@
 {
-	"description": "Extension to add Jake capabilities to VSCode.",
-	"displayName": "Jake support for VSCode",
+	"description": "Extension to add Jake capabilities to VS Code.",
+	"displayName": "Jake support for VS Code",
 	"jake.taskDefinition.type.description": "The Jake task to customize.",
 	"jake.taskDefinition.file.description": "The Jake file that provides the task. Can be omitted.",
 	"config.jake.autoDetect": "Controls whether auto detection of Jake tasks is on or off. Default is on."
diff --git a/extensions/jake/yarn.lock b/extensions/jake/yarn.lock
index 112e5f2ac8d..573098d7d26 100644
--- a/extensions/jake/yarn.lock
+++ b/extensions/jake/yarn.lock
@@ -6,6 +6,6 @@
   version "7.0.43"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
index 30c1ca68b1c..8fd13accda3 100644
--- a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
@@ -4,7 +4,7 @@
 		"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/7bf8960f7042474b10b519f39339fc527907ce16",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/88217b1c7d36ed5d35adc3099ba7978aabe2531b",
 	"name": "JavaScript (with React support)",
 	"scopeName": "source.js",
 	"patterns": [
@@ -4115,7 +4115,7 @@
 		},
 		"directives": {
 			"name": "comment.line.triple-slash.directive.js",
-			"begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|name)\\s*=\\s*((\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")))+\\s*/>\\s*$)",
+			"begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name)\\s*=\\s*((\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")))+\\s*/>\\s*$)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.comment.js"
@@ -4143,7 +4143,7 @@
 					"patterns": [
 						{
 							"name": "entity.other.attribute-name.directive.js",
-							"match": "path|types|no-default-lib|name"
+							"match": "path|types|no-default-lib|lib|name"
 						},
 						{
 							"name": "keyword.operator.assignment.js",
@@ -4664,8 +4664,8 @@
 			]
 		},
 		"jsx-tag-in-expression": {
-			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>))",
-			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
 			"patterns": [
 				{
 					"include": "#jsx-tag"
@@ -4674,7 +4674,7 @@
 		},
 		"jsx-tag": {
 			"name": "meta.tag.js",
-			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
 			"end": "(/>)|(?:(</)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>))",
 			"endCaptures": {
 				"1": {
@@ -4701,7 +4701,7 @@
 			},
 			"patterns": [
 				{
-					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>)",
+					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>)",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.tag.begin.js"
diff --git a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
index 2327bd28a91..a7ceac55af3 100644
--- a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
@@ -4,7 +4,7 @@
 		"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/7bf8960f7042474b10b519f39339fc527907ce16",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/88217b1c7d36ed5d35adc3099ba7978aabe2531b",
 	"name": "JavaScript (with React support)",
 	"scopeName": "source.js.jsx",
 	"patterns": [
@@ -4115,7 +4115,7 @@
 		},
 		"directives": {
 			"name": "comment.line.triple-slash.directive.js.jsx",
-			"begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|name)\\s*=\\s*((\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")))+\\s*/>\\s*$)",
+			"begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name)\\s*=\\s*((\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")))+\\s*/>\\s*$)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.comment.js.jsx"
@@ -4143,7 +4143,7 @@
 					"patterns": [
 						{
 							"name": "entity.other.attribute-name.directive.js.jsx",
-							"match": "path|types|no-default-lib|name"
+							"match": "path|types|no-default-lib|lib|name"
 						},
 						{
 							"name": "keyword.operator.assignment.js.jsx",
@@ -4664,8 +4664,8 @@
 			]
 		},
 		"jsx-tag-in-expression": {
-			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>))",
-			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
 			"patterns": [
 				{
 					"include": "#jsx-tag"
@@ -4674,7 +4674,7 @@
 		},
 		"jsx-tag": {
 			"name": "meta.tag.js.jsx",
-			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
 			"end": "(/>)|(?:(</)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>))",
 			"endCaptures": {
 				"1": {
@@ -4701,7 +4701,7 @@
 			},
 			"patterns": [
 				{
-					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>)",
+					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>)",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.tag.begin.js.jsx"
diff --git a/extensions/json-language-features/client/src/jsonMain.ts b/extensions/json-language-features/client/src/jsonMain.ts
index 2cd653dfa4b..b2fc5658eb5 100644
--- a/extensions/json-language-features/client/src/jsonMain.ts
+++ b/extensions/json-language-features/client/src/jsonMain.ts
@@ -251,11 +251,22 @@ function getSettings(): Settings {
 				settings.json!.schemas!.push(schemaSetting);
 			}
 			let fileMatches = setting.fileMatch;
+			let resultingFileMatches = schemaSetting.fileMatch!;
 			if (Array.isArray(fileMatches)) {
 				if (fileMatchPrefix) {
-					fileMatches = fileMatches.map(m => fileMatchPrefix + m);
+					for (let fileMatch of fileMatches) {
+						if (fileMatch[0] === '/') {
+							resultingFileMatches.push(fileMatchPrefix + fileMatch);
+							resultingFileMatches.push(fileMatchPrefix + '/*' + fileMatch);
+						} else {
+							resultingFileMatches.push(fileMatchPrefix + '/' + fileMatch);
+							resultingFileMatches.push(fileMatchPrefix + '/*/' + fileMatch);
+						}
+					}
+				} else {
+					resultingFileMatches.push(...fileMatches);
 				}
-				schemaSetting.fileMatch!.push(...fileMatches);
+
 			}
 			if (setting.schema) {
 				schemaSetting.schema = setting.schema;
@@ -276,10 +287,10 @@ function getSettings(): Settings {
 			let folderSchemas = schemaConfigInfo!.workspaceFolderValue;
 			if (Array.isArray(folderSchemas)) {
 				let folderPath = folderUri.toString();
-				if (folderPath[folderPath.length - 1] !== '/') {
-					folderPath = folderPath + '/';
+				if (folderPath[folderPath.length - 1] === '/') {
+					folderPath = folderPath.substr(0, folderPath.length - 1);
 				}
-				collectSchemaSettings(folderSchemas, folderUri.fsPath, folderPath + '*');
+				collectSchemaSettings(folderSchemas, folderUri.fsPath, folderPath);
 			}
 		}
 	}
diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json
index 2e245fdafd8..8ea4b2f3d21 100644
--- a/extensions/json-language-features/package.json
+++ b/extensions/json-language-features/package.json
@@ -103,7 +103,7 @@
     "vscode-extension-telemetry": "0.0.17",
     "vscode-languageclient": "^4.1.4",
     "vscode-languageserver-protocol-foldingprovider": "^2.0.1",
-    "vscode-nls": "^3.2.2"
+    "vscode-nls": "^3.2.4"
   },
   "devDependencies": {
     "@types/node": "7.0.43"
diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json
index 8ae80565173..2f67cd91401 100644
--- a/extensions/json-language-features/server/package.json
+++ b/extensions/json-language-features/server/package.json
@@ -13,10 +13,10 @@
   "dependencies": {
     "jsonc-parser": "^2.0.0-next.1",
     "request-light": "^0.2.2",
-    "vscode-json-languageservice": "^3.1.2-next.3",
+    "vscode-json-languageservice": "^3.1.2",
     "vscode-languageserver": "^4.1.3",
     "vscode-languageserver-protocol-foldingprovider": "^2.0.1",
-    "vscode-nls": "^3.2.2",
+    "vscode-nls": "^3.2.4",
     "vscode-uri": "^1.0.3"
   },
   "devDependencies": {
diff --git a/extensions/json-language-features/server/yarn.lock b/extensions/json-language-features/server/yarn.lock
index ce5677e6ae0..d9b5875b9bc 100644
--- a/extensions/json-language-features/server/yarn.lock
+++ b/extensions/json-language-features/server/yarn.lock
@@ -52,14 +52,14 @@ https-proxy-agent@2.1.1:
     agent-base "^4.1.0"
     debug "^3.1.0"
 
-jsonc-parser@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.0.tgz#62ff087a7e753875febf3c55f1fc0cd737c36b5a"
-
 jsonc-parser@^2.0.0-next.1:
   version "2.0.0-next.1"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.0-next.1.tgz#445a824f765a96abfbb286d759a9b1d226b18088"
 
+jsonc-parser@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.1.tgz#9d23cd2709714fff508a1a6679d82135bee1ae60"
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -72,11 +72,11 @@ request-light@^0.2.2:
     https-proxy-agent "2.1.1"
     vscode-nls "^2.0.2"
 
-vscode-json-languageservice@^3.1.2-next.3:
-  version "3.1.2-next.3"
-  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.1.2-next.3.tgz#cc0902148f898b413987fb1b4c4a9e7fc1a79c78"
+vscode-json-languageservice@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.1.2.tgz#5c70fc32ad389e6da48452e7b0187ea5e70f68bf"
   dependencies:
-    jsonc-parser "^2.0.0"
+    jsonc-parser "^2.0.1"
     vscode-languageserver-types "^3.7.2"
     vscode-nls "^3.2.2"
     vscode-uri "^1.0.3"
@@ -118,6 +118,10 @@ vscode-nls@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.2.tgz#3817eca5b985c2393de325197cf4e15eb2aa5350"
 
+vscode-nls@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
+
 vscode-uri@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.1.tgz#11a86befeac3c4aa3ec08623651a3c81a6d0bbc8"
diff --git a/extensions/json-language-features/yarn.lock b/extensions/json-language-features/yarn.lock
index 36c0c89cd28..1e7214749f2 100644
--- a/extensions/json-language-features/yarn.lock
+++ b/extensions/json-language-features/yarn.lock
@@ -62,9 +62,9 @@ vscode-languageserver-types@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.7.2.tgz#aad8846f8e3e27962648554de5a8417e358f34eb"
 
-vscode-nls@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.2.tgz#3817eca5b985c2393de325197cf4e15eb2aa5350"
+vscode-nls@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
 
 zone.js@0.7.6:
   version "0.7.6"
diff --git a/extensions/json/build/update-grammars.js b/extensions/json/build/update-grammars.js
new file mode 100644
index 00000000000..d7d92e18258
--- /dev/null
+++ b/extensions/json/build/update-grammars.js
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+var updateGrammar = require('../../../build/npm/update-grammar');
+
+function adaptJSON(grammar, replacementScope) {
+	grammar.name = 'JSON with comments';
+	grammar.scopeName = `source${replacementScope}`;
+
+	var fixScopeNames = function(rule) {
+		if (typeof rule.name === 'string') {
+			rule.name = rule.name.replace(/\.json/g, replacementScope);
+		}
+		if (typeof rule.contentName === 'string') {
+			rule.contentName = rule.contentName.replace(/\.json/g, replacementScope);
+		}
+		for (var property in rule) {
+			var value = rule[property];
+			if (typeof value === 'object') {
+				fixScopeNames(value);
+			}
+		}
+	};
+
+	var repository = grammar.repository;
+	for (var key in repository) {
+		fixScopeNames(repository[key]);
+	}
+}
+
+var tsGrammarRepo = 'Microsoft/vscode-JSON.tmLanguage';
+updateGrammar.update(tsGrammarRepo, 'JSON.tmLanguage', './syntaxes/JSON.tmLanguage.json');
+updateGrammar.update(tsGrammarRepo, 'JSON.tmLanguage', './syntaxes/JSONC.tmLanguage.json', grammar => adaptJSON(grammar, '.json.comments'));
+
+
+
+
+
diff --git a/extensions/json/package.json b/extensions/json/package.json
index 9ef7b078963..af9024bfde9 100644
--- a/extensions/json/package.json
+++ b/extensions/json/package.json
@@ -8,7 +8,7 @@
     "vscode": "0.10.x"
   },
   "scripts": {
-    "update-grammar": "node ../../build/npm/update-grammar.js Microsoft/vscode-JSON.tmLanguage JSON.tmLanguage ./syntaxes/JSON.tmLanguage.json"
+    "update-grammar": "node ./build/update-grammars.js"
   },
   "contributes": {
     "languages": [
@@ -58,8 +58,8 @@
       },
       {
         "language": "jsonc",
-        "scopeName": "source.json",
-        "path": "./syntaxes/JSON.tmLanguage.json"
+        "scopeName": "source.json.comments",
+        "path": "./syntaxes/JSONC.tmLanguage.json"
       }
     ],
     "jsonValidation": [
diff --git a/extensions/json/syntaxes/JSONC.tmLanguage.json b/extensions/json/syntaxes/JSONC.tmLanguage.json
new file mode 100644
index 00000000000..50028ef0f35
--- /dev/null
+++ b/extensions/json/syntaxes/JSONC.tmLanguage.json
@@ -0,0 +1,213 @@
+{
+	"information_for_contributors": [
+		"This file has been converted from https://github.com/Microsoft/vscode-JSON.tmLanguage/blob/master/JSON.tmLanguage",
+		"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-JSON.tmLanguage/commit/9bd83f1c252b375e957203f21793316203f61f70",
+	"name": "JSON with comments",
+	"scopeName": "source.json.comments",
+	"patterns": [
+		{
+			"include": "#value"
+		}
+	],
+	"repository": {
+		"array": {
+			"begin": "\\[",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.array.begin.json.comments"
+				}
+			},
+			"end": "\\]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.array.end.json.comments"
+				}
+			},
+			"name": "meta.structure.array.json.comments",
+			"patterns": [
+				{
+					"include": "#value"
+				},
+				{
+					"match": ",",
+					"name": "punctuation.separator.array.json.comments"
+				},
+				{
+					"match": "[^\\s\\]]",
+					"name": "invalid.illegal.expected-array-separator.json.comments"
+				}
+			]
+		},
+		"comments": {
+			"patterns": [
+				{
+					"begin": "/\\*\\*(?!/)",
+					"captures": {
+						"0": {
+							"name": "punctuation.definition.comment.json.comments"
+						}
+					},
+					"end": "\\*/",
+					"name": "comment.block.documentation.json.comments"
+				},
+				{
+					"begin": "/\\*",
+					"captures": {
+						"0": {
+							"name": "punctuation.definition.comment.json.comments"
+						}
+					},
+					"end": "\\*/",
+					"name": "comment.block.json.comments"
+				},
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.comment.json.comments"
+						}
+					},
+					"match": "(//).*$\\n?",
+					"name": "comment.line.double-slash.js"
+				}
+			]
+		},
+		"constant": {
+			"match": "\\b(?:true|false|null)\\b",
+			"name": "constant.language.json.comments"
+		},
+		"number": {
+			"match": "(?x)        # turn on extended mode\n  -?        # an optional minus\n  (?:\n    0       # a zero\n    |       # ...or...\n    [1-9]   # a 1-9 character\n    \\d*     # followed by zero or more digits\n  )\n  (?:\n    (?:\n      \\.    # a period\n      \\d+   # followed by one or more digits\n    )?\n    (?:\n      [eE]  # an e character\n      [+-]? # followed by an option +/-\n      \\d+   # followed by one or more digits\n    )?      # make exponent optional\n  )?        # make decimal portion optional",
+			"name": "constant.numeric.json.comments"
+		},
+		"object": {
+			"begin": "\\{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.dictionary.begin.json.comments"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.dictionary.end.json.comments"
+				}
+			},
+			"name": "meta.structure.dictionary.json.comments",
+			"patterns": [
+				{
+					"comment": "the JSON object key",
+					"include": "#objectkey"
+				},
+				{
+					"include": "#comments"
+				},
+				{
+					"begin": ":",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.separator.dictionary.key-value.json.comments"
+						}
+					},
+					"end": "(,)|(?=\\})",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.separator.dictionary.pair.json.comments"
+						}
+					},
+					"name": "meta.structure.dictionary.value.json.comments",
+					"patterns": [
+						{
+							"comment": "the JSON object value",
+							"include": "#value"
+						},
+						{
+							"match": "[^\\s,]",
+							"name": "invalid.illegal.expected-dictionary-separator.json.comments"
+						}
+					]
+				},
+				{
+					"match": "[^\\s\\}]",
+					"name": "invalid.illegal.expected-dictionary-separator.json.comments"
+				}
+			]
+		},
+		"string": {
+			"begin": "\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.json.comments"
+				}
+			},
+			"end": "\"",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.json.comments"
+				}
+			},
+			"name": "string.quoted.double.json.comments",
+			"patterns": [
+				{
+					"include": "#stringcontent"
+				}
+			]
+		},
+		"objectkey": {
+			"begin": "\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.support.type.property-name.begin.json.comments"
+				}
+			},
+			"end": "\"",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.support.type.property-name.end.json.comments"
+				}
+			},
+			"name": "string.json.comments support.type.property-name.json.comments",
+			"patterns": [
+				{
+					"include": "#stringcontent"
+				}
+			]
+		},
+		"stringcontent": {
+			"patterns": [
+				{
+					"match": "(?x)                # turn on extended mode\n  \\\\                # a literal backslash\n  (?:               # ...followed by...\n    [\"\\\\/bfnrt]     # one of these characters\n    |               # ...or...\n    u               # a u\n    [0-9a-fA-F]{4}) # and four hex digits",
+					"name": "constant.character.escape.json.comments"
+				},
+				{
+					"match": "\\\\.",
+					"name": "invalid.illegal.unrecognized-string-escape.json.comments"
+				}
+			]
+		},
+		"value": {
+			"patterns": [
+				{
+					"include": "#constant"
+				},
+				{
+					"include": "#number"
+				},
+				{
+					"include": "#string"
+				},
+				{
+					"include": "#array"
+				},
+				{
+					"include": "#object"
+				},
+				{
+					"include": "#comments"
+				}
+			]
+		}
+	}
+}
\ No newline at end of file
diff --git a/extensions/markdown-language-features/media/highlight.css b/extensions/markdown-language-features/media/highlight.css
index fd39af662c0..3b748b1c4f9 100644
--- a/extensions/markdown-language-features/media/highlight.css
+++ b/extensions/markdown-language-features/media/highlight.css
@@ -120,6 +120,11 @@ Visual Studio-like style based on original C# coloring by Jason Diamond <jason@d
 
 */
 
+.vscode-light .hljs-function,
+.vscode-light .hljs-params {
+	color: inherit;
+}
+
 .vscode-light .hljs-comment,
 .vscode-light .hljs-quote,
 .vscode-light .hljs-variable {
diff --git a/extensions/markdown-language-features/media/markdown.css b/extensions/markdown-language-features/media/markdown.css
index 65a73a4e998..e78f73d9666 100644
--- a/extensions/markdown-language-features/media/markdown.css
+++ b/extensions/markdown-language-features/media/markdown.css
@@ -196,18 +196,15 @@ pre code {
 }
 
 
-.vscode-light pre:not(.hljs),
-.vscode-light code > div {
+.vscode-light pre {
 	background-color: rgba(220, 220, 220, 0.4);
 }
 
-.vscode-dark pre:not(.hljs),
-.vscode-dark code > div {
+.vscode-dark pre {
 	background-color: rgba(10, 10, 10, 0.4);
 }
 
-.vscode-high-contrast pre:not(.hljs),
-.vscode-high-contrast code > div {
+.vscode-high-contrast pre {
 	background-color: rgb(0, 0, 0);
 }
 
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index f7115786331..984967f637f 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -296,7 +296,7 @@
 		"markdown-it": "^8.4.1",
 		"markdown-it-named-headers": "0.0.4",
 		"vscode-extension-telemetry": "0.0.17",
-		"vscode-nls": "^3.2.1"
+		"vscode-nls": "^3.2.4"
 	},
 	"devDependencies": {
 		"@types/highlight.js": "9.1.10",
diff --git a/extensions/markdown-language-features/src/features/documentSymbolProvider.ts b/extensions/markdown-language-features/src/features/documentSymbolProvider.ts
index 38b33197200..bf0d5edb852 100644
--- a/extensions/markdown-language-features/src/features/documentSymbolProvider.ts
+++ b/extensions/markdown-language-features/src/features/documentSymbolProvider.ts
@@ -5,8 +5,13 @@
 
 import * as vscode from 'vscode';
 import { MarkdownEngine } from '../markdownEngine';
-import { TableOfContentsProvider, SkinnyTextDocument } from '../tableOfContentsProvider';
+import { TableOfContentsProvider, SkinnyTextDocument, TocEntry } from '../tableOfContentsProvider';
 
+interface MarkdownSymbol {
+	readonly level: number;
+	readonly parent: MarkdownSymbol | undefined;
+	readonly children: vscode.DocumentSymbol[];
+}
 
 export default class MDDocumentSymbolProvider implements vscode.DocumentSymbolProvider {
 
@@ -14,10 +19,57 @@ export default class MDDocumentSymbolProvider implements vscode.DocumentSymbolPr
 		private readonly engine: MarkdownEngine
 	) { }
 
-	public async provideDocumentSymbols(document: SkinnyTextDocument): Promise<vscode.SymbolInformation[]> {
+	public async provideDocumentSymbolInformation(document: SkinnyTextDocument): Promise<vscode.SymbolInformation[]> {
 		const toc = await new TableOfContentsProvider(this.engine, document).getToc();
-		return toc.map(entry => {
-			return new vscode.SymbolInformation('#'.repeat(entry.level) + ' ' + entry.text, vscode.SymbolKind.String, '', entry.location);
-		});
+		return toc.map(entry => this.toSymbolInformation(entry));
+	}
+
+	public async provideDocumentSymbols(document: SkinnyTextDocument): Promise<vscode.DocumentSymbol[]> {
+		const toc = await new TableOfContentsProvider(this.engine, document).getToc();
+		const root: MarkdownSymbol = {
+			level: -Infinity,
+			children: [],
+			parent: undefined
+		};
+		this.buildTree(root, toc);
+		return root.children;
+	}
+
+	private buildTree(parent: MarkdownSymbol, entries: TocEntry[]) {
+		if (!entries.length) {
+			return;
+		}
+
+		const entry = entries[0];
+		const symbol = this.toDocumentSymbol(entry);
+		symbol.children = [];
+
+		while (parent && entry.level <= parent.level) {
+			parent = parent.parent!;
+		}
+		parent.children.push(symbol);
+		this.buildTree({ level: entry.level, children: symbol.children, parent }, entries.slice(1));
+	}
+
+
+	private toSymbolInformation(entry: TocEntry): vscode.SymbolInformation {
+		return new vscode.SymbolInformation(
+			this.getSymbolName(entry),
+			vscode.SymbolKind.String,
+			'',
+			entry.location);
+	}
+
+	private toDocumentSymbol(entry: TocEntry) {
+		return new vscode.DocumentSymbol(
+			this.getSymbolName(entry),
+			'',
+			vscode.SymbolKind.String,
+			entry.location.range,
+			entry.location.range);
+	}
+
+	private getSymbolName(entry: TocEntry): string {
+		return '#'.repeat(entry.level) + ' ' + entry.text;
 	}
 }
\ No newline at end of file
diff --git a/extensions/markdown-language-features/src/features/workspaceSymbolProvider.ts b/extensions/markdown-language-features/src/features/workspaceSymbolProvider.ts
index 9cbce783e12..12e51c75d76 100644
--- a/extensions/markdown-language-features/src/features/workspaceSymbolProvider.ts
+++ b/extensions/markdown-language-features/src/features/workspaceSymbolProvider.ts
@@ -136,7 +136,7 @@ export default class MarkdownWorkspaceSymbolProvider implements vscode.Workspace
 
 	private getSymbols(document: SkinnyTextDocument): Lazy<Thenable<vscode.SymbolInformation[]>> {
 		return lazy(async () => {
-			return this._symbolProvider.provideDocumentSymbols(document);
+			return this._symbolProvider.provideDocumentSymbolInformation(document);
 		});
 	}
 
diff --git a/extensions/markdown-language-features/src/test/documentSymbolProvider.test.ts b/extensions/markdown-language-features/src/test/documentSymbolProvider.test.ts
new file mode 100644
index 00000000000..b87b5cf2ea4
--- /dev/null
+++ b/extensions/markdown-language-features/src/test/documentSymbolProvider.test.ts
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import 'mocha';
+import * as vscode from 'vscode';
+import SymbolProvider from '../features/documentSymbolProvider';
+import { InMemoryDocument } from './inMemoryDocument';
+import { createNewMarkdownEngine } from './engine';
+
+
+const testFileName = vscode.Uri.parse('test.md');
+
+
+function getSymbolsForFile(fileContents: string) {
+	const doc = new InMemoryDocument(testFileName, fileContents);
+	const provider = new SymbolProvider(createNewMarkdownEngine());
+	return provider.provideDocumentSymbols(doc);
+}
+
+
+suite('markdown.DocumentSymbolProvider', () => {
+	test('Should not return anything for empty document', async () => {
+		const symbols = await getSymbolsForFile('');
+		assert.strictEqual(symbols.length, 0);
+	});
+
+	test('Should not return anything for document with no headers', async () => {
+		const symbols = await getSymbolsForFile('a\na');
+		assert.strictEqual(symbols.length, 0);
+	});
+
+	test('Should not return anything for document with # but no real headers', async () => {
+		const symbols = await getSymbolsForFile('a#a\na#');
+		assert.strictEqual(symbols.length, 0);
+	});
+
+	test('Should return single symbol for single header', async () => {
+		const symbols = await getSymbolsForFile('# h');
+		assert.strictEqual(symbols.length, 1);
+		assert.strictEqual(symbols[0].name, '# h');
+	});
+
+	test('Should not care about symbol level for single header', async () => {
+		const symbols = await getSymbolsForFile('### h');
+		assert.strictEqual(symbols.length, 1);
+		assert.strictEqual(symbols[0].name, '### h');
+	});
+
+	test('Should put symbols of same level in flat list', async () => {
+		const symbols = await getSymbolsForFile('## h\n## h2');
+		assert.strictEqual(symbols.length, 2);
+		assert.strictEqual(symbols[0].name, '## h');
+		assert.strictEqual(symbols[1].name, '## h2');
+	});
+
+	test('Should nest symbol of level - 1 under parent', async () => {
+
+		const symbols = await getSymbolsForFile('# h\n## h2\n## h3');
+		assert.strictEqual(symbols.length, 1);
+		assert.strictEqual(symbols[0].name, '# h');
+		assert.strictEqual(symbols[0].children.length, 2);
+		assert.strictEqual(symbols[0].children[0].name, '## h2');
+		assert.strictEqual(symbols[0].children[1].name, '## h3');
+	});
+
+	test('Should nest symbol of level - n under parent', async () => {
+		const symbols = await getSymbolsForFile('# h\n#### h2');
+		assert.strictEqual(symbols.length, 1);
+		assert.strictEqual(symbols[0].name, '# h');
+		assert.strictEqual(symbols[0].children.length, 1);
+		assert.strictEqual(symbols[0].children[0].name, '#### h2');
+	});
+
+	test('Should flatten children where lower level occurs first', async () => {
+		const symbols = await getSymbolsForFile('# h\n### h2\n## h3');
+		assert.strictEqual(symbols.length, 1);
+		assert.strictEqual(symbols[0].name, '# h');
+		assert.strictEqual(symbols[0].children.length, 2);
+		assert.strictEqual(symbols[0].children[0].name, '### h2');
+		assert.strictEqual(symbols[0].children[1].name, '## h3');
+	});
+});
+
diff --git a/extensions/markdown-language-features/yarn.lock b/extensions/markdown-language-features/yarn.lock
index 18ac5da44ed..c44b9715579 100644
--- a/extensions/markdown-language-features/yarn.lock
+++ b/extensions/markdown-language-features/yarn.lock
@@ -5462,9 +5462,9 @@ vscode-extension-telemetry@0.0.17:
   dependencies:
     applicationinsights "1.0.1"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
 
 vscode@^1.1.10:
   version "1.1.10"
diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json
index f58bb6f2a90..81b65c21ac6 100644
--- a/extensions/merge-conflict/package.json
+++ b/extensions/merge-conflict/package.json
@@ -100,7 +100,7 @@
     }
   },
   "dependencies": {
-    "vscode-nls": "^3.2.1"
+    "vscode-nls": "^3.2.4"
   },
   "devDependencies": {
     "@types/node": "8.0.33"
diff --git a/extensions/merge-conflict/yarn.lock b/extensions/merge-conflict/yarn.lock
index 355d778c63c..5b1dccc447c 100644
--- a/extensions/merge-conflict/yarn.lock
+++ b/extensions/merge-conflict/yarn.lock
@@ -6,6 +6,6 @@
   version "8.0.33"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.33.tgz#1126e94374014e54478092830704f6ea89df04cd"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index f45037ec8e7..df9c903fcb4 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -20,7 +20,7 @@
     "jsonc-parser": "^1.0.0",
     "minimatch": "^3.0.4",
     "request-light": "^0.2.2",
-    "vscode-nls": "^3.2.1"
+    "vscode-nls": "^3.2.4"
   },
   "devDependencies": {
     "@types/minimatch": "^3.0.3",
diff --git a/extensions/npm/package.nls.json b/extensions/npm/package.nls.json
index ccc6aa3114c..92665d5f65a 100644
--- a/extensions/npm/package.nls.json
+++ b/extensions/npm/package.nls.json
@@ -1,6 +1,6 @@
 {
 	"description": "Extension to add task support for npm scripts.",
-	"displayName": "Npm support for VSCode",
+	"displayName": "Npm support for VS Code",
 	"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/npm/src/npmView.ts b/extensions/npm/src/npmView.ts
index 3bf86c5b1e2..d4d5279e9a4 100644
--- a/extensions/npm/src/npmView.ts
+++ b/extensions/npm/src/npmView.ts
@@ -164,10 +164,14 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
 	private extractDebugArg(scripts: any, task: Task): [string, number] | undefined {
 		let script: string = scripts[task.name];
 
-		let match = script.match(/--(inspect|debug)(-brk)?(=(\d*))?/);
+		// matches --debug, --debug=1234, --debug-brk, debug-brk=1234, --inspect, 
+		// --inspect=1234, --inspect-brk, --inspect-brk=1234, 
+		// --inspect=localhost:1245, --inspect=127.0.0.1:1234, --inspect=[aa:1:0:0:0]:1234, --inspect=:1234
+		let match = script.match(/--(inspect|debug)(-brk)?(=((\[[0-9a-fA-F:]*\]|[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z0-9\.]*):)?(\d+))?/);
+
 		if (match) {
-			if (match[4]) {
-				return [match[1], parseInt(match[4])];
+			if (match[6]) {
+				return [match[1], parseInt(match[6])];
 			}
 			if (match[1] === 'inspect') {
 				return [match[1], 9229];
diff --git a/extensions/npm/yarn.lock b/extensions/npm/yarn.lock
index 741a6fe9a22..9822a92a784 100644
--- a/extensions/npm/yarn.lock
+++ b/extensions/npm/yarn.lock
@@ -93,6 +93,6 @@ vscode-nls@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
diff --git a/extensions/php-language-features/package.json b/extensions/php-language-features/package.json
index dc2332a328f..e39073271f3 100644
--- a/extensions/php-language-features/package.json
+++ b/extensions/php-language-features/package.json
@@ -77,7 +77,7 @@
 		"watch": "gulp watch-extension:php"
 	},
 	"dependencies": {
-		"vscode-nls": "^3.2.1"
+		"vscode-nls": "^3.2.4"
 	},
 	"devDependencies": {
 		"@types/node": "7.0.43"
diff --git a/extensions/php-language-features/yarn.lock b/extensions/php-language-features/yarn.lock
index 112e5f2ac8d..573098d7d26 100644
--- a/extensions/php-language-features/yarn.lock
+++ b/extensions/php-language-features/yarn.lock
@@ -6,6 +6,6 @@
   version "7.0.43"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
diff --git a/extensions/search-rg/package.json b/extensions/search-rg/package.json
index ce6a1668677..b149088fcf2 100644
--- a/extensions/search-rg/package.json
+++ b/extensions/search-rg/package.json
@@ -14,7 +14,7 @@
   "categories": [],
   "dependencies": {
     "vscode-extension-telemetry": "0.0.15",
-    "vscode-nls": "^3.2.1",
+    "vscode-nls": "^3.2.4",
     "vscode-ripgrep": "^1.0.1"
   },
   "devDependencies": {
diff --git a/extensions/search-rg/src/cachedSearchProvider.ts b/extensions/search-rg/src/cachedSearchProvider.ts
new file mode 100644
index 00000000000..8dba32717e1
--- /dev/null
+++ b/extensions/search-rg/src/cachedSearchProvider.ts
@@ -0,0 +1,229 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as path from 'path';
+import * as vscode from 'vscode';
+import * as arrays from './common/arrays';
+import { compareItemsByScore, IItemAccessor, prepareQuery, ScorerCache } from './common/fileSearchScorer';
+import * as strings from './common/strings';
+import { joinPath } from './utils';
+
+interface IProviderArgs {
+	query: vscode.FileSearchQuery;
+	options: vscode.FileSearchOptions;
+	progress: vscode.Progress<vscode.Uri>;
+	token: vscode.CancellationToken;
+}
+
+export interface IInternalFileSearchProvider {
+	provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void>;
+}
+
+export class CachedSearchProvider {
+
+	private static readonly BATCH_SIZE = 512;
+
+	private caches: { [cacheKey: string]: Cache; } = Object.create(null);
+
+	provideFileSearchResults(provider: IInternalFileSearchProvider, query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<vscode.Uri>, token: vscode.CancellationToken): Thenable<void> {
+		const onResult = (result: IInternalFileMatch) => {
+			progress.report(joinPath(options.folder, result.relativePath));
+		};
+
+		const providerArgs: IProviderArgs = {
+			query, options, progress, token
+		};
+
+		let sortedSearch = this.trySortedSearchFromCache(providerArgs, onResult);
+		if (!sortedSearch) {
+			const engineOpts = options.maxResults ?
+				{
+					...options,
+					...{ maxResults: 1e9 }
+				} :
+				options;
+			providerArgs.options = engineOpts;
+
+			sortedSearch = this.doSortedSearch(providerArgs, provider);
+		}
+
+		return sortedSearch.then(rawMatches => {
+			rawMatches.forEach(onResult);
+		});
+	}
+
+	private doSortedSearch(args: IProviderArgs, provider: IInternalFileSearchProvider): Promise<IInternalFileMatch[]> {
+		const allResultsPromise = new Promise<IInternalFileMatch[]>((c, e) => {
+			const results: IInternalFileMatch[] = [];
+			const onResult = (progress: IInternalFileMatch[]) => results.push(...progress);
+
+			// TODO@roblou set maxResult = null
+			this.doSearch(args, provider, onResult, CachedSearchProvider.BATCH_SIZE)
+				.then(() => c(results), e);
+		});
+
+		let cache: Cache;
+		if (args.query.cacheKey) {
+			cache = this.getOrCreateCache(args.query.cacheKey); // TODO include folder in cache key
+			cache.resultsToSearchCache[args.query.pattern] = { finished: allResultsPromise };
+			allResultsPromise.then(null, err => {
+				delete cache.resultsToSearchCache[args.query.pattern];
+			});
+		}
+
+		return allResultsPromise.then(results => {
+			const scorerCache: ScorerCache = cache ? cache.scorerCache : Object.create(null);
+			return this.sortResults(args, results, scorerCache);
+		});
+	}
+
+	private getOrCreateCache(cacheKey: string): Cache {
+		const existing = this.caches[cacheKey];
+		if (existing) {
+			return existing;
+		}
+		return this.caches[cacheKey] = new Cache();
+	}
+
+	private trySortedSearchFromCache(args: IProviderArgs, onResult: (result: IInternalFileMatch) => void): Promise<IInternalFileMatch[]> {
+		const cache = args.query.cacheKey && this.caches[args.query.cacheKey];
+		if (!cache) {
+			return undefined;
+		}
+
+		const cached = this.getResultsFromCache(cache, args.query.pattern, onResult);
+		if (cached) {
+			return cached.then((results) => this.sortResults(args, results, cache.scorerCache));
+		}
+
+		return undefined;
+	}
+
+	private sortResults(args: IProviderArgs, results: IInternalFileMatch[], scorerCache: ScorerCache): Promise<IInternalFileMatch[]> {
+		// we use the same compare function that is used later when showing the results using fuzzy scoring
+		// this is very important because we are also limiting the number of results by config.maxResults
+		// and as such we want the top items to be included in this result set if the number of items
+		// exceeds config.maxResults.
+		const preparedQuery = prepareQuery(args.query.pattern);
+		const compare = (matchA: IInternalFileMatch, matchB: IInternalFileMatch) => compareItemsByScore(matchA, matchB, preparedQuery, true, FileMatchItemAccessor, scorerCache);
+
+		return arrays.topAsync(results, compare, args.options.maxResults || 0, 10000);
+	}
+
+	private getResultsFromCache(cache: Cache, searchValue: string, onResult: (results: IInternalFileMatch) => void): Promise<IInternalFileMatch[]> {
+		// Find cache entries by prefix of search value
+		const hasPathSep = searchValue.indexOf(path.sep) >= 0;
+		let cached: CacheEntry<IInternalFileMatch>;
+		let wasResolved: boolean;
+		for (let previousSearch in cache.resultsToSearchCache) {
+			// If we narrow down, we might be able to reuse the cached results
+			if (searchValue.startsWith(previousSearch)) {
+				if (hasPathSep && previousSearch.indexOf(path.sep) < 0) {
+					continue; // since a path character widens the search for potential more matches, require it in previous search too
+				}
+
+				const c = cache.resultsToSearchCache[previousSearch];
+				c.finished.then(() => { wasResolved = false; });
+				cached = c;
+				wasResolved = true;
+				break;
+			}
+		}
+
+		if (!cached) {
+			return null;
+		}
+
+		return new Promise((c, e) => {
+			cached.finished.then(cachedEntries => {
+				const cacheFilterStartTime = Date.now();
+
+				// Pattern match on results
+				let results: IInternalFileMatch[] = [];
+				const normalizedSearchValueLowercase = strings.stripWildcards(searchValue).toLowerCase();
+				for (let i = 0; i < cachedEntries.length; i++) {
+					let entry = cachedEntries[i];
+
+					// Check if this entry is a match for the search value
+					if (!strings.fuzzyContains(entry.relativePath, normalizedSearchValueLowercase)) {
+						continue;
+					}
+
+					results.push(entry);
+				}
+
+				c(results);
+			}, e);
+		});
+	}
+
+	private doSearch(args: IProviderArgs, provider: IInternalFileSearchProvider, onResult: (result: IInternalFileMatch[]) => void, batchSize: number): Promise<void> {
+		return new Promise<void>((c, e) => {
+			let batch: IInternalFileMatch[] = [];
+			const onProviderResult = (match: string) => {
+				if (match) {
+					const internalMatch: IInternalFileMatch = {
+						relativePath: match,
+						basename: path.basename(match)
+					};
+
+					batch.push(internalMatch);
+					if (batchSize > 0 && batch.length >= batchSize) {
+						onResult(batch);
+						batch = [];
+					}
+				}
+			};
+
+			provider.provideFileSearchResults(args.options, { report: onProviderResult }, args.token).then(() => {
+				if (batch.length) {
+					onResult(batch);
+				}
+
+				c();
+			}, error => {
+				if (batch.length) {
+					onResult(batch);
+				}
+
+				e(error);
+			});
+		});
+	}
+
+	public clearCache(cacheKey: string): Promise<void> {
+		delete this.caches[cacheKey];
+		return Promise.resolve(undefined);
+	}
+}
+
+interface IInternalFileMatch {
+	relativePath?: string; // Not present for extraFiles or absolute path matches
+	basename: string;
+}
+
+interface CacheEntry<T> {
+	finished: Promise<T[]>;
+}
+
+class Cache {
+	public resultsToSearchCache: { [searchValue: string]: CacheEntry<IInternalFileMatch> } = Object.create(null);
+	public scorerCache: ScorerCache = Object.create(null);
+}
+
+const FileMatchItemAccessor = new class implements IItemAccessor<IInternalFileMatch> {
+
+	public getItemLabel(match: IInternalFileMatch): string {
+		return match.basename; // e.g. myFile.txt
+	}
+
+	public getItemDescription(match: IInternalFileMatch): string {
+		return match.relativePath.substr(0, match.relativePath.length - match.basename.length - 1); // e.g. some/path/to/file
+	}
+
+	public getItemPath(match: IInternalFileMatch): string {
+		return match.relativePath; // e.g. some/path/to/file/myFile.txt
+	}
+};
diff --git a/extensions/search-rg/src/common/arrays.ts b/extensions/search-rg/src/common/arrays.ts
new file mode 100644
index 00000000000..d06d185dfa5
--- /dev/null
+++ b/extensions/search-rg/src/common/arrays.ts
@@ -0,0 +1,75 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/**
+ * Asynchronous variant of `top()` allowing for splitting up work in batches between which the event loop can run.
+ *
+ * Returns the top N elements from the array.
+ *
+ * Faster than sorting the entire array when the array is a lot larger than N.
+ *
+ * @param array The unsorted array.
+ * @param compare A sort function for the elements.
+ * @param n The number of elements to return.
+ * @param batch The number of elements to examine before yielding to the event loop.
+ * @return The first n elemnts from array when sorted with compare.
+ */
+export function topAsync<T>(array: T[], compare: (a: T, b: T) => number, n: number, batch: number): Promise<T[]> {
+	// TODO@roblou cancellation
+
+	if (n === 0) {
+		return Promise.resolve([]);
+	}
+	let canceled = false;
+	return new Promise((resolve, reject) => {
+		(async () => {
+			const o = array.length;
+			const result = array.slice(0, n).sort(compare);
+			for (let i = n, m = Math.min(n + batch, o); i < o; i = m, m = Math.min(m + batch, o)) {
+				if (i > n) {
+					await new Promise(resolve => setTimeout(resolve, 0)); // nextTick() would starve I/O.
+				}
+				if (canceled) {
+					throw new Error('canceled');
+				}
+				topStep(array, compare, result, i, m);
+			}
+			return result;
+		})()
+			.then(resolve, reject);
+	});
+}
+
+function topStep<T>(array: T[], compare: (a: T, b: T) => number, result: T[], i: number, m: number): void {
+	for (const n = result.length; i < m; i++) {
+		const element = array[i];
+		if (compare(element, result[n - 1]) < 0) {
+			result.pop();
+			const j = findFirstInSorted(result, e => compare(element, e) < 0);
+			result.splice(j, 0, element);
+		}
+	}
+}
+
+/**
+ * Takes a sorted array and a function p. The array is sorted in such a way that all elements where p(x) is false
+ * are located before all elements where p(x) is true.
+ * @returns the least x for which p(x) is true or array.length if no element fullfills the given function.
+ */
+export function findFirstInSorted<T>(array: T[], p: (x: T) => boolean): number {
+	let low = 0, high = array.length;
+	if (high === 0) {
+		return 0; // no children
+	}
+	while (low < high) {
+		let mid = Math.floor((low + high) / 2);
+		if (p(array[mid])) {
+			high = mid;
+		} else {
+			low = mid + 1;
+		}
+	}
+	return low;
+}
diff --git a/extensions/search-rg/src/common/charCode.ts b/extensions/search-rg/src/common/charCode.ts
new file mode 100644
index 00000000000..dd1bc58f80b
--- /dev/null
+++ b/extensions/search-rg/src/common/charCode.ts
@@ -0,0 +1,422 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+// Names from https://blog.codinghorror.com/ascii-pronunciation-rules-for-programmers/
+
+/**
+ * An inlined enum containing useful character codes (to be used with String.charCodeAt).
+ * Please leave the const keyword such that it gets inlined when compiled to JavaScript!
+ */
+export const enum CharCode {
+	Null = 0,
+	/**
+	 * The `\t` character.
+	 */
+	Tab = 9,
+	/**
+	 * The `\n` character.
+	 */
+	LineFeed = 10,
+	/**
+	 * The `\r` character.
+	 */
+	CarriageReturn = 13,
+	Space = 32,
+	/**
+	 * The `!` character.
+	 */
+	ExclamationMark = 33,
+	/**
+	 * The `"` character.
+	 */
+	DoubleQuote = 34,
+	/**
+	 * The `#` character.
+	 */
+	Hash = 35,
+	/**
+	 * The `$` character.
+	 */
+	DollarSign = 36,
+	/**
+	 * The `%` character.
+	 */
+	PercentSign = 37,
+	/**
+	 * The `&` character.
+	 */
+	Ampersand = 38,
+	/**
+	 * The `'` character.
+	 */
+	SingleQuote = 39,
+	/**
+	 * The `(` character.
+	 */
+	OpenParen = 40,
+	/**
+	 * The `)` character.
+	 */
+	CloseParen = 41,
+	/**
+	 * The `*` character.
+	 */
+	Asterisk = 42,
+	/**
+	 * The `+` character.
+	 */
+	Plus = 43,
+	/**
+	 * The `,` character.
+	 */
+	Comma = 44,
+	/**
+	 * The `-` character.
+	 */
+	Dash = 45,
+	/**
+	 * The `.` character.
+	 */
+	Period = 46,
+	/**
+	 * The `/` character.
+	 */
+	Slash = 47,
+
+	Digit0 = 48,
+	Digit1 = 49,
+	Digit2 = 50,
+	Digit3 = 51,
+	Digit4 = 52,
+	Digit5 = 53,
+	Digit6 = 54,
+	Digit7 = 55,
+	Digit8 = 56,
+	Digit9 = 57,
+
+	/**
+	 * The `:` character.
+	 */
+	Colon = 58,
+	/**
+	 * The `;` character.
+	 */
+	Semicolon = 59,
+	/**
+	 * The `<` character.
+	 */
+	LessThan = 60,
+	/**
+	 * The `=` character.
+	 */
+	Equals = 61,
+	/**
+	 * The `>` character.
+	 */
+	GreaterThan = 62,
+	/**
+	 * The `?` character.
+	 */
+	QuestionMark = 63,
+	/**
+	 * The `@` character.
+	 */
+	AtSign = 64,
+
+	A = 65,
+	B = 66,
+	C = 67,
+	D = 68,
+	E = 69,
+	F = 70,
+	G = 71,
+	H = 72,
+	I = 73,
+	J = 74,
+	K = 75,
+	L = 76,
+	M = 77,
+	N = 78,
+	O = 79,
+	P = 80,
+	Q = 81,
+	R = 82,
+	S = 83,
+	T = 84,
+	U = 85,
+	V = 86,
+	W = 87,
+	X = 88,
+	Y = 89,
+	Z = 90,
+
+	/**
+	 * The `[` character.
+	 */
+	OpenSquareBracket = 91,
+	/**
+	 * The `\` character.
+	 */
+	Backslash = 92,
+	/**
+	 * The `]` character.
+	 */
+	CloseSquareBracket = 93,
+	/**
+	 * The `^` character.
+	 */
+	Caret = 94,
+	/**
+	 * The `_` character.
+	 */
+	Underline = 95,
+	/**
+	 * The ``(`)`` character.
+	 */
+	BackTick = 96,
+
+	a = 97,
+	b = 98,
+	c = 99,
+	d = 100,
+	e = 101,
+	f = 102,
+	g = 103,
+	h = 104,
+	i = 105,
+	j = 106,
+	k = 107,
+	l = 108,
+	m = 109,
+	n = 110,
+	o = 111,
+	p = 112,
+	q = 113,
+	r = 114,
+	s = 115,
+	t = 116,
+	u = 117,
+	v = 118,
+	w = 119,
+	x = 120,
+	y = 121,
+	z = 122,
+
+	/**
+	 * The `{` character.
+	 */
+	OpenCurlyBrace = 123,
+	/**
+	 * The `|` character.
+	 */
+	Pipe = 124,
+	/**
+	 * The `}` character.
+	 */
+	CloseCurlyBrace = 125,
+	/**
+	 * The `~` character.
+	 */
+	Tilde = 126,
+
+	U_Combining_Grave_Accent = 0x0300,								//	U+0300	Combining Grave Accent
+	U_Combining_Acute_Accent = 0x0301,								//	U+0301	Combining Acute Accent
+	U_Combining_Circumflex_Accent = 0x0302,							//	U+0302	Combining Circumflex Accent
+	U_Combining_Tilde = 0x0303,										//	U+0303	Combining Tilde
+	U_Combining_Macron = 0x0304,									//	U+0304	Combining Macron
+	U_Combining_Overline = 0x0305,									//	U+0305	Combining Overline
+	U_Combining_Breve = 0x0306,										//	U+0306	Combining Breve
+	U_Combining_Dot_Above = 0x0307,									//	U+0307	Combining Dot Above
+	U_Combining_Diaeresis = 0x0308,									//	U+0308	Combining Diaeresis
+	U_Combining_Hook_Above = 0x0309,								//	U+0309	Combining Hook Above
+	U_Combining_Ring_Above = 0x030A,								//	U+030A	Combining Ring Above
+	U_Combining_Double_Acute_Accent = 0x030B,						//	U+030B	Combining Double Acute Accent
+	U_Combining_Caron = 0x030C,										//	U+030C	Combining Caron
+	U_Combining_Vertical_Line_Above = 0x030D,						//	U+030D	Combining Vertical Line Above
+	U_Combining_Double_Vertical_Line_Above = 0x030E,				//	U+030E	Combining Double Vertical Line Above
+	U_Combining_Double_Grave_Accent = 0x030F,						//	U+030F	Combining Double Grave Accent
+	U_Combining_Candrabindu = 0x0310,								//	U+0310	Combining Candrabindu
+	U_Combining_Inverted_Breve = 0x0311,							//	U+0311	Combining Inverted Breve
+	U_Combining_Turned_Comma_Above = 0x0312,						//	U+0312	Combining Turned Comma Above
+	U_Combining_Comma_Above = 0x0313,								//	U+0313	Combining Comma Above
+	U_Combining_Reversed_Comma_Above = 0x0314,						//	U+0314	Combining Reversed Comma Above
+	U_Combining_Comma_Above_Right = 0x0315,							//	U+0315	Combining Comma Above Right
+	U_Combining_Grave_Accent_Below = 0x0316,						//	U+0316	Combining Grave Accent Below
+	U_Combining_Acute_Accent_Below = 0x0317,						//	U+0317	Combining Acute Accent Below
+	U_Combining_Left_Tack_Below = 0x0318,							//	U+0318	Combining Left Tack Below
+	U_Combining_Right_Tack_Below = 0x0319,							//	U+0319	Combining Right Tack Below
+	U_Combining_Left_Angle_Above = 0x031A,							//	U+031A	Combining Left Angle Above
+	U_Combining_Horn = 0x031B,										//	U+031B	Combining Horn
+	U_Combining_Left_Half_Ring_Below = 0x031C,						//	U+031C	Combining Left Half Ring Below
+	U_Combining_Up_Tack_Below = 0x031D,								//	U+031D	Combining Up Tack Below
+	U_Combining_Down_Tack_Below = 0x031E,							//	U+031E	Combining Down Tack Below
+	U_Combining_Plus_Sign_Below = 0x031F,							//	U+031F	Combining Plus Sign Below
+	U_Combining_Minus_Sign_Below = 0x0320,							//	U+0320	Combining Minus Sign Below
+	U_Combining_Palatalized_Hook_Below = 0x0321,					//	U+0321	Combining Palatalized Hook Below
+	U_Combining_Retroflex_Hook_Below = 0x0322,						//	U+0322	Combining Retroflex Hook Below
+	U_Combining_Dot_Below = 0x0323,									//	U+0323	Combining Dot Below
+	U_Combining_Diaeresis_Below = 0x0324,							//	U+0324	Combining Diaeresis Below
+	U_Combining_Ring_Below = 0x0325,								//	U+0325	Combining Ring Below
+	U_Combining_Comma_Below = 0x0326,								//	U+0326	Combining Comma Below
+	U_Combining_Cedilla = 0x0327,									//	U+0327	Combining Cedilla
+	U_Combining_Ogonek = 0x0328,									//	U+0328	Combining Ogonek
+	U_Combining_Vertical_Line_Below = 0x0329,						//	U+0329	Combining Vertical Line Below
+	U_Combining_Bridge_Below = 0x032A,								//	U+032A	Combining Bridge Below
+	U_Combining_Inverted_Double_Arch_Below = 0x032B,				//	U+032B	Combining Inverted Double Arch Below
+	U_Combining_Caron_Below = 0x032C,								//	U+032C	Combining Caron Below
+	U_Combining_Circumflex_Accent_Below = 0x032D,					//	U+032D	Combining Circumflex Accent Below
+	U_Combining_Breve_Below = 0x032E,								//	U+032E	Combining Breve Below
+	U_Combining_Inverted_Breve_Below = 0x032F,						//	U+032F	Combining Inverted Breve Below
+	U_Combining_Tilde_Below = 0x0330,								//	U+0330	Combining Tilde Below
+	U_Combining_Macron_Below = 0x0331,								//	U+0331	Combining Macron Below
+	U_Combining_Low_Line = 0x0332,									//	U+0332	Combining Low Line
+	U_Combining_Double_Low_Line = 0x0333,							//	U+0333	Combining Double Low Line
+	U_Combining_Tilde_Overlay = 0x0334,								//	U+0334	Combining Tilde Overlay
+	U_Combining_Short_Stroke_Overlay = 0x0335,						//	U+0335	Combining Short Stroke Overlay
+	U_Combining_Long_Stroke_Overlay = 0x0336,						//	U+0336	Combining Long Stroke Overlay
+	U_Combining_Short_Solidus_Overlay = 0x0337,						//	U+0337	Combining Short Solidus Overlay
+	U_Combining_Long_Solidus_Overlay = 0x0338,						//	U+0338	Combining Long Solidus Overlay
+	U_Combining_Right_Half_Ring_Below = 0x0339,						//	U+0339	Combining Right Half Ring Below
+	U_Combining_Inverted_Bridge_Below = 0x033A,						//	U+033A	Combining Inverted Bridge Below
+	U_Combining_Square_Below = 0x033B,								//	U+033B	Combining Square Below
+	U_Combining_Seagull_Below = 0x033C,								//	U+033C	Combining Seagull Below
+	U_Combining_X_Above = 0x033D,									//	U+033D	Combining X Above
+	U_Combining_Vertical_Tilde = 0x033E,							//	U+033E	Combining Vertical Tilde
+	U_Combining_Double_Overline = 0x033F,							//	U+033F	Combining Double Overline
+	U_Combining_Grave_Tone_Mark = 0x0340,							//	U+0340	Combining Grave Tone Mark
+	U_Combining_Acute_Tone_Mark = 0x0341,							//	U+0341	Combining Acute Tone Mark
+	U_Combining_Greek_Perispomeni = 0x0342,							//	U+0342	Combining Greek Perispomeni
+	U_Combining_Greek_Koronis = 0x0343,								//	U+0343	Combining Greek Koronis
+	U_Combining_Greek_Dialytika_Tonos = 0x0344,						//	U+0344	Combining Greek Dialytika Tonos
+	U_Combining_Greek_Ypogegrammeni = 0x0345,						//	U+0345	Combining Greek Ypogegrammeni
+	U_Combining_Bridge_Above = 0x0346,								//	U+0346	Combining Bridge Above
+	U_Combining_Equals_Sign_Below = 0x0347,							//	U+0347	Combining Equals Sign Below
+	U_Combining_Double_Vertical_Line_Below = 0x0348,				//	U+0348	Combining Double Vertical Line Below
+	U_Combining_Left_Angle_Below = 0x0349,							//	U+0349	Combining Left Angle Below
+	U_Combining_Not_Tilde_Above = 0x034A,							//	U+034A	Combining Not Tilde Above
+	U_Combining_Homothetic_Above = 0x034B,							//	U+034B	Combining Homothetic Above
+	U_Combining_Almost_Equal_To_Above = 0x034C,						//	U+034C	Combining Almost Equal To Above
+	U_Combining_Left_Right_Arrow_Below = 0x034D,					//	U+034D	Combining Left Right Arrow Below
+	U_Combining_Upwards_Arrow_Below = 0x034E,						//	U+034E	Combining Upwards Arrow Below
+	U_Combining_Grapheme_Joiner = 0x034F,							//	U+034F	Combining Grapheme Joiner
+	U_Combining_Right_Arrowhead_Above = 0x0350,						//	U+0350	Combining Right Arrowhead Above
+	U_Combining_Left_Half_Ring_Above = 0x0351,						//	U+0351	Combining Left Half Ring Above
+	U_Combining_Fermata = 0x0352,									//	U+0352	Combining Fermata
+	U_Combining_X_Below = 0x0353,									//	U+0353	Combining X Below
+	U_Combining_Left_Arrowhead_Below = 0x0354,						//	U+0354	Combining Left Arrowhead Below
+	U_Combining_Right_Arrowhead_Below = 0x0355,						//	U+0355	Combining Right Arrowhead Below
+	U_Combining_Right_Arrowhead_And_Up_Arrowhead_Below = 0x0356,	//	U+0356	Combining Right Arrowhead And Up Arrowhead Below
+	U_Combining_Right_Half_Ring_Above = 0x0357,						//	U+0357	Combining Right Half Ring Above
+	U_Combining_Dot_Above_Right = 0x0358,							//	U+0358	Combining Dot Above Right
+	U_Combining_Asterisk_Below = 0x0359,							//	U+0359	Combining Asterisk Below
+	U_Combining_Double_Ring_Below = 0x035A,							//	U+035A	Combining Double Ring Below
+	U_Combining_Zigzag_Above = 0x035B,								//	U+035B	Combining Zigzag Above
+	U_Combining_Double_Breve_Below = 0x035C,						//	U+035C	Combining Double Breve Below
+	U_Combining_Double_Breve = 0x035D,								//	U+035D	Combining Double Breve
+	U_Combining_Double_Macron = 0x035E,								//	U+035E	Combining Double Macron
+	U_Combining_Double_Macron_Below = 0x035F,						//	U+035F	Combining Double Macron Below
+	U_Combining_Double_Tilde = 0x0360,								//	U+0360	Combining Double Tilde
+	U_Combining_Double_Inverted_Breve = 0x0361,						//	U+0361	Combining Double Inverted Breve
+	U_Combining_Double_Rightwards_Arrow_Below = 0x0362,				//	U+0362	Combining Double Rightwards Arrow Below
+	U_Combining_Latin_Small_Letter_A = 0x0363, 						//	U+0363	Combining Latin Small Letter A
+	U_Combining_Latin_Small_Letter_E = 0x0364, 						//	U+0364	Combining Latin Small Letter E
+	U_Combining_Latin_Small_Letter_I = 0x0365, 						//	U+0365	Combining Latin Small Letter I
+	U_Combining_Latin_Small_Letter_O = 0x0366, 						//	U+0366	Combining Latin Small Letter O
+	U_Combining_Latin_Small_Letter_U = 0x0367, 						//	U+0367	Combining Latin Small Letter U
+	U_Combining_Latin_Small_Letter_C = 0x0368, 						//	U+0368	Combining Latin Small Letter C
+	U_Combining_Latin_Small_Letter_D = 0x0369, 						//	U+0369	Combining Latin Small Letter D
+	U_Combining_Latin_Small_Letter_H = 0x036A, 						//	U+036A	Combining Latin Small Letter H
+	U_Combining_Latin_Small_Letter_M = 0x036B, 						//	U+036B	Combining Latin Small Letter M
+	U_Combining_Latin_Small_Letter_R = 0x036C, 						//	U+036C	Combining Latin Small Letter R
+	U_Combining_Latin_Small_Letter_T = 0x036D, 						//	U+036D	Combining Latin Small Letter T
+	U_Combining_Latin_Small_Letter_V = 0x036E, 						//	U+036E	Combining Latin Small Letter V
+	U_Combining_Latin_Small_Letter_X = 0x036F, 						//	U+036F	Combining Latin Small Letter X
+
+	/**
+	 * Unicode Character 'LINE SEPARATOR' (U+2028)
+	 * http://www.fileformat.info/info/unicode/char/2028/index.htm
+	 */
+	LINE_SEPARATOR_2028 = 8232,
+
+	// http://www.fileformat.info/info/unicode/category/Sk/list.htm
+	U_CIRCUMFLEX = 0x005E,									// U+005E	CIRCUMFLEX
+	U_GRAVE_ACCENT = 0x0060,								// U+0060	GRAVE ACCENT
+	U_DIAERESIS = 0x00A8,									// U+00A8	DIAERESIS
+	U_MACRON = 0x00AF,										// U+00AF	MACRON
+	U_ACUTE_ACCENT = 0x00B4,								// U+00B4	ACUTE ACCENT
+	U_CEDILLA = 0x00B8,										// U+00B8	CEDILLA
+	U_MODIFIER_LETTER_LEFT_ARROWHEAD = 0x02C2,				// U+02C2	MODIFIER LETTER LEFT ARROWHEAD
+	U_MODIFIER_LETTER_RIGHT_ARROWHEAD = 0x02C3,				// U+02C3	MODIFIER LETTER RIGHT ARROWHEAD
+	U_MODIFIER_LETTER_UP_ARROWHEAD = 0x02C4,				// U+02C4	MODIFIER LETTER UP ARROWHEAD
+	U_MODIFIER_LETTER_DOWN_ARROWHEAD = 0x02C5,				// U+02C5	MODIFIER LETTER DOWN ARROWHEAD
+	U_MODIFIER_LETTER_CENTRED_RIGHT_HALF_RING = 0x02D2,		// U+02D2	MODIFIER LETTER CENTRED RIGHT HALF RING
+	U_MODIFIER_LETTER_CENTRED_LEFT_HALF_RING = 0x02D3,		// U+02D3	MODIFIER LETTER CENTRED LEFT HALF RING
+	U_MODIFIER_LETTER_UP_TACK = 0x02D4,						// U+02D4	MODIFIER LETTER UP TACK
+	U_MODIFIER_LETTER_DOWN_TACK = 0x02D5,					// U+02D5	MODIFIER LETTER DOWN TACK
+	U_MODIFIER_LETTER_PLUS_SIGN = 0x02D6,					// U+02D6	MODIFIER LETTER PLUS SIGN
+	U_MODIFIER_LETTER_MINUS_SIGN = 0x02D7,					// U+02D7	MODIFIER LETTER MINUS SIGN
+	U_BREVE = 0x02D8,										// U+02D8	BREVE
+	U_DOT_ABOVE = 0x02D9,									// U+02D9	DOT ABOVE
+	U_RING_ABOVE = 0x02DA,									// U+02DA	RING ABOVE
+	U_OGONEK = 0x02DB,										// U+02DB	OGONEK
+	U_SMALL_TILDE = 0x02DC,									// U+02DC	SMALL TILDE
+	U_DOUBLE_ACUTE_ACCENT = 0x02DD,							// U+02DD	DOUBLE ACUTE ACCENT
+	U_MODIFIER_LETTER_RHOTIC_HOOK = 0x02DE,					// U+02DE	MODIFIER LETTER RHOTIC HOOK
+	U_MODIFIER_LETTER_CROSS_ACCENT = 0x02DF,				// U+02DF	MODIFIER LETTER CROSS ACCENT
+	U_MODIFIER_LETTER_EXTRA_HIGH_TONE_BAR = 0x02E5,			// U+02E5	MODIFIER LETTER EXTRA-HIGH TONE BAR
+	U_MODIFIER_LETTER_HIGH_TONE_BAR = 0x02E6,				// U+02E6	MODIFIER LETTER HIGH TONE BAR
+	U_MODIFIER_LETTER_MID_TONE_BAR = 0x02E7,				// U+02E7	MODIFIER LETTER MID TONE BAR
+	U_MODIFIER_LETTER_LOW_TONE_BAR = 0x02E8,				// U+02E8	MODIFIER LETTER LOW TONE BAR
+	U_MODIFIER_LETTER_EXTRA_LOW_TONE_BAR = 0x02E9,			// U+02E9	MODIFIER LETTER EXTRA-LOW TONE BAR
+	U_MODIFIER_LETTER_YIN_DEPARTING_TONE_MARK = 0x02EA,		// U+02EA	MODIFIER LETTER YIN DEPARTING TONE MARK
+	U_MODIFIER_LETTER_YANG_DEPARTING_TONE_MARK = 0x02EB,	// U+02EB	MODIFIER LETTER YANG DEPARTING TONE MARK
+	U_MODIFIER_LETTER_UNASPIRATED = 0x02ED,					// U+02ED	MODIFIER LETTER UNASPIRATED
+	U_MODIFIER_LETTER_LOW_DOWN_ARROWHEAD = 0x02EF,			// U+02EF	MODIFIER LETTER LOW DOWN ARROWHEAD
+	U_MODIFIER_LETTER_LOW_UP_ARROWHEAD = 0x02F0,			// U+02F0	MODIFIER LETTER LOW UP ARROWHEAD
+	U_MODIFIER_LETTER_LOW_LEFT_ARROWHEAD = 0x02F1,			// U+02F1	MODIFIER LETTER LOW LEFT ARROWHEAD
+	U_MODIFIER_LETTER_LOW_RIGHT_ARROWHEAD = 0x02F2,			// U+02F2	MODIFIER LETTER LOW RIGHT ARROWHEAD
+	U_MODIFIER_LETTER_LOW_RING = 0x02F3,					// U+02F3	MODIFIER LETTER LOW RING
+	U_MODIFIER_LETTER_MIDDLE_GRAVE_ACCENT = 0x02F4,			// U+02F4	MODIFIER LETTER MIDDLE GRAVE ACCENT
+	U_MODIFIER_LETTER_MIDDLE_DOUBLE_GRAVE_ACCENT = 0x02F5,	// U+02F5	MODIFIER LETTER MIDDLE DOUBLE GRAVE ACCENT
+	U_MODIFIER_LETTER_MIDDLE_DOUBLE_ACUTE_ACCENT = 0x02F6,	// U+02F6	MODIFIER LETTER MIDDLE DOUBLE ACUTE ACCENT
+	U_MODIFIER_LETTER_LOW_TILDE = 0x02F7,					// U+02F7	MODIFIER LETTER LOW TILDE
+	U_MODIFIER_LETTER_RAISED_COLON = 0x02F8,				// U+02F8	MODIFIER LETTER RAISED COLON
+	U_MODIFIER_LETTER_BEGIN_HIGH_TONE = 0x02F9,				// U+02F9	MODIFIER LETTER BEGIN HIGH TONE
+	U_MODIFIER_LETTER_END_HIGH_TONE = 0x02FA,				// U+02FA	MODIFIER LETTER END HIGH TONE
+	U_MODIFIER_LETTER_BEGIN_LOW_TONE = 0x02FB,				// U+02FB	MODIFIER LETTER BEGIN LOW TONE
+	U_MODIFIER_LETTER_END_LOW_TONE = 0x02FC,				// U+02FC	MODIFIER LETTER END LOW TONE
+	U_MODIFIER_LETTER_SHELF = 0x02FD,						// U+02FD	MODIFIER LETTER SHELF
+	U_MODIFIER_LETTER_OPEN_SHELF = 0x02FE,					// U+02FE	MODIFIER LETTER OPEN SHELF
+	U_MODIFIER_LETTER_LOW_LEFT_ARROW = 0x02FF,				// U+02FF	MODIFIER LETTER LOW LEFT ARROW
+	U_GREEK_LOWER_NUMERAL_SIGN = 0x0375,					// U+0375	GREEK LOWER NUMERAL SIGN
+	U_GREEK_TONOS = 0x0384,									// U+0384	GREEK TONOS
+	U_GREEK_DIALYTIKA_TONOS = 0x0385,						// U+0385	GREEK DIALYTIKA TONOS
+	U_GREEK_KORONIS = 0x1FBD,								// U+1FBD	GREEK KORONIS
+	U_GREEK_PSILI = 0x1FBF,									// U+1FBF	GREEK PSILI
+	U_GREEK_PERISPOMENI = 0x1FC0,							// U+1FC0	GREEK PERISPOMENI
+	U_GREEK_DIALYTIKA_AND_PERISPOMENI = 0x1FC1,				// U+1FC1	GREEK DIALYTIKA AND PERISPOMENI
+	U_GREEK_PSILI_AND_VARIA = 0x1FCD,						// U+1FCD	GREEK PSILI AND VARIA
+	U_GREEK_PSILI_AND_OXIA = 0x1FCE,						// U+1FCE	GREEK PSILI AND OXIA
+	U_GREEK_PSILI_AND_PERISPOMENI = 0x1FCF,					// U+1FCF	GREEK PSILI AND PERISPOMENI
+	U_GREEK_DASIA_AND_VARIA = 0x1FDD,						// U+1FDD	GREEK DASIA AND VARIA
+	U_GREEK_DASIA_AND_OXIA = 0x1FDE,						// U+1FDE	GREEK DASIA AND OXIA
+	U_GREEK_DASIA_AND_PERISPOMENI = 0x1FDF,					// U+1FDF	GREEK DASIA AND PERISPOMENI
+	U_GREEK_DIALYTIKA_AND_VARIA = 0x1FED,					// U+1FED	GREEK DIALYTIKA AND VARIA
+	U_GREEK_DIALYTIKA_AND_OXIA = 0x1FEE,					// U+1FEE	GREEK DIALYTIKA AND OXIA
+	U_GREEK_VARIA = 0x1FEF,									// U+1FEF	GREEK VARIA
+	U_GREEK_OXIA = 0x1FFD,									// U+1FFD	GREEK OXIA
+	U_GREEK_DASIA = 0x1FFE,									// U+1FFE	GREEK DASIA
+
+
+	U_OVERLINE = 0x203E, // Unicode Character 'OVERLINE'
+
+	/**
+	 * UTF-8 BOM
+	 * Unicode Character 'ZERO WIDTH NO-BREAK SPACE' (U+FEFF)
+	 * http://www.fileformat.info/info/unicode/char/feff/index.htm
+	 */
+	UTF8_BOM = 65279
+}
diff --git a/extensions/search-rg/src/common/comparers.ts b/extensions/search-rg/src/common/comparers.ts
new file mode 100644
index 00000000000..fc6022526db
--- /dev/null
+++ b/extensions/search-rg/src/common/comparers.ts
@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 strings from './strings';
+
+let intlFileNameCollator: Intl.Collator;
+let intlFileNameCollatorIsNumeric: boolean;
+
+setFileNameComparer(new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' }));
+
+export function setFileNameComparer(collator: Intl.Collator): void {
+	intlFileNameCollator = collator;
+	intlFileNameCollatorIsNumeric = collator.resolvedOptions().numeric;
+}
+
+export function compareFileNames(one: string, other: string, caseSensitive = false): number {
+	if (intlFileNameCollator) {
+		const a = one || '';
+		const b = other || '';
+		const result = intlFileNameCollator.compare(a, b);
+
+		// Using the numeric option in the collator will
+		// make compare(`foo1`, `foo01`) === 0. We must disambiguate.
+		if (intlFileNameCollatorIsNumeric && result === 0 && a !== b) {
+			return a < b ? -1 : 1;
+		}
+
+		return result;
+	}
+
+	return noIntlCompareFileNames(one, other, caseSensitive);
+}
+
+const FileNameMatch = /^(.*?)(\.([^.]*))?$/;
+
+export function noIntlCompareFileNames(one: string, other: string, caseSensitive = false): number {
+	if (!caseSensitive) {
+		one = one && one.toLowerCase();
+		other = other && other.toLowerCase();
+	}
+
+	const [oneName, oneExtension] = extractNameAndExtension(one);
+	const [otherName, otherExtension] = extractNameAndExtension(other);
+
+	if (oneName !== otherName) {
+		return oneName < otherName ? -1 : 1;
+	}
+
+	if (oneExtension === otherExtension) {
+		return 0;
+	}
+
+	return oneExtension < otherExtension ? -1 : 1;
+}
+
+function extractNameAndExtension(str?: string): [string, string] {
+	const match = str ? FileNameMatch.exec(str) : [] as RegExpExecArray;
+
+	return [(match && match[1]) || '', (match && match[3]) || ''];
+}
+
+export function compareAnything(one: string, other: string, lookFor: string): number {
+	let elementAName = one.toLowerCase();
+	let elementBName = other.toLowerCase();
+
+	// Sort prefix matches over non prefix matches
+	const prefixCompare = compareByPrefix(one, other, lookFor);
+	if (prefixCompare) {
+		return prefixCompare;
+	}
+
+	// Sort suffix matches over non suffix matches
+	let elementASuffixMatch = strings.endsWith(elementAName, lookFor);
+	let elementBSuffixMatch = strings.endsWith(elementBName, lookFor);
+	if (elementASuffixMatch !== elementBSuffixMatch) {
+		return elementASuffixMatch ? -1 : 1;
+	}
+
+	// Understand file names
+	let r = compareFileNames(elementAName, elementBName);
+	if (r !== 0) {
+		return r;
+	}
+
+	// Compare by name
+	return elementAName.localeCompare(elementBName);
+}
+
+export function compareByPrefix(one: string, other: string, lookFor: string): number {
+	let elementAName = one.toLowerCase();
+	let elementBName = other.toLowerCase();
+
+	// Sort prefix matches over non prefix matches
+	let elementAPrefixMatch = strings.startsWith(elementAName, lookFor);
+	let elementBPrefixMatch = strings.startsWith(elementBName, lookFor);
+	if (elementAPrefixMatch !== elementBPrefixMatch) {
+		return elementAPrefixMatch ? -1 : 1;
+	}
+
+	// Same prefix: Sort shorter matches to the top to have those on top that match more precisely
+	else if (elementAPrefixMatch && elementBPrefixMatch) {
+		if (elementAName.length < elementBName.length) {
+			return -1;
+		}
+
+		if (elementAName.length > elementBName.length) {
+			return 1;
+		}
+	}
+
+	return 0;
+}
diff --git a/extensions/search-rg/src/common/fileSearchScorer.ts b/extensions/search-rg/src/common/fileSearchScorer.ts
new file mode 100644
index 00000000000..d73d7c77f41
--- /dev/null
+++ b/extensions/search-rg/src/common/fileSearchScorer.ts
@@ -0,0 +1,619 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { stripWildcards, equalsIgnoreCase } from './strings';
+import { matchesPrefix, matchesCamelCase, createMatches, IMatch, isUpper } from './filters';
+import { compareAnything } from './comparers';
+import { CharCode } from './charCode';
+
+const isWindows = process.platform === 'win32';
+const isMacintosh = (process.platform === 'darwin');
+const isLinux = (process.platform === 'linux');
+
+const nativeSep = isWindows ? '\\' : '/';
+
+export type Score = [number /* score */, number[] /* match positions */];
+export type ScorerCache = { [key: string]: IItemScore };
+
+const NO_MATCH = 0;
+const NO_SCORE: Score = [NO_MATCH, []];
+
+// const DEBUG = false;
+// const DEBUG_MATRIX = false;
+
+export function score(target: string, query: string, queryLower: string, fuzzy: boolean): Score {
+	if (!target || !query) {
+		return NO_SCORE; // return early if target or query are undefined
+	}
+
+	const targetLength = target.length;
+	const queryLength = query.length;
+
+	if (targetLength < queryLength) {
+		return NO_SCORE; // impossible for query to be contained in target
+	}
+
+	// if (DEBUG) {
+	// 	console.group(`Target: ${target}, Query: ${query}`);
+	// }
+
+	const targetLower = target.toLowerCase();
+
+	// When not searching fuzzy, we require the query to be contained fully
+	// in the target string contiguously.
+	if (!fuzzy) {
+		const indexOfQueryInTarget = targetLower.indexOf(queryLower);
+		if (indexOfQueryInTarget === -1) {
+			// if (DEBUG) {
+			// 	console.log(`Characters not matching consecutively ${queryLower} within ${targetLower}`);
+			// }
+
+			return NO_SCORE;
+		}
+	}
+
+	const res = doScore(query, queryLower, queryLength, target, targetLower, targetLength);
+
+	// if (DEBUG) {
+	// 	console.log(`%cFinal Score: ${res[0]}`, 'font-weight: bold');
+	// 	console.groupEnd();
+	// }
+
+	return res;
+}
+
+function doScore(query: string, queryLower: string, queryLength: number, target: string, targetLower: string, targetLength: number): [number, number[]] {
+	const scores = [];
+	const matches = [];
+
+	//
+	// Build Scorer Matrix:
+	//
+	// The matrix is composed of query q and target t. For each index we score
+	// q[i] with t[i] and compare that with the previous score. If the score is
+	// equal or larger, we keep the match. In addition to the score, we also keep
+	// the length of the consecutive matches to use as boost for the score.
+	//
+	//      t   a   r   g   e   t
+	//  q
+	//  u
+	//  e
+	//  r
+	//  y
+	//
+	for (let queryIndex = 0; queryIndex < queryLength; queryIndex++) {
+		for (let targetIndex = 0; targetIndex < targetLength; targetIndex++) {
+			const currentIndex = queryIndex * targetLength + targetIndex;
+			const leftIndex = currentIndex - 1;
+			const diagIndex = (queryIndex - 1) * targetLength + targetIndex - 1;
+
+			const leftScore: number = targetIndex > 0 ? scores[leftIndex] : 0;
+			const diagScore: number = queryIndex > 0 && targetIndex > 0 ? scores[diagIndex] : 0;
+
+			const matchesSequenceLength: number = queryIndex > 0 && targetIndex > 0 ? matches[diagIndex] : 0;
+
+			// If we are not matching on the first query character any more, we only produce a
+			// score if we had a score previously for the last query index (by looking at the diagScore).
+			// This makes sure that the query always matches in sequence on the target. For example
+			// given a target of "ede" and a query of "de", we would otherwise produce a wrong high score
+			// for query[1] ("e") matching on target[0] ("e") because of the "beginning of word" boost.
+			let score: number;
+			if (!diagScore && queryIndex > 0) {
+				score = 0;
+			} else {
+				score = computeCharScore(query, queryLower, queryIndex, target, targetLower, targetIndex, matchesSequenceLength);
+			}
+
+			// We have a score and its equal or larger than the left score
+			// Match: sequence continues growing from previous diag value
+			// Score: increases by diag score value
+			if (score && diagScore + score >= leftScore) {
+				matches[currentIndex] = matchesSequenceLength + 1;
+				scores[currentIndex] = diagScore + score;
+			}
+
+			// We either have no score or the score is lower than the left score
+			// Match: reset to 0
+			// Score: pick up from left hand side
+			else {
+				matches[currentIndex] = NO_MATCH;
+				scores[currentIndex] = leftScore;
+			}
+		}
+	}
+
+	// Restore Positions (starting from bottom right of matrix)
+	const positions = [];
+	let queryIndex = queryLength - 1;
+	let targetIndex = targetLength - 1;
+	while (queryIndex >= 0 && targetIndex >= 0) {
+		const currentIndex = queryIndex * targetLength + targetIndex;
+		const match = matches[currentIndex];
+		if (match === NO_MATCH) {
+			targetIndex--; // go left
+		} else {
+			positions.push(targetIndex);
+
+			// go up and left
+			queryIndex--;
+			targetIndex--;
+		}
+	}
+
+	// Print matrix
+	// if (DEBUG_MATRIX) {
+	// printMatrix(query, target, matches, scores);
+	// }
+
+	return [scores[queryLength * targetLength - 1], positions.reverse()];
+}
+
+function computeCharScore(query: string, queryLower: string, queryIndex: number, target: string, targetLower: string, targetIndex: number, matchesSequenceLength: number): number {
+	let score = 0;
+
+	if (queryLower[queryIndex] !== targetLower[targetIndex]) {
+		return score; // no match of characters
+	}
+
+	// Character match bonus
+	score += 1;
+
+	// if (DEBUG) {
+	// 	console.groupCollapsed(`%cCharacter match bonus: +1 (char: ${queryLower[queryIndex]} at index ${targetIndex}, total score: ${score})`, 'font-weight: normal');
+	// }
+
+	// Consecutive match bonus
+	if (matchesSequenceLength > 0) {
+		score += (matchesSequenceLength * 5);
+
+		// if (DEBUG) {
+		// 	console.log('Consecutive match bonus: ' + (matchesSequenceLength * 5));
+		// }
+	}
+
+	// Same case bonus
+	if (query[queryIndex] === target[targetIndex]) {
+		score += 1;
+
+		// if (DEBUG) {
+		// 	console.log('Same case bonus: +1');
+		// }
+	}
+
+	// Start of word bonus
+	if (targetIndex === 0) {
+		score += 8;
+
+		// if (DEBUG) {
+		// 	console.log('Start of word bonus: +8');
+		// }
+	}
+
+	else {
+
+		// After separator bonus
+		const separatorBonus = scoreSeparatorAtPos(target.charCodeAt(targetIndex - 1));
+		if (separatorBonus) {
+			score += separatorBonus;
+
+			// if (DEBUG) {
+			// 	console.log('After separtor bonus: +4');
+			// }
+		}
+
+		// Inside word upper case bonus (camel case)
+		else if (isUpper(target.charCodeAt(targetIndex))) {
+			score += 1;
+
+			// if (DEBUG) {
+			// 	console.log('Inside word upper case bonus: +1');
+			// }
+		}
+	}
+
+	// if (DEBUG) {
+	// 	console.groupEnd();
+	// }
+
+	return score;
+}
+
+function scoreSeparatorAtPos(charCode: number): number {
+	switch (charCode) {
+		case CharCode.Slash:
+		case CharCode.Backslash:
+			return 5; // prefer path separators...
+		case CharCode.Underline:
+		case CharCode.Dash:
+		case CharCode.Period:
+		case CharCode.Space:
+		case CharCode.SingleQuote:
+		case CharCode.DoubleQuote:
+		case CharCode.Colon:
+			return 4; // ...over other separators
+		default:
+			return 0;
+	}
+}
+
+// function printMatrix(query: string, target: string, matches: number[], scores: number[]): void {
+// 	console.log('\t' + target.split('').join('\t'));
+// 	for (let queryIndex = 0; queryIndex < query.length; queryIndex++) {
+// 		let line = query[queryIndex] + '\t';
+// 		for (let targetIndex = 0; targetIndex < target.length; targetIndex++) {
+// 			const currentIndex = queryIndex * target.length + targetIndex;
+// 			line = line + 'M' + matches[currentIndex] + '/' + 'S' + scores[currentIndex] + '\t';
+// 		}
+
+// 		console.log(line);
+// 	}
+// }
+
+/**
+ * Scoring on structural items that have a label and optional description.
+ */
+export interface IItemScore {
+
+	/**
+	 * Overall score.
+	 */
+	score: number;
+
+	/**
+	 * Matches within the label.
+	 */
+	labelMatch?: IMatch[];
+
+	/**
+	 * Matches within the description.
+	 */
+	descriptionMatch?: IMatch[];
+}
+
+const NO_ITEM_SCORE: IItemScore = Object.freeze({ score: 0 });
+
+export interface IItemAccessor<T> {
+
+	/**
+	 * Just the label of the item to score on.
+	 */
+	getItemLabel(item: T): string;
+
+	/**
+	 * The optional description of the item to score on. Can be null.
+	 */
+	getItemDescription(item: T): string;
+
+	/**
+	 * If the item is a file, the path of the file to score on. Can be null.
+	 */
+	getItemPath(file: T): string;
+}
+
+const PATH_IDENTITY_SCORE = 1 << 18;
+const LABEL_PREFIX_SCORE = 1 << 17;
+const LABEL_CAMELCASE_SCORE = 1 << 16;
+const LABEL_SCORE_THRESHOLD = 1 << 15;
+
+export interface IPreparedQuery {
+	original: string;
+	value: string;
+	lowercase: string;
+	containsPathSeparator: boolean;
+}
+
+/**
+ * Helper function to prepare a search value for scoring in quick open by removing unwanted characters.
+ */
+export function prepareQuery(original: string): IPreparedQuery {
+	let lowercase: string;
+	let containsPathSeparator: boolean;
+	let value: string;
+
+	if (original) {
+		value = stripWildcards(original).replace(/\s/g, ''); // get rid of all wildcards and whitespace
+		if (isWindows) {
+			value = value.replace(/\//g, nativeSep); // Help Windows users to search for paths when using slash
+		}
+
+		lowercase = value.toLowerCase();
+		containsPathSeparator = value.indexOf(nativeSep) >= 0;
+	}
+
+	return { original, value, lowercase, containsPathSeparator };
+}
+
+export function scoreItem<T>(item: T, query: IPreparedQuery, fuzzy: boolean, accessor: IItemAccessor<T>, cache: ScorerCache): IItemScore {
+	if (!item || !query.value) {
+		return NO_ITEM_SCORE; // we need an item and query to score on at least
+	}
+
+	const label = accessor.getItemLabel(item);
+	if (!label) {
+		return NO_ITEM_SCORE; // we need a label at least
+	}
+
+	const description = accessor.getItemDescription(item);
+
+	let cacheHash: string;
+	if (description) {
+		cacheHash = `${label}${description}${query.value}${fuzzy}`;
+	} else {
+		cacheHash = `${label}${query.value}${fuzzy}`;
+	}
+
+	const cached = cache[cacheHash];
+	if (cached) {
+		return cached;
+	}
+
+	const itemScore = doScoreItem(label, description, accessor.getItemPath(item), query, fuzzy);
+	cache[cacheHash] = itemScore;
+
+	return itemScore;
+}
+
+function doScoreItem(label: string, description: string, path: string, query: IPreparedQuery, fuzzy: boolean): IItemScore {
+
+	// 1.) treat identity matches on full path highest
+	if (path && isLinux ? query.original === path : equalsIgnoreCase(query.original, path)) {
+		return { score: PATH_IDENTITY_SCORE, labelMatch: [{ start: 0, end: label.length }], descriptionMatch: description ? [{ start: 0, end: description.length }] : void 0 };
+	}
+
+	// We only consider label matches if the query is not including file path separators
+	const preferLabelMatches = !path || !query.containsPathSeparator;
+	if (preferLabelMatches) {
+
+		// 2.) treat prefix matches on the label second highest
+		const prefixLabelMatch = matchesPrefix(query.value, label);
+		if (prefixLabelMatch) {
+			return { score: LABEL_PREFIX_SCORE, labelMatch: prefixLabelMatch };
+		}
+
+		// 3.) treat camelcase matches on the label third highest
+		const camelcaseLabelMatch = matchesCamelCase(query.value, label);
+		if (camelcaseLabelMatch) {
+			return { score: LABEL_CAMELCASE_SCORE, labelMatch: camelcaseLabelMatch };
+		}
+
+		// 4.) prefer scores on the label if any
+		const [labelScore, labelPositions] = score(label, query.value, query.lowercase, fuzzy);
+		if (labelScore) {
+			return { score: labelScore + LABEL_SCORE_THRESHOLD, labelMatch: createMatches(labelPositions) };
+		}
+	}
+
+	// 5.) finally compute description + label scores if we have a description
+	if (description) {
+		let descriptionPrefix = description;
+		if (!!path) {
+			descriptionPrefix = `${description}${nativeSep}`; // assume this is a file path
+		}
+
+		const descriptionPrefixLength = descriptionPrefix.length;
+		const descriptionAndLabel = `${descriptionPrefix}${label}`;
+
+		const [labelDescriptionScore, labelDescriptionPositions] = score(descriptionAndLabel, query.value, query.lowercase, fuzzy);
+		if (labelDescriptionScore) {
+			const labelDescriptionMatches = createMatches(labelDescriptionPositions);
+			const labelMatch: IMatch[] = [];
+			const descriptionMatch: IMatch[] = [];
+
+			// We have to split the matches back onto the label and description portions
+			labelDescriptionMatches.forEach(h => {
+
+				// Match overlaps label and description part, we need to split it up
+				if (h.start < descriptionPrefixLength && h.end > descriptionPrefixLength) {
+					labelMatch.push({ start: 0, end: h.end - descriptionPrefixLength });
+					descriptionMatch.push({ start: h.start, end: descriptionPrefixLength });
+				}
+
+				// Match on label part
+				else if (h.start >= descriptionPrefixLength) {
+					labelMatch.push({ start: h.start - descriptionPrefixLength, end: h.end - descriptionPrefixLength });
+				}
+
+				// Match on description part
+				else {
+					descriptionMatch.push(h);
+				}
+			});
+
+			return { score: labelDescriptionScore, labelMatch, descriptionMatch };
+		}
+	}
+
+	return NO_ITEM_SCORE;
+}
+
+export function compareItemsByScore<T>(itemA: T, itemB: T, query: IPreparedQuery, fuzzy: boolean, accessor: IItemAccessor<T>, cache: ScorerCache, fallbackComparer = fallbackCompare): number {
+	const itemScoreA = scoreItem(itemA, query, fuzzy, accessor, cache);
+	const itemScoreB = scoreItem(itemB, query, fuzzy, accessor, cache);
+
+	const scoreA = itemScoreA.score;
+	const scoreB = itemScoreB.score;
+
+	// 1.) prefer identity matches
+	if (scoreA === PATH_IDENTITY_SCORE || scoreB === PATH_IDENTITY_SCORE) {
+		if (scoreA !== scoreB) {
+			return scoreA === PATH_IDENTITY_SCORE ? -1 : 1;
+		}
+	}
+
+	// 2.) prefer label prefix matches
+	if (scoreA === LABEL_PREFIX_SCORE || scoreB === LABEL_PREFIX_SCORE) {
+		if (scoreA !== scoreB) {
+			return scoreA === LABEL_PREFIX_SCORE ? -1 : 1;
+		}
+
+		const labelA = accessor.getItemLabel(itemA);
+		const labelB = accessor.getItemLabel(itemB);
+
+		// prefer shorter names when both match on label prefix
+		if (labelA.length !== labelB.length) {
+			return labelA.length - labelB.length;
+		}
+	}
+
+	// 3.) prefer camelcase matches
+	if (scoreA === LABEL_CAMELCASE_SCORE || scoreB === LABEL_CAMELCASE_SCORE) {
+		if (scoreA !== scoreB) {
+			return scoreA === LABEL_CAMELCASE_SCORE ? -1 : 1;
+		}
+
+		const labelA = accessor.getItemLabel(itemA);
+		const labelB = accessor.getItemLabel(itemB);
+
+		// prefer more compact camel case matches over longer
+		const comparedByMatchLength = compareByMatchLength(itemScoreA.labelMatch, itemScoreB.labelMatch);
+		if (comparedByMatchLength !== 0) {
+			return comparedByMatchLength;
+		}
+
+		// prefer shorter names when both match on label camelcase
+		if (labelA.length !== labelB.length) {
+			return labelA.length - labelB.length;
+		}
+	}
+
+	// 4.) prefer label scores
+	if (scoreA > LABEL_SCORE_THRESHOLD || scoreB > LABEL_SCORE_THRESHOLD) {
+		if (scoreB < LABEL_SCORE_THRESHOLD) {
+			return -1;
+		}
+
+		if (scoreA < LABEL_SCORE_THRESHOLD) {
+			return 1;
+		}
+	}
+
+	// 5.) compare by score
+	if (scoreA !== scoreB) {
+		return scoreA > scoreB ? -1 : 1;
+	}
+
+	// 6.) scores are identical, prefer more compact matches (label and description)
+	const itemAMatchDistance = computeLabelAndDescriptionMatchDistance(itemA, itemScoreA, accessor);
+	const itemBMatchDistance = computeLabelAndDescriptionMatchDistance(itemB, itemScoreB, accessor);
+	if (itemAMatchDistance && itemBMatchDistance && itemAMatchDistance !== itemBMatchDistance) {
+		return itemBMatchDistance > itemAMatchDistance ? -1 : 1;
+	}
+
+	// 7.) at this point, scores are identical and match compactness as well
+	// for both items so we start to use the fallback compare
+	return fallbackComparer(itemA, itemB, query, accessor);
+}
+
+function computeLabelAndDescriptionMatchDistance<T>(item: T, score: IItemScore, accessor: IItemAccessor<T>): number {
+	const hasLabelMatches = (score.labelMatch && score.labelMatch.length);
+	const hasDescriptionMatches = (score.descriptionMatch && score.descriptionMatch.length);
+
+	let matchStart: number = -1;
+	let matchEnd: number = -1;
+
+	// If we have description matches, the start is first of description match
+	if (hasDescriptionMatches) {
+		matchStart = score.descriptionMatch[0].start;
+	}
+
+	// Otherwise, the start is the first label match
+	else if (hasLabelMatches) {
+		matchStart = score.labelMatch[0].start;
+	}
+
+	// If we have label match, the end is the last label match
+	// If we had a description match, we add the length of the description
+	// as offset to the end to indicate this.
+	if (hasLabelMatches) {
+		matchEnd = score.labelMatch[score.labelMatch.length - 1].end;
+		if (hasDescriptionMatches) {
+			const itemDescription = accessor.getItemDescription(item);
+			if (itemDescription) {
+				matchEnd += itemDescription.length;
+			}
+		}
+	}
+
+	// If we have just a description match, the end is the last description match
+	else if (hasDescriptionMatches) {
+		matchEnd = score.descriptionMatch[score.descriptionMatch.length - 1].end;
+	}
+
+	return matchEnd - matchStart;
+}
+
+function compareByMatchLength(matchesA?: IMatch[], matchesB?: IMatch[]): number {
+	if ((!matchesA && !matchesB) || (!matchesA.length && !matchesB.length)) {
+		return 0; // make sure to not cause bad comparing when matches are not provided
+	}
+
+	if (!matchesB || !matchesB.length) {
+		return -1;
+	}
+
+	if (!matchesA || !matchesA.length) {
+		return 1;
+	}
+
+	// Compute match length of A (first to last match)
+	const matchStartA = matchesA[0].start;
+	const matchEndA = matchesA[matchesA.length - 1].end;
+	const matchLengthA = matchEndA - matchStartA;
+
+	// Compute match length of B (first to last match)
+	const matchStartB = matchesB[0].start;
+	const matchEndB = matchesB[matchesB.length - 1].end;
+	const matchLengthB = matchEndB - matchStartB;
+
+	// Prefer shorter match length
+	return matchLengthA === matchLengthB ? 0 : matchLengthB < matchLengthA ? 1 : -1;
+}
+
+export function fallbackCompare<T>(itemA: T, itemB: T, query: IPreparedQuery, accessor: IItemAccessor<T>): number {
+
+	// check for label + description length and prefer shorter
+	const labelA = accessor.getItemLabel(itemA);
+	const labelB = accessor.getItemLabel(itemB);
+
+	const descriptionA = accessor.getItemDescription(itemA);
+	const descriptionB = accessor.getItemDescription(itemB);
+
+	const labelDescriptionALength = labelA.length + (descriptionA ? descriptionA.length : 0);
+	const labelDescriptionBLength = labelB.length + (descriptionB ? descriptionB.length : 0);
+
+	if (labelDescriptionALength !== labelDescriptionBLength) {
+		return labelDescriptionALength - labelDescriptionBLength;
+	}
+
+	// check for path length and prefer shorter
+	const pathA = accessor.getItemPath(itemA);
+	const pathB = accessor.getItemPath(itemB);
+
+	if (pathA && pathB && pathA.length !== pathB.length) {
+		return pathA.length - pathB.length;
+	}
+
+	// 7.) finally we have equal scores and equal length, we fallback to comparer
+
+	// compare by label
+	if (labelA !== labelB) {
+		return compareAnything(labelA, labelB, query.value);
+	}
+
+	// compare by description
+	if (descriptionA && descriptionB && descriptionA !== descriptionB) {
+		return compareAnything(descriptionA, descriptionB, query.value);
+	}
+
+	// compare by path
+	if (pathA && pathB && pathA !== pathB) {
+		return compareAnything(pathA, pathB, query.value);
+	}
+
+	// equal
+	return 0;
+}
\ No newline at end of file
diff --git a/extensions/search-rg/src/common/filters.ts b/extensions/search-rg/src/common/filters.ts
new file mode 100644
index 00000000000..63d4dcaeac3
--- /dev/null
+++ b/extensions/search-rg/src/common/filters.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 * as strings from './strings';
+import { CharCode } from './charCode';
+
+export interface IFilter {
+	// Returns null if word doesn't match.
+	(word: string, wordToMatchAgainst: string): IMatch[];
+}
+
+export interface IMatch {
+	start: number;
+	end: number;
+}
+
+// Prefix
+
+export const matchesPrefix: IFilter = _matchesPrefix.bind(undefined, true);
+
+function _matchesPrefix(ignoreCase: boolean, word: string, wordToMatchAgainst: string): IMatch[] {
+	if (!wordToMatchAgainst || wordToMatchAgainst.length < word.length) {
+		return null;
+	}
+
+	let matches: boolean;
+	if (ignoreCase) {
+		matches = strings.startsWithIgnoreCase(wordToMatchAgainst, word);
+	} else {
+		matches = wordToMatchAgainst.indexOf(word) === 0;
+	}
+
+	if (!matches) {
+		return null;
+	}
+
+	return word.length > 0 ? [{ start: 0, end: word.length }] : [];
+}
+
+// CamelCase
+
+function isLower(code: number): boolean {
+	return CharCode.a <= code && code <= CharCode.z;
+}
+
+export function isUpper(code: number): boolean {
+	return CharCode.A <= code && code <= CharCode.Z;
+}
+
+function isNumber(code: number): boolean {
+	return CharCode.Digit0 <= code && code <= CharCode.Digit9;
+}
+
+function isWhitespace(code: number): boolean {
+	return (
+		code === CharCode.Space
+		|| code === CharCode.Tab
+		|| code === CharCode.LineFeed
+		|| code === CharCode.CarriageReturn
+	);
+}
+
+function isAlphanumeric(code: number): boolean {
+	return isLower(code) || isUpper(code) || isNumber(code);
+}
+
+function join(head: IMatch, tail: IMatch[]): IMatch[] {
+	if (tail.length === 0) {
+		tail = [head];
+	} else if (head.end === tail[0].start) {
+		tail[0].start = head.start;
+	} else {
+		tail.unshift(head);
+	}
+	return tail;
+}
+
+function nextAnchor(camelCaseWord: string, start: number): number {
+	for (let i = start; i < camelCaseWord.length; i++) {
+		let c = camelCaseWord.charCodeAt(i);
+		if (isUpper(c) || isNumber(c) || (i > 0 && !isAlphanumeric(camelCaseWord.charCodeAt(i - 1)))) {
+			return i;
+		}
+	}
+	return camelCaseWord.length;
+}
+
+function _matchesCamelCase(word: string, camelCaseWord: string, i: number, j: number): IMatch[] {
+	if (i === word.length) {
+		return [];
+	} else if (j === camelCaseWord.length) {
+		return null;
+	} else if (word[i] !== camelCaseWord[j].toLowerCase()) {
+		return null;
+	} else {
+		let result: IMatch[] = null;
+		let nextUpperIndex = j + 1;
+		result = _matchesCamelCase(word, camelCaseWord, i + 1, j + 1);
+		while (!result && (nextUpperIndex = nextAnchor(camelCaseWord, nextUpperIndex)) < camelCaseWord.length) {
+			result = _matchesCamelCase(word, camelCaseWord, i + 1, nextUpperIndex);
+			nextUpperIndex++;
+		}
+		return result === null ? null : join({ start: j, end: j + 1 }, result);
+	}
+}
+
+interface ICamelCaseAnalysis {
+	upperPercent: number;
+	lowerPercent: number;
+	alphaPercent: number;
+	numericPercent: number;
+}
+
+// Heuristic to avoid computing camel case matcher for words that don't
+// look like camelCaseWords.
+function analyzeCamelCaseWord(word: string): ICamelCaseAnalysis {
+	let upper = 0, lower = 0, alpha = 0, numeric = 0, code = 0;
+
+	for (let i = 0; i < word.length; i++) {
+		code = word.charCodeAt(i);
+
+		if (isUpper(code)) { upper++; }
+		if (isLower(code)) { lower++; }
+		if (isAlphanumeric(code)) { alpha++; }
+		if (isNumber(code)) { numeric++; }
+	}
+
+	let upperPercent = upper / word.length;
+	let lowerPercent = lower / word.length;
+	let alphaPercent = alpha / word.length;
+	let numericPercent = numeric / word.length;
+
+	return { upperPercent, lowerPercent, alphaPercent, numericPercent };
+}
+
+function isUpperCaseWord(analysis: ICamelCaseAnalysis): boolean {
+	const { upperPercent, lowerPercent } = analysis;
+	return lowerPercent === 0 && upperPercent > 0.6;
+}
+
+function isCamelCaseWord(analysis: ICamelCaseAnalysis): boolean {
+	const { upperPercent, lowerPercent, alphaPercent, numericPercent } = analysis;
+	return lowerPercent > 0.2 && upperPercent < 0.8 && alphaPercent > 0.6 && numericPercent < 0.2;
+}
+
+// Heuristic to avoid computing camel case matcher for words that don't
+// look like camel case patterns.
+function isCamelCasePattern(word: string): boolean {
+	let upper = 0, lower = 0, code = 0, whitespace = 0;
+
+	for (let i = 0; i < word.length; i++) {
+		code = word.charCodeAt(i);
+
+		if (isUpper(code)) { upper++; }
+		if (isLower(code)) { lower++; }
+		if (isWhitespace(code)) { whitespace++; }
+	}
+
+	if ((upper === 0 || lower === 0) && whitespace === 0) {
+		return word.length <= 30;
+	} else {
+		return upper <= 5;
+	}
+}
+
+export function matchesCamelCase(word: string, camelCaseWord: string): IMatch[] {
+	if (!camelCaseWord) {
+		return null;
+	}
+
+	camelCaseWord = camelCaseWord.trim();
+
+	if (camelCaseWord.length === 0) {
+		return null;
+	}
+
+	if (!isCamelCasePattern(word)) {
+		return null;
+	}
+
+	if (camelCaseWord.length > 60) {
+		return null;
+	}
+
+	const analysis = analyzeCamelCaseWord(camelCaseWord);
+
+	if (!isCamelCaseWord(analysis)) {
+		if (!isUpperCaseWord(analysis)) {
+			return null;
+		}
+
+		camelCaseWord = camelCaseWord.toLowerCase();
+	}
+
+	let result: IMatch[] = null;
+	let i = 0;
+
+	word = word.toLowerCase();
+	while (i < camelCaseWord.length && (result = _matchesCamelCase(word, camelCaseWord, 0, i)) === null) {
+		i = nextAnchor(camelCaseWord, i + 1);
+	}
+
+	return result;
+}
+
+export function createMatches(position: number[]): IMatch[] {
+	let ret: IMatch[] = [];
+	if (!position) {
+		return ret;
+	}
+	let last: IMatch;
+	for (const pos of position) {
+		if (last && last.end === pos) {
+			last.end += 1;
+		} else {
+			last = { start: pos, end: pos + 1 };
+			ret.push(last);
+		}
+	}
+	return ret;
+}
diff --git a/extensions/search-rg/src/normalization.ts b/extensions/search-rg/src/common/normalization.ts
similarity index 100%
rename from extensions/search-rg/src/normalization.ts
rename to extensions/search-rg/src/common/normalization.ts
diff --git a/extensions/search-rg/src/common/strings.ts b/extensions/search-rg/src/common/strings.ts
new file mode 100644
index 00000000000..2678aff1e0f
--- /dev/null
+++ b/extensions/search-rg/src/common/strings.ts
@@ -0,0 +1,143 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { CharCode } from './charCode';
+
+export function stripWildcards(pattern: string): string {
+	return pattern.replace(/\*/g, '');
+}
+
+/**
+ * Determines if haystack starts with needle.
+ */
+export function startsWith(haystack: string, needle: string): boolean {
+	if (haystack.length < needle.length) {
+		return false;
+	}
+
+	if (haystack === needle) {
+		return true;
+	}
+
+	for (let i = 0; i < needle.length; i++) {
+		if (haystack[i] !== needle[i]) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+export function startsWithIgnoreCase(str: string, candidate: string): boolean {
+	const candidateLength = candidate.length;
+	if (candidate.length > str.length) {
+		return false;
+	}
+
+	return doEqualsIgnoreCase(str, candidate, candidateLength);
+}
+
+/**
+ * Determines if haystack ends with needle.
+ */
+export function endsWith(haystack: string, needle: string): boolean {
+	let diff = haystack.length - needle.length;
+	if (diff > 0) {
+		return haystack.indexOf(needle, diff) === diff;
+	} else if (diff === 0) {
+		return haystack === needle;
+	} else {
+		return false;
+	}
+}
+
+function isLowerAsciiLetter(code: number): boolean {
+	return code >= CharCode.a && code <= CharCode.z;
+}
+
+function isUpperAsciiLetter(code: number): boolean {
+	return code >= CharCode.A && code <= CharCode.Z;
+}
+
+function isAsciiLetter(code: number): boolean {
+	return isLowerAsciiLetter(code) || isUpperAsciiLetter(code);
+}
+
+export function equalsIgnoreCase(a: string, b: string): boolean {
+	const len1 = a ? a.length : 0;
+	const len2 = b ? b.length : 0;
+
+	if (len1 !== len2) {
+		return false;
+	}
+
+	return doEqualsIgnoreCase(a, b);
+}
+
+function doEqualsIgnoreCase(a: string, b: string, stopAt = a.length): boolean {
+	if (typeof a !== 'string' || typeof b !== 'string') {
+		return false;
+	}
+
+	for (let i = 0; i < stopAt; i++) {
+		const codeA = a.charCodeAt(i);
+		const codeB = b.charCodeAt(i);
+
+		if (codeA === codeB) {
+			continue;
+		}
+
+		// a-z A-Z
+		if (isAsciiLetter(codeA) && isAsciiLetter(codeB)) {
+			let diff = Math.abs(codeA - codeB);
+			if (diff !== 0 && diff !== 32) {
+				return false;
+			}
+		}
+
+		// Any other charcode
+		else {
+			if (String.fromCharCode(codeA).toLowerCase() !== String.fromCharCode(codeB).toLowerCase()) {
+				return false;
+			}
+		}
+	}
+
+	return true;
+}
+
+/**
+ * Checks if the characters of the provided query string are included in the
+ * target string. The characters do not have to be contiguous within the string.
+ */
+export function fuzzyContains(target: string, query: string): boolean {
+	if (!target || !query) {
+		return false; // return early if target or query are undefined
+	}
+
+	if (target.length < query.length) {
+		return false; // impossible for query to be contained in target
+	}
+
+	const queryLen = query.length;
+	const targetLower = target.toLowerCase();
+
+	let index = 0;
+	let lastIndexOf = -1;
+	while (index < queryLen) {
+		let indexOf = targetLower.indexOf(query[index], lastIndexOf + 1);
+		if (indexOf < 0) {
+			return false;
+		}
+
+		lastIndexOf = indexOf;
+
+		index++;
+	}
+
+	return true;
+}
\ No newline at end of file
diff --git a/extensions/search-rg/src/extension.ts b/extensions/search-rg/src/extension.ts
index a2e4611ffef..f999cb0cb6c 100644
--- a/extensions/search-rg/src/extension.ts
+++ b/extensions/search-rg/src/extension.ts
@@ -6,6 +6,7 @@
 import * as vscode from 'vscode';
 import { RipgrepTextSearchEngine } from './ripgrepTextSearch';
 import { RipgrepFileSearchEngine } from './ripgrepFileSearch';
+import { CachedSearchProvider } from './cachedSearchProvider';
 
 export function activate(): void {
 	if (vscode.workspace.getConfiguration('searchRipgrep').get('enable')) {
@@ -15,17 +16,39 @@ export function activate(): void {
 	}
 }
 
+type SearchEngine = RipgrepFileSearchEngine | RipgrepTextSearchEngine;
+
 class RipgrepSearchProvider implements vscode.SearchProvider {
+	private cachedProvider: CachedSearchProvider;
+	private inProgress: Set<SearchEngine> = new Set();
+
 	constructor(private outputChannel: vscode.OutputChannel) {
+		this.cachedProvider = new CachedSearchProvider();
+		process.once('exit', () => this.dispose());
 	}
 
 	provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<void> {
 		const engine = new RipgrepTextSearchEngine(this.outputChannel);
-		return engine.provideTextSearchResults(query, options, progress, token);
+		return this.withEngine(engine, () => engine.provideTextSearchResults(query, options, progress, token));
 	}
 
-	provideFileSearchResults(options: vscode.SearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
+	provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.SearchOptions, progress: vscode.Progress<vscode.Uri>, token: vscode.CancellationToken): Thenable<void> {
 		const engine = new RipgrepFileSearchEngine(this.outputChannel);
-		return engine.provideFileSearchResults(options, progress, token);
+		return this.withEngine(engine, () => this.cachedProvider.provideFileSearchResults(engine, query, options, progress, token));
+	}
+
+	clearCache(cacheKey: string): void {
+		this.cachedProvider.clearCache(cacheKey);
+	}
+
+	private withEngine(engine: SearchEngine, fn: () => Thenable<void>): Thenable<void> {
+		this.inProgress.add(engine);
+		return fn().then(() => {
+			this.inProgress.delete(engine);
+		});
+	}
+
+	private dispose() {
+		this.inProgress.forEach(engine => engine.cancel());
 	}
 }
\ No newline at end of file
diff --git a/extensions/search-rg/src/ripgrepFileSearch.ts b/extensions/search-rg/src/ripgrepFileSearch.ts
index eaa75d647ef..7edf4c4f4b9 100644
--- a/extensions/search-rg/src/ripgrepFileSearch.ts
+++ b/extensions/search-rg/src/ripgrepFileSearch.ts
@@ -7,30 +7,31 @@ import * as cp from 'child_process';
 import { Readable } from 'stream';
 import { NodeStringDecoder, StringDecoder } from 'string_decoder';
 import * as vscode from 'vscode';
-import { normalizeNFC, normalizeNFD } from './normalization';
+import { normalizeNFC, normalizeNFD } from './common/normalization';
 import { rgPath } from './ripgrep';
-import { anchorGlob } from './ripgrepHelpers';
+import { anchorGlob } from './utils';
 import { rgErrorMsgForDisplay } from './ripgrepTextSearch';
+import { IInternalFileSearchProvider } from './cachedSearchProvider';
 
 const isMac = process.platform === 'darwin';
 
 // If vscode-ripgrep is in an .asar file, then the binary is unpacked.
 const rgDiskPath = rgPath.replace(/\bnode_modules\.asar\b/, 'node_modules.asar.unpacked');
 
-export class RipgrepFileSearchEngine {
+export class RipgrepFileSearchEngine implements IInternalFileSearchProvider {
 	private rgProc: cp.ChildProcess;
-	private killRgProcFn: (code?: number) => void;
+	private isDone: boolean;
 
-	constructor(private outputChannel: vscode.OutputChannel) {
-		this.killRgProcFn = () => this.rgProc && this.rgProc.kill();
-		process.once('exit', this.killRgProcFn);
+	constructor(private outputChannel: vscode.OutputChannel) { }
+
+	cancel() {
+		this.isDone = true;
+		if (this.rgProc) {
+			this.rgProc.kill();
+		}
 	}
 
-	private dispose() {
-		process.removeListener('exit', this.killRgProcFn);
-	}
-
-	provideFileSearchResults(options: vscode.SearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
+	provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
 		this.outputChannel.appendLine(`provideFileSearchResults ${JSON.stringify({
 			...options,
 			...{
@@ -39,12 +40,7 @@ export class RipgrepFileSearchEngine {
 		})}`);
 
 		return new Promise((resolve, reject) => {
-			let isDone = false;
-			const cancel = () => {
-				isDone = true;
-				this.rgProc.kill();
-			};
-			token.onCancellationRequested(cancel);
+			token.onCancellationRequested(() => this.cancel());
 
 			const rgArgs = getRgArgs(options);
 
@@ -93,7 +89,7 @@ export class RipgrepFileSearchEngine {
 				});
 
 				if (last) {
-					if (isDone) {
+					if (this.isDone) {
 						resolve();
 					} else {
 						// Trigger last result
@@ -106,12 +102,7 @@ export class RipgrepFileSearchEngine {
 					}
 				}
 			});
-		}).then(
-			() => this.dispose(),
-			err => {
-				this.dispose();
-				return Promise.reject(err);
-			});
+		});
 	}
 
 	private collectStdout(cmd: cp.ChildProcess, cb: (err: Error, stdout?: string, last?: boolean) => void): void {
diff --git a/extensions/search-rg/src/ripgrepTextSearch.ts b/extensions/search-rg/src/ripgrepTextSearch.ts
index b03ee60c754..728365bff17 100644
--- a/extensions/search-rg/src/ripgrepTextSearch.ts
+++ b/extensions/search-rg/src/ripgrepTextSearch.ts
@@ -7,10 +7,11 @@
 
 import * as cp from 'child_process';
 import { EventEmitter } from 'events';
+import * as path from 'path';
 import { NodeStringDecoder, StringDecoder } from 'string_decoder';
 import * as vscode from 'vscode';
 import { rgPath } from './ripgrep';
-import { anchorGlob } from './ripgrepHelpers';
+import { anchorGlob } from './utils';
 
 // If vscode-ripgrep is in an .asar file, then the binary is unpacked.
 const rgDiskPath = rgPath.replace(/\bnode_modules\.asar\b/, 'node_modules.asar.unpacked');
@@ -21,12 +22,21 @@ const MAX_TEXT_RESULTS = 10000;
 export class RipgrepTextSearchEngine {
 	private isDone = false;
 	private rgProc: cp.ChildProcess;
-	private killRgProcFn: (code?: number) => void;
 
 	private ripgrepParser: RipgrepParser;
 
-	constructor(private outputChannel: vscode.OutputChannel) {
-		this.killRgProcFn = () => this.rgProc && this.rgProc.kill();
+	constructor(private outputChannel: vscode.OutputChannel) { }
+
+	cancel() {
+		this.isDone = true;
+
+		if (this.rgProc) {
+			this.rgProc.kill();
+		}
+
+		if (this.ripgrepParser) {
+			this.ripgrepParser.cancel();
+		}
 	}
 
 	provideTextSearchResults(query: vscode.TextSearchQuery, options: vscode.TextSearchOptions, progress: vscode.Progress<vscode.TextSearchResult>, token: vscode.CancellationToken): Thenable<void> {
@@ -38,12 +48,7 @@ export class RipgrepTextSearchEngine {
 		})}`);
 
 		return new Promise((resolve, reject) => {
-			const cancel = () => {
-				this.isDone = true;
-				this.ripgrepParser.cancel();
-				this.rgProc.kill();
-			};
-			token.onCancellationRequested(cancel);
+			token.onCancellationRequested(() => this.cancel());
 
 			const rgArgs = getRgArgs(query, options);
 
@@ -55,7 +60,6 @@ export class RipgrepTextSearchEngine {
 			this.outputChannel.appendLine(`rg ${escapedArgs}\n - cwd: ${cwd}`);
 
 			this.rgProc = cp.spawn(rgDiskPath, rgArgs, { cwd });
-			process.once('exit', this.killRgProcFn);
 			this.rgProc.on('error', e => {
 				console.error(e);
 				this.outputChannel.append('Error: ' + (e && e.message));
@@ -70,7 +74,7 @@ export class RipgrepTextSearchEngine {
 			});
 
 			this.ripgrepParser.on('hitLimit', () => {
-				cancel();
+				this.cancel();
 			});
 
 			this.rgProc.stdout.on('data', data => {
@@ -91,7 +95,6 @@ export class RipgrepTextSearchEngine {
 				this.outputChannel.appendLine(gotData ? 'Got data from stdout' : 'No data from stdout');
 				this.outputChannel.appendLine(gotResult ? 'Got result from parser' : 'No result from parser');
 				this.outputChannel.appendLine('');
-				process.removeListener('exit', this.killRgProcFn);
 				if (this.isDone) {
 					resolve();
 				} else {
@@ -291,7 +294,7 @@ export class RipgrepParser extends EventEmitter {
 		lineMatches
 			.map(range => {
 				return <vscode.TextSearchResult>{
-					path: this.currentFile,
+					uri: vscode.Uri.file(path.join(this.rootFolder, this.currentFile)),
 					range,
 					preview: {
 						text: preview,
diff --git a/extensions/search-rg/src/ripgrepHelpers.ts b/extensions/search-rg/src/utils.ts
similarity index 78%
rename from extensions/search-rg/src/ripgrepHelpers.ts
rename to extensions/search-rg/src/utils.ts
index 5487be750a0..fd083fe075f 100644
--- a/extensions/search-rg/src/ripgrepHelpers.ts
+++ b/extensions/search-rg/src/utils.ts
@@ -5,9 +5,8 @@
 
 'use strict';
 
-import * as vscode from 'vscode';
-
 import * as path from 'path';
+import * as vscode from 'vscode';
 
 export function fixDriveC(_path: string): string {
 	const root = path.parse(_path).root;
@@ -19,3 +18,10 @@ export function fixDriveC(_path: string): string {
 export function anchorGlob(glob: string): string {
 	return glob.startsWith('**') || glob.startsWith('/') ? glob : `/${glob}`;
 }
+
+export function joinPath(resource: vscode.Uri, pathFragment: string): vscode.Uri {
+	const joinedPath = path.join(resource.path || '/', pathFragment);
+	return resource.with({
+		path: joinedPath
+	});
+}
diff --git a/extensions/search-rg/yarn.lock b/extensions/search-rg/yarn.lock
index 4eaab0b7bb3..99b491f01ff 100644
--- a/extensions/search-rg/yarn.lock
+++ b/extensions/search-rg/yarn.lock
@@ -1545,9 +1545,9 @@ vscode-extension-telemetry@0.0.15:
   dependencies:
     applicationinsights "1.0.1"
 
-vscode-nls@^3.2.1:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.2.tgz#3817eca5b985c2393de325197cf4e15eb2aa5350"
+vscode-nls@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
 
 vscode-ripgrep@^1.0.1:
   version "1.0.1"
diff --git a/extensions/theme-defaults/themes/light_vs.json b/extensions/theme-defaults/themes/light_vs.json
index 0fafec36645..4134ce0a4cb 100644
--- a/extensions/theme-defaults/themes/light_vs.json
+++ b/extensions/theme-defaults/themes/light_vs.json
@@ -290,7 +290,9 @@
 			}
 		},
 		{
-			"scope": "support.type.property-name.json",
+			"scope": [
+				"support.type.property-name.json"
+			],
 			"settings": {
 				"foreground": "#0451a5"
 			}
diff --git a/extensions/theme-quietlight/themes/quietlight-color-theme.json b/extensions/theme-quietlight/themes/quietlight-color-theme.json
index 3e1ad56f8ad..e8915e04b78 100644
--- a/extensions/theme-quietlight/themes/quietlight-color-theme.json
+++ b/extensions/theme-quietlight/themes/quietlight-color-theme.json
@@ -40,7 +40,8 @@
 			"name": "Comments: Documentation",
 			"scope": [
 				"comment.documentation",
-				"comment.block.documentation"
+				"comment.block.documentation",
+				"comment.block.documentation punctuation.definition.comment "
 			],
 			"settings": {
 				"foreground": "#448C27"
diff --git a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
index c56e185f844..bee4c021973 100644
--- a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
+++ b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
@@ -4,7 +4,7 @@
 		"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/7bf8960f7042474b10b519f39339fc527907ce16",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/40288b872220e5c0b844b1de507f1749ed14589b",
 	"name": "TypeScript",
 	"scopeName": "source.ts",
 	"patterns": [
@@ -4149,7 +4149,7 @@
 		},
 		"directives": {
 			"name": "comment.line.triple-slash.directive.ts",
-			"begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|name)\\s*=\\s*((\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")))+\\s*/>\\s*$)",
+			"begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name)\\s*=\\s*((\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")))+\\s*/>\\s*$)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.comment.ts"
@@ -4177,7 +4177,7 @@
 					"patterns": [
 						{
 							"name": "entity.other.attribute-name.directive.ts",
-							"match": "path|types|no-default-lib|name"
+							"match": "path|types|no-default-lib|lib|name"
 						},
 						{
 							"name": "keyword.operator.assignment.ts",
diff --git a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
index 8ef6980ec42..441f07d6abd 100644
--- a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
+++ b/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
@@ -4,7 +4,7 @@
 		"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/7bf8960f7042474b10b519f39339fc527907ce16",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/88217b1c7d36ed5d35adc3099ba7978aabe2531b",
 	"name": "TypeScriptReact",
 	"scopeName": "source.tsx",
 	"patterns": [
@@ -4115,7 +4115,7 @@
 		},
 		"directives": {
 			"name": "comment.line.triple-slash.directive.tsx",
-			"begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|name)\\s*=\\s*((\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")))+\\s*/>\\s*$)",
+			"begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name)\\s*=\\s*((\\'([^\\'\\\\]|\\\\\\'|\\\\)*\\')|(\\\"([^\\\"\\\\]|\\\\\\\"|\\\\)*\\\")))+\\s*/>\\s*$)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.comment.tsx"
@@ -4143,7 +4143,7 @@
 					"patterns": [
 						{
 							"name": "entity.other.attribute-name.directive.tsx",
-							"match": "path|types|no-default-lib|name"
+							"match": "path|types|no-default-lib|lib|name"
 						},
 						{
 							"name": "keyword.operator.assignment.tsx",
@@ -4664,8 +4664,8 @@
 			]
 		},
 		"jsx-tag-in-expression": {
-			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>))",
-			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
 			"patterns": [
 				{
 					"include": "#jsx-tag"
@@ -4674,7 +4674,7 @@
 		},
 		"jsx-tag": {
 			"name": "meta.tag.tsx",
-			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
 			"end": "(/>)|(?:(</)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>))",
 			"endCaptures": {
 				"1": {
@@ -4701,7 +4701,7 @@
 			},
 			"patterns": [
 				{
-					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[=]|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)|(\\s+))(?!\\?)|\\/?>)",
+					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>)",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.tag.begin.tsx"
diff --git a/extensions/typescript-basics/test/colorize-results/tsconfig_json.json b/extensions/typescript-basics/test/colorize-results/tsconfig_json.json
index 13700965aba..69ce07f643d 100644
--- a/extensions/typescript-basics/test/colorize-results/tsconfig_json.json
+++ b/extensions/typescript-basics/test/colorize-results/tsconfig_json.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "{",
-		"t": "source.json meta.structure.dictionary.json punctuation.definition.dictionary.begin.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments punctuation.definition.dictionary.begin.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -12,7 +12,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "source.json meta.structure.dictionary.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.json meta.structure.dictionary.json string.json support.type.property-name.json punctuation.support.type.property-name.begin.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments",
 		"r": {
 			"dark_plus": "support.type.property-name: #9CDCFE",
 			"light_plus": "support.type.property-name.json: #0451A5",
@@ -34,7 +34,7 @@
 	},
 	{
 		"c": "compilerOptions",
-		"t": "source.json meta.structure.dictionary.json string.json support.type.property-name.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments",
 		"r": {
 			"dark_plus": "support.type.property-name: #9CDCFE",
 			"light_plus": "support.type.property-name.json: #0451A5",
@@ -45,7 +45,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.json meta.structure.dictionary.json string.json support.type.property-name.json punctuation.support.type.property-name.end.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments",
 		"r": {
 			"dark_plus": "support.type.property-name: #9CDCFE",
 			"light_plus": "support.type.property-name.json: #0451A5",
@@ -56,7 +56,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.separator.dictionary.key-value.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -67,7 +67,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -78,7 +78,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json punctuation.definition.dictionary.begin.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments punctuation.definition.dictionary.begin.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -89,7 +89,7 @@
 	},
 	{
 		"c": "\t\t",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -100,7 +100,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json string.json support.type.property-name.json punctuation.support.type.property-name.begin.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.begin.json.comments",
 		"r": {
 			"dark_plus": "support.type.property-name: #9CDCFE",
 			"light_plus": "support.type.property-name.json: #0451A5",
@@ -111,7 +111,7 @@
 	},
 	{
 		"c": "target",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json string.json support.type.property-name.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments",
 		"r": {
 			"dark_plus": "support.type.property-name: #9CDCFE",
 			"light_plus": "support.type.property-name.json: #0451A5",
@@ -122,7 +122,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json string.json support.type.property-name.json punctuation.support.type.property-name.end.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments string.json.comments support.type.property-name.json.comments punctuation.support.type.property-name.end.json.comments",
 		"r": {
 			"dark_plus": "support.type.property-name: #9CDCFE",
 			"light_plus": "support.type.property-name.json: #0451A5",
@@ -133,7 +133,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.separator.dictionary.key-value.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments punctuation.separator.dictionary.key-value.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -144,7 +144,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json punctuation.definition.string.begin.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.comments punctuation.definition.string.begin.json.comments",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -166,7 +166,7 @@
 	},
 	{
 		"c": "es6",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.comments",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -177,7 +177,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json punctuation.definition.string.end.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments string.quoted.double.json.comments punctuation.definition.string.end.json.comments",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -188,7 +188,7 @@
 	},
 	{
 		"c": "\t",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -199,7 +199,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json punctuation.definition.dictionary.end.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments meta.structure.dictionary.value.json.comments meta.structure.dictionary.json.comments punctuation.definition.dictionary.end.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -210,7 +210,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.json meta.structure.dictionary.json punctuation.definition.dictionary.end.json",
+		"t": "source.json.comments meta.structure.dictionary.json.comments punctuation.definition.dictionary.end.json.comments",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index d94a54d8837..841024fd02b 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -18,7 +18,7 @@
   "dependencies": {
     "semver": "4.3.6",
     "vscode-extension-telemetry": "0.0.17",
-    "vscode-nls": "^3.2.1"
+    "vscode-nls": "^3.2.4"
   },
   "devDependencies": {
     "@types/node": "8.0.33",
diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
index f0053efc497..b221d624d26 100644
--- a/extensions/typescript-language-features/package.nls.json
+++ b/extensions/typescript-language-features/package.nls.json
@@ -46,7 +46,7 @@
 	"typescript.problemMatchers.tsc.label": "TypeScript problems",
 	"typescript.problemMatchers.tscWatch.label": "TypeScript problems (watch mode)",
 	"typescript.quickSuggestionsForPaths": "Enable/disable quick suggestions when typing out an import path.",
-	"typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Requires using TypeScript 2.6.0. Default of 'null' uses VS Code's locale. or newer in the workspace.",
+	"typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Requires using TypeScript 2.6.0 or newer in the workspace. Default of 'null' uses VS Code's locale.",
 	"javascript.implicitProjectConfig.experimentalDecorators": "Enable/disable 'experimentalDecorators' for JavaScript files that are not part of a project. Existing jsconfig.json or tsconfig.json files override this setting. Requires using TypeScript 2.3.1 or newer in the workspace.",
 	"typescript.autoImportSuggestions.enabled": "Enable/disable auto import suggestions. Requires using TypeScript 2.6.1 or newer in the workspace.",
 	"taskDefinition.tsconfig.description": "The tsconfig file that defines the TS build.",
@@ -56,4 +56,4 @@
 	"typescript.preferences.importModuleSpecifier": "Preferred path style for auto imports:\n- \"relative\" to the file location.\n- \"non-relative\" based on the 'baseUrl' configured in your 'jsconfig.json' / 'tsconfig.json'.\n- \"auto\" infer the shortest path type.\nRequires using TypeScript 2.9 or newer in the workspace.",
 	"typescript.showUnused": "Enable/disable highlighting of unused variables in code. Requires using TypeScript 2.9 or newer in the workspace.",
 	"typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VS Code. Possible values are: 'prompt' on each rename, 'always' update paths automatically, and 'never' rename paths and don't prompt me. Requires using TypeScript 2.9 or newer in the workspace."
-}
\ No newline at end of file
+}
diff --git a/extensions/typescript-language-features/src/features/refactor.ts b/extensions/typescript-language-features/src/features/refactor.ts
index 5feec27bcfc..c4bc4b58116 100644
--- a/extensions/typescript-language-features/src/features/refactor.ts
+++ b/extensions/typescript-language-features/src/features/refactor.ts
@@ -11,6 +11,7 @@ import { Command, CommandManager } from '../utils/commandManager';
 import { VersionDependentRegistration } from '../utils/dependentRegistration';
 import * as typeConverters from '../utils/typeConverters';
 import FormattingOptionsManager from './fileConfigurationManager';
+import TelemetryReporter from '../utils/telemetry';
 
 
 class ApplyRefactoringCommand implements Command {
@@ -18,7 +19,8 @@ class ApplyRefactoringCommand implements Command {
 	public readonly id = ApplyRefactoringCommand.ID;
 
 	constructor(
-		private readonly client: ITypeScriptServiceClient
+		private readonly client: ITypeScriptServiceClient,
+		private readonly telemetryReporter: TelemetryReporter
 	) { }
 
 	public async execute(
@@ -28,6 +30,18 @@ class ApplyRefactoringCommand implements Command {
 		action: string,
 		range: vscode.Range
 	): Promise<boolean> {
+		/* __GDPR__
+			"refactor.execute" : {
+				"action" : { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+				"${include}": [
+					"${TypeScriptCommonProperties}"
+				]
+			}
+		*/
+		this.telemetryReporter.logTelemetry('refactor.execute', {
+			action: action
+		});
+
 		const args: Proto.GetEditsForRefactorRequestArgs = {
 			...typeConverters.Range.toFileRangeRequestArgs(file, range),
 			refactor,
@@ -97,9 +111,10 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider {
 	constructor(
 		private readonly client: ITypeScriptServiceClient,
 		private readonly formattingOptionsManager: FormattingOptionsManager,
-		commandManager: CommandManager
+		commandManager: CommandManager,
+		telemetryReporter: TelemetryReporter
 	) {
-		const doRefactoringCommand = commandManager.register(new ApplyRefactoringCommand(this.client));
+		const doRefactoringCommand = commandManager.register(new ApplyRefactoringCommand(this.client, telemetryReporter));
 		commandManager.register(new SelectRefactorCommand(doRefactoringCommand));
 	}
 
@@ -204,10 +219,11 @@ export function register(
 	client: ITypeScriptServiceClient,
 	formattingOptionsManager: FormattingOptionsManager,
 	commandManager: CommandManager,
+	telemetryReporter: TelemetryReporter,
 ) {
 	return new VersionDependentRegistration(client, API.v240, () => {
 		return vscode.languages.registerCodeActionsProvider(selector,
-			new TypeScriptRefactorProvider(client, formattingOptionsManager, commandManager),
+			new TypeScriptRefactorProvider(client, formattingOptionsManager, commandManager, telemetryReporter),
 			TypeScriptRefactorProvider.metadata);
 	});
 }
diff --git a/extensions/typescript-language-features/src/features/updatePathsOnRename.ts b/extensions/typescript-language-features/src/features/updatePathsOnRename.ts
index 4e9c0398fea..6f2d1265275 100644
--- a/extensions/typescript-language-features/src/features/updatePathsOnRename.ts
+++ b/extensions/typescript-language-features/src/features/updatePathsOnRename.ts
@@ -83,6 +83,16 @@ export class UpdateImportsOnFileRenameHandler {
 		this.client.bufferSyncSupport.closeResource(targetResource);
 		this.client.bufferSyncSupport.openTextDocument(document);
 
+		// Workaround for https://github.com/Microsoft/vscode/issues/52967
+		// Never attempt to update import paths if the file does not contain something the looks like an export
+		const tree = await this.client.execute('navtree', { file: newFile });
+		const hasExport = (node: Proto.NavigationTree): boolean => {
+			return !!node.kindModifiers.match(/\bexport\b/g) || !!(node.childItems && node.childItems.some(hasExport));
+		};
+		if (!tree.body || !tree.body || !hasExport(tree.body)) {
+			return;
+		}
+
 		const edits = await this.getEditsForFileRename(targetFile, document, oldFile, newFile);
 		if (!edits || !edits.size) {
 			return;
@@ -201,7 +211,7 @@ export class UpdateImportsOnFileRenameHandler {
 			return files[0];
 		}
 
-		return this._handles(resource) ? resource : undefined;
+		return (await this._handles(resource)) ? resource : undefined;
 	}
 
 	private async getEditsForFileRename(
@@ -225,6 +235,16 @@ export class UpdateImportsOnFileRenameHandler {
 
 		const edits: Proto.FileCodeEdits[] = [];
 		for (const edit of response.body) {
+			// Workaround for https://github.com/Microsoft/vscode/issues/52675
+			if ((edit as Proto.FileCodeEdits).fileName.match(/[\/\\]node_modules[\/\\]/gi)) {
+				continue;
+			}
+			for (const change of (edit as Proto.FileCodeEdits).textChanges) {
+				if (change.newText.match(/\/node_modules\//gi)) {
+					continue;
+				}
+			}
+
 			edits.push(await this.fixEdit(edit, isDirectoryRename, oldFile, newFile));
 		}
 		return typeConverters.WorkspaceEdit.fromFileCodeEdits(this.client, edits);
diff --git a/extensions/typescript-language-features/src/languageProvider.ts b/extensions/typescript-language-features/src/languageProvider.ts
index 1776fd1b8fc..2d7cde5e693 100644
--- a/extensions/typescript-language-features/src/languageProvider.ts
+++ b/extensions/typescript-language-features/src/languageProvider.ts
@@ -86,7 +86,7 @@ export default class LanguageProvider {
 		this.disposables.push((await import('./features/jsDocCompletions')).register(selector, this.client, this.commandManager));
 		this.disposables.push((await import('./features/organizeImports')).register(selector, this.client, this.commandManager, this.fileConfigurationManager));
 		this.disposables.push((await import('./features/quickFix')).register(selector, this.client, this.fileConfigurationManager, this.commandManager, this.diagnosticsManager, this.telemetryReporter));
-		this.disposables.push((await import('./features/refactor')).register(selector, this.client, this.fileConfigurationManager, this.commandManager));
+		this.disposables.push((await import('./features/refactor')).register(selector, this.client, this.fileConfigurationManager, this.commandManager, this.telemetryReporter));
 		this.disposables.push((await import('./features/references')).register(selector, this.client));
 		this.disposables.push((await import('./features/referencesCodeLens')).register(selector, this.description.id, this.client, cachedResponse));
 		this.disposables.push((await import('./features/rename')).register(selector, this.client));
diff --git a/extensions/typescript-language-features/yarn.lock b/extensions/typescript-language-features/yarn.lock
index b9c4b1eece7..39422f56063 100644
--- a/extensions/typescript-language-features/yarn.lock
+++ b/extensions/typescript-language-features/yarn.lock
@@ -1548,9 +1548,9 @@ vscode-extension-telemetry@0.0.17:
   dependencies:
     applicationinsights "1.0.1"
 
-vscode-nls@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
+vscode-nls@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
 
 vscode@^1.1.10:
   version "1.1.17"
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/quickInput.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/quickInput.test.ts
index 7211b8f397c..04f8ba296e3 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/quickInput.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/quickInput.test.ts
@@ -13,7 +13,10 @@ interface QuickPickExpected {
 	events: string[];
 	activeItems: string[][];
 	selectionItems: string[][];
-	acceptedItems: string[][];
+	acceptedItems: {
+		active: string[][];
+		selection: string[][];
+	};
 }
 
 suite('window namespace tests', function () {
@@ -31,8 +34,11 @@ suite('window namespace tests', function () {
 				events: ['active', 'active', 'selection', 'accept', 'hide'],
 				activeItems: [['eins'], ['zwei']],
 				selectionItems: [['zwei']],
-				acceptedItems: [['zwei']],
-			}, done);
+				acceptedItems: {
+					active: [['zwei']],
+					selection: [['zwei']]
+				},
+			}, (err?: any) => done(err));
 			quickPick.items = ['eins', 'zwei', 'drei'].map(label => ({ label }));
 			quickPick.show();
 
@@ -53,8 +59,11 @@ suite('window namespace tests', function () {
 				events: ['active', 'selection', 'accept', 'hide'],
 				activeItems: [['zwei']],
 				selectionItems: [['zwei']],
-				acceptedItems: [['zwei']],
-			}, done);
+				acceptedItems: {
+					active: [['zwei']],
+					selection: [['zwei']]
+				},
+			}, (err?: any) => done(err));
 			quickPick.items = ['eins', 'zwei', 'drei'].map(label => ({ label }));
 			quickPick.activeItems = [quickPick.items[1]];
 			quickPick.show();
@@ -64,6 +73,35 @@ suite('window namespace tests', function () {
 			})()
 				.catch(err => done(err));
 		});
+
+		test('createQuickPick, select first and second', function (_done) {
+			let done = (err?: any) => {
+				done = () => {};
+				_done(err);
+			};
+
+			const quickPick = createQuickPick({
+				events: ['active', 'selection', 'active', 'selection', 'accept', 'hide'],
+				activeItems: [['eins'], ['zwei']],
+				selectionItems: [['eins'], ['eins', 'zwei']],
+				acceptedItems: {
+					active: [['zwei']],
+					selection: [['eins', 'zwei']]
+				},
+			}, (err?: any) => done(err));
+			quickPick.canSelectMany = true;
+			quickPick.items = ['eins', 'zwei', 'drei'].map(label => ({ label }));
+			quickPick.show();
+
+			(async () => {
+				await commands.executeCommand('workbench.action.quickOpenSelectNext');
+				await commands.executeCommand('workbench.action.quickPickManyToggle');
+				await commands.executeCommand('workbench.action.quickOpenSelectNext');
+				await commands.executeCommand('workbench.action.quickPickManyToggle');
+				await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
+			})()
+				.catch(err => done(err));
+		});
 	});
 });
 
@@ -92,9 +130,10 @@ function createQuickPick(expected: QuickPickExpected, done: (err?: any) => void)
 	quickPick.onDidAccept(() => {
 		try {
 			assert.equal('accept', expected.events.shift());
-			const expectedItems = expected.acceptedItems.shift();
-			assert.deepEqual(quickPick.activeItems.map(item => item.label), expectedItems);
-			assert.deepEqual(quickPick.selectedItems.map(item => item.label), expectedItems);
+			const expectedActive = expected.acceptedItems.active.shift();
+			assert.deepEqual(quickPick.activeItems.map(item => item.label), expectedActive);
+			const expectedSelection = expected.acceptedItems.selection.shift();
+			assert.deepEqual(quickPick.selectedItems.map(item => item.label), expectedSelection);
 			quickPick.dispose();
 		} catch (err) {
 			done(err);
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
index 87734062b8a..27877a8608a 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
@@ -410,9 +410,14 @@ suite('window namespace tests', () => {
 
 	test('showQuickPick, accept second', async function () {
 		const resolves: ((value: string) => void)[] = [];
+		let done: () => void;
+		const unexpected = new Promise((resolve, reject) => {
+			done = () => resolve();
+			resolves.push(reject);
+		});
 		const first = new Promise(resolve => resolves.push(resolve));
 		const pick = window.showQuickPick(['eins', 'zwei', 'drei'], {
-			onDidSelectItem: item => resolves.shift()!(item as string)
+			onDidSelectItem: item => resolves.pop()!(item as string)
 		});
 		assert.equal(await first, 'eins');
 		const second = new Promise(resolve => resolves.push(resolve));
@@ -420,12 +425,19 @@ suite('window namespace tests', () => {
 		assert.equal(await second, 'zwei');
 		await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
 		assert.equal(await pick, 'zwei');
+		done!();
+		return unexpected;
 	});
 
 	test('showQuickPick, select first two', async function () {
 		const resolves: ((value: string) => void)[] = [];
+		let done: () => void;
+		const unexpected = new Promise((resolve, reject) => {
+			done = () => resolve();
+			resolves.push(reject);
+		});
 		const picks = window.showQuickPick(['eins', 'zwei', 'drei'], {
-			onDidSelectItem: item => resolves.shift()!(item as string),
+			onDidSelectItem: item => resolves.pop()!(item as string),
 			canPickMany: true
 		});
 		const first = new Promise(resolve => resolves.push(resolve));
@@ -438,6 +450,8 @@ suite('window namespace tests', () => {
 		await commands.executeCommand('workbench.action.quickPickManyToggle');
 		await commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem');
 		assert.deepStrictEqual(await picks, ['eins', 'zwei']);
+		done!();
+		return unexpected;
 	});
 
 	test('showQuickPick, keep selection (Microsoft/vscode-azure-account#67)', async function () {
@@ -646,7 +660,7 @@ suite('window namespace tests', () => {
 			});
 			const renderer = window.createTerminalRenderer('foo');
 			const reg2 = renderer.onDidChangeMaximumDimensions(dimensions => {
-				assert.ok(dimensions.cols > 0);
+				assert.ok(dimensions.columns > 0);
 				assert.ok(dimensions.rows > 0);
 				reg2.dispose();
 				const reg3 = window.onDidCloseTerminal(() => {
@@ -660,7 +674,7 @@ suite('window namespace tests', () => {
 		test('TerminalRenderer.write should fire Terminal.onData', (done) => {
 			const reg1 = window.onDidOpenTerminal(terminal => {
 				reg1.dispose();
-				const reg2 = terminal.onData(data => {
+				const reg2 = terminal.onDidWriteData(data => {
 					assert.equal(data, 'bar');
 					reg2.dispose();
 					const reg3 = window.onDidCloseTerminal(() => {
@@ -677,7 +691,7 @@ suite('window namespace tests', () => {
 		test('Terminal.sendText should fire Termnial.onInput', (done) => {
 			const reg1 = window.onDidOpenTerminal(terminal => {
 				reg1.dispose();
-				const reg2 = renderer.onInput(data => {
+				const reg2 = renderer.onDidAcceptInput(data => {
 					assert.equal(data, 'bar');
 					reg2.dispose();
 					const reg3 = window.onDidCloseTerminal(() => {
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
index 1f42a34e597..2e9fe0d0bbf 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
@@ -511,6 +511,16 @@ suite('workspace-namespace', () => {
 	// 	});
 	// });
 
+	test('findTextInFiles', async () => {
+		const results: vscode.TextSearchResult[] = [];
+		await vscode.workspace.findTextInFiles({ pattern: 'foo' }, { include: '*.ts' }, result => {
+			results.push(result);
+		});
+
+		assert.equal(results.length, 1);
+		assert.equal(vscode.workspace.asRelativePath(results[0].uri), '10linefile.ts');
+	});
+
 	test('applyEdit', () => {
 
 		return vscode.workspace.openTextDocument(vscode.Uri.parse('untitled:' + join(vscode.workspace.rootPath || '', './new2.txt'))).then(doc => {
@@ -603,8 +613,8 @@ suite('workspace-namespace', () => {
 
 		let newDoc = await vscode.workspace.openTextDocument(newUri);
 		assert.equal(newDoc.getText(), 'HelloFoo');
-		// let doc = await vscode.workspace.openTextDocument(docUri);
-		// assert.equal(doc.getText(), 'Bar');
+		let doc = await vscode.workspace.openTextDocument(docUri);
+		assert.equal(doc.getText(), 'Bar');
 	});
 
 	test('WorkspaceEdit api - after saving a deleted file, it still shows up as deleted. #42667', async function () {
@@ -679,8 +689,7 @@ suite('workspace-namespace', () => {
 		we = new vscode.WorkspaceEdit();
 		we.createFile(docUri, { overwrite: true });
 		assert.ok(await vscode.workspace.applyEdit(we));
-		// todo@ben
-		// assert.equal((await vscode.workspace.openTextDocument(docUri)).getText(), '');
+		assert.equal((await vscode.workspace.openTextDocument(docUri)).getText(), '');
 	});
 
 	test('WorkspaceEdit: create & ignoreIfExists', async function () {
diff --git a/package.json b/package.json
index 9a84ea770b7..54df1ab121c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
-  "version": "1.25.0",
-  "distro": "974512091c88e4e435fc2a427cf44b08e61a57dd",
+  "version": "1.26.0",
+  "distro": "7ee5cda9f4f44b2ba1f1ab290e48f86416914794",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -39,17 +39,17 @@
     "native-is-elevated": "^0.2.1",
     "native-keymap": "1.2.5",
     "native-watchdog": "0.3.0",
-    "node-pty": "0.7.5",
+    "node-pty": "0.7.6",
     "semver": "^5.5.0",
     "spdlog": "0.6.0",
     "sudo-prompt": "8.2.0",
     "v8-inspect-profiler": "^0.0.8",
     "vscode-chokidar": "1.6.2",
-    "vscode-debugprotocol": "1.28.0",
+    "vscode-debugprotocol": "1.30.0",
     "vscode-nsfw": "1.0.17",
     "vscode-ripgrep": "^1.0.1",
     "vscode-textmate": "^4.0.1",
-    "vscode-xterm": "3.5.0-beta17",
+    "vscode-xterm": "3.6.0-beta1",
     "yauzl": "^2.9.1"
   },
   "devDependencies": {
@@ -116,7 +116,7 @@
     "sinon": "^1.17.2",
     "source-map": "^0.4.4",
     "tslint": "^5.9.1",
-    "typescript": "2.9.1",
+    "typescript": "2.9.2",
     "typescript-formatter": "7.1.0",
     "uglify-es": "^3.0.18",
     "underscore": "^1.8.2",
@@ -137,4 +137,4 @@
     "windows-mutex": "^0.2.0",
     "windows-process-tree": "0.2.2"
   }
-}
\ No newline at end of file
+}
diff --git a/src/bootstrap-amd.js b/src/bootstrap-amd.js
index f0015d389d3..98bc02c22cd 100644
--- a/src/bootstrap-amd.js
+++ b/src/bootstrap-amd.js
@@ -29,6 +29,8 @@ function readFile(file) {
 	});
 }
 
+const writeFile = (file, content) => new Promise((c, e) => fs.writeFile(file, content, 'utf8', err => err ? e(err) : c()));
+
 var rawNlsConfig = process.env['VSCODE_NLS_CONFIG'];
 var nlsConfig = rawNlsConfig ? JSON.parse(rawNlsConfig) : { availableLanguages: {} };
 
@@ -46,8 +48,15 @@ if (nlsConfig._resolvedLanguagePackCoreLocation) {
 			let json = JSON.parse(content);
 			bundles[bundle] = json;
 			cb(undefined, json);
-		})
-			.catch(cb);
+		}).catch((error) => {
+			try {
+				if (nlsConfig._corruptedFile) {
+					writeFile(nlsConfig._corruptedFile, 'corrupted').catch(function (error) { console.error(error); });
+				}
+			} finally {
+				cb(error, undefined);
+			}
+		});
 	};
 }
 
diff --git a/src/cli.js b/src/cli.js
index 1bb0476f61f..41d46871f92 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -20,8 +20,20 @@ function getApplicationPath() {
 	}
 }
 
-const portableDataName = product.portable || `${product.applicationName}-portable-data`;
-const portableDataPath = path.join(path.dirname(getApplicationPath()), portableDataName);
+function getPortableDataPath() {
+	if (process.env['VSCODE_PORTABLE']) {
+		return process.env['VSCODE_PORTABLE'];
+	}
+
+	if (process.platform === 'win32' || process.platform === 'linux') {
+		return path.join(getApplicationPath(), 'data');
+	} else {
+		const portableDataName = product.portable || `${product.applicationName}-portable-data`;
+		return path.join(path.dirname(getApplicationPath()), portableDataName);
+	}
+}
+
+const portableDataPath = getPortableDataPath();
 const isPortable = fs.existsSync(portableDataPath);
 const portableTempPath = path.join(portableDataPath, 'tmp');
 const isTempPortable = isPortable && fs.existsSync(portableTempPath);
diff --git a/src/main.js b/src/main.js
index 2fc84ae20fd..5d30c39f692 100644
--- a/src/main.js
+++ b/src/main.js
@@ -27,8 +27,20 @@ function getApplicationPath() {
 	}
 }
 
-const portableDataName = product.portable || `${product.applicationName}-portable-data`;
-const portableDataPath = process.env['VSCODE_PORTABLE'] || path.join(path.dirname(getApplicationPath()), portableDataName);
+function getPortableDataPath() {
+	if (process.env['VSCODE_PORTABLE']) {
+		return process.env['VSCODE_PORTABLE'];
+	}
+
+	if (process.platform === 'win32' || process.platform === 'linux') {
+		return path.join(getApplicationPath(), 'data');
+	} else {
+		const portableDataName = product.portable || `${product.applicationName}-portable-data`;
+		return path.join(path.dirname(getApplicationPath()), portableDataName);
+	}
+}
+
+const portableDataPath = getPortableDataPath();
 const isPortable = fs.existsSync(portableDataPath);
 const portableTempPath = path.join(portableDataPath, 'tmp');
 const isTempPortable = isPortable && fs.existsSync(portableTempPath);
@@ -111,6 +123,10 @@ const exists = file => new Promise(c => fs.exists(file, c));
 const readFile = file => new Promise((c, e) => fs.readFile(file, 'utf8', (err, data) => err ? e(err) : c(data)));
 const writeFile = (file, content) => new Promise((c, e) => fs.writeFile(file, content, 'utf8', err => err ? e(err) : c()));
 const touch = file => new Promise((c, e) => { const d = new Date(); fs.utimes(file, d, d, err => err ? e(err) : c()); });
+const lstat = file => new Promise((c, e) => fs.lstat(file, (err, stats) => err ? e(err) : c(stats)));
+const readdir = dir => new Promise((c, e) => fs.readdir(dir, (err, files) => err ? e(err) : c(files)));
+const rmdir = dir => new Promise((c, e) => fs.rmdir(dir, err => err ? e(err) : c(undefined)));
+const unlink = file => new Promise((c, e) => fs.unlink(file, err => err ? e(err) : c(undefined)));
 
 function mkdirp(dir) {
 	return mkdir(dir).then(null, err => {
@@ -126,6 +142,23 @@ function mkdirp(dir) {
 	});
 }
 
+function rimraf(location) {
+	return lstat(location).then(stat => {
+		if (stat.isDirectory() && !stat.isSymbolicLink()) {
+			return readdir(location)
+				.then(children => Promise.all(children.map(child => rimraf(path.join(location, child)))))
+				.then(() => rmdir(location));
+		} else {
+			return unlink(location);
+		}
+	}, (err) => {
+		if (err.code === 'ENOENT') {
+			return void 0;
+		}
+		throw err;
+	});
+}
+
 function resolveJSFlags(...jsFlags) {
 
 	if (args['js-flags']) {
@@ -255,62 +288,75 @@ function getNLSConfiguration(locale) {
 			let cacheRoot = path.join(userData, 'clp', packId);
 			let coreLocation = path.join(cacheRoot, commit);
 			let translationsConfigFile = path.join(cacheRoot, 'tcf.json');
+			let corruptedFile = path.join(cacheRoot, 'corrupted.info');
 			let result = {
 				locale: initialLocale,
 				availableLanguages: { '*': locale },
 				_languagePackId: packId,
 				_translationsConfigFile: translationsConfigFile,
 				_cacheRoot: cacheRoot,
-				_resolvedLanguagePackCoreLocation: coreLocation
+				_resolvedLanguagePackCoreLocation: coreLocation,
+				_corruptedFile: corruptedFile
 			};
-			return exists(coreLocation).then((fileExists) => {
-				if (fileExists) {
-					// We don't wait for this. No big harm if we can't touch
-					touch(coreLocation).catch(() => { });
-					perf.mark('nlsGeneration:end');
-					return result;
+			return exists(corruptedFile).then((corrupted) => {
+				// The nls cache directory is corrupted.
+				let toDelete;
+				if (corrupted) {
+					toDelete = rimraf(cacheRoot);
+				} else {
+					toDelete = Promise.resolve(undefined);
 				}
-				return mkdirp(coreLocation).then(() => {
-					return Promise.all([readFile(path.join(__dirname, 'nls.metadata.json')), readFile(mainPack)]);
-				}).then((values) => {
-					let metadata = JSON.parse(values[0]);
-					let packData = JSON.parse(values[1]).contents;
-					let bundles = Object.keys(metadata.bundles);
-					let writes = [];
-					for (let bundle of bundles) {
-						let modules = metadata.bundles[bundle];
-						let target = Object.create(null);
-						for (let module of modules) {
-							let keys = metadata.keys[module];
-							let defaultMessages = metadata.messages[module];
-							let translations = packData[module];
-							let targetStrings;
-							if (translations) {
-								targetStrings = [];
-								for (let i = 0; i < keys.length; i++) {
-									let elem = keys[i];
-									let key = typeof elem === 'string' ? elem : elem.key;
-									let translatedMessage = translations[key];
-									if (translatedMessage === undefined) {
-										translatedMessage = defaultMessages[i];
-									}
-									targetStrings.push(translatedMessage);
-								}
-							} else {
-								targetStrings = defaultMessages;
-							}
-							target[module] = targetStrings;
+				return toDelete.then(() => {
+					return exists(coreLocation).then((fileExists) => {
+						if (fileExists) {
+							// We don't wait for this. No big harm if we can't touch
+							touch(coreLocation).catch(() => { });
+							perf.mark('nlsGeneration:end');
+							return result;
 						}
-						writes.push(writeFile(path.join(coreLocation, bundle.replace(/\//g, '!') + '.nls.json'), JSON.stringify(target)));
-					}
-					writes.push(writeFile(translationsConfigFile, JSON.stringify(packConfig.translations)));
-					return Promise.all(writes);
-				}).then(() => {
-					perf.mark('nlsGeneration:end');
-					return result;
-				}).catch((err) => {
-					console.error('Generating translation files failed.', err);
-					return defaultResult(locale);
+						return mkdirp(coreLocation).then(() => {
+							return Promise.all([readFile(path.join(__dirname, 'nls.metadata.json')), readFile(mainPack)]);
+						}).then((values) => {
+							let metadata = JSON.parse(values[0]);
+							let packData = JSON.parse(values[1]).contents;
+							let bundles = Object.keys(metadata.bundles);
+							let writes = [];
+							for (let bundle of bundles) {
+								let modules = metadata.bundles[bundle];
+								let target = Object.create(null);
+								for (let module of modules) {
+									let keys = metadata.keys[module];
+									let defaultMessages = metadata.messages[module];
+									let translations = packData[module];
+									let targetStrings;
+									if (translations) {
+										targetStrings = [];
+										for (let i = 0; i < keys.length; i++) {
+											let elem = keys[i];
+											let key = typeof elem === 'string' ? elem : elem.key;
+											let translatedMessage = translations[key];
+											if (translatedMessage === undefined) {
+												translatedMessage = defaultMessages[i];
+											}
+											targetStrings.push(translatedMessage);
+										}
+									} else {
+										targetStrings = defaultMessages;
+									}
+									target[module] = targetStrings;
+								}
+								writes.push(writeFile(path.join(coreLocation, bundle.replace(/\//g, '!') + '.nls.json'), JSON.stringify(target)));
+							}
+							writes.push(writeFile(translationsConfigFile, JSON.stringify(packConfig.translations)));
+							return Promise.all(writes);
+						}).then(() => {
+							perf.mark('nlsGeneration:end');
+							return result;
+						}).catch((err) => {
+							console.error('Generating translation files failed.', err);
+							return defaultResult(locale);
+						});
+					});
 				});
 			});
 		});
diff --git a/src/tsconfig.json b/src/tsconfig.json
index d2b9e229c4a..408cad4917b 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -18,5 +18,10 @@
 		"typeRoots": [
 			"typings"
 		]
-	}
+	},
+	"exclude": [
+		"../out",
+		"../out-build",
+		"../out-vscode"
+	]
 }
diff --git a/src/typings/vscode-xterm.d.ts b/src/typings/vscode-xterm.d.ts
index 8661eec2dd7..eb8c87e277a 100644
--- a/src/typings/vscode-xterm.d.ts
+++ b/src/typings/vscode-xterm.d.ts
@@ -124,6 +124,15 @@ declare module 'vscode-xterm' {
 		 */
 		macOptionIsMeta?: boolean;
 
+		/**
+		 * Whether holding a modifier key will force normal selection behavior,
+		 * regardless of whether the terminal is in mouse events mode. This will
+		 * also prevent mouse events from being emitted by the terminal. For example,
+		 * this allows you to use xterm.js' regular selection inside tmux with
+		 * mouse mode enabled.
+		 */
+		macOptionClickForcesSelection?: boolean;
+
 		/**
 		 * (EXPERIMENTAL) The type of renderer to use, this allows using the
 		 * fallback DOM renderer when canvas is too slow for the environment. The
diff --git a/src/vs/base/browser/builder.ts b/src/vs/base/browser/builder.ts
index b47acecc5ae..9c285274a99 100644
--- a/src/vs/base/browser/builder.ts
+++ b/src/vs/base/browser/builder.ts
@@ -5,9 +5,8 @@
 'use strict';
 
 import 'vs/css!./builder';
-import { TPromise } from 'vs/base/common/winjs.base';
 import * as types from 'vs/base/common/types';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
 import * as strings from 'vs/base/common/strings';
 import * as assert from 'vs/base/common/assert';
 import * as DOM from 'vs/base/browser/dom';
@@ -70,8 +69,8 @@ export class Builder implements IDisposable {
 	private offdom: boolean;
 	private container: HTMLElement;
 	private createdElements: HTMLElement[];
-	private toUnbind: { [type: string]: IDisposable[]; };
-	private captureToUnbind: { [type: string]: IDisposable[]; };
+	private toDispose: { [type: string]: IDisposable[]; };
+	private captureToDispose: { [type: string]: IDisposable[]; };
 
 	constructor(element?: HTMLElement, offdom?: boolean) {
 		this.offdom = offdom;
@@ -81,27 +80,27 @@ export class Builder implements IDisposable {
 		this.currentElement = element;
 		this.createdElements = [];
 
-		this.toUnbind = {};
-		this.captureToUnbind = {};
+		this.toDispose = {};
+		this.captureToDispose = {};
 	}
 
 	/**
 	 *  Returns a new builder that lets the current HTML Element of this builder be the container
 	 *  for future additions on the builder.
 	 */
-	public asContainer(): Builder {
+	asContainer(): Builder {
 		return withBuilder(this, this.offdom);
 	}
 
 	/**
 	 *  Clones the builder providing the same properties as this one.
 	 */
-	public clone(): Builder {
+	clone(): Builder {
 		let builder = new Builder(this.container, this.offdom);
 		builder.currentElement = this.currentElement;
 		builder.createdElements = this.createdElements;
-		builder.captureToUnbind = this.captureToUnbind;
-		builder.toUnbind = this.toUnbind;
+		builder.captureToDispose = this.captureToDispose;
+		builder.toDispose = this.toDispose;
 
 		return builder;
 	}
@@ -113,9 +112,9 @@ export class Builder implements IDisposable {
 	 *  at the end.
 	 *  This method is a no-op unless the builder was created with the offdom option to be true.
 	 */
-	public build(container?: Builder, index?: number): Builder;
-	public build(container?: HTMLElement, index?: number): Builder;
-	public build(container?: any, index?: number): Builder {
+	build(container?: Builder, index?: number): Builder;
+	build(container?: HTMLElement, index?: number): Builder;
+	build(container?: any, index?: number): Builder {
 		assert.ok(this.offdom, 'This builder was not created off-dom, so build() can not be called.');
 
 		// Use builders own container if present
@@ -154,9 +153,9 @@ export class Builder implements IDisposable {
 	 *  attached the current element. If the current element has a parent, it will be
 	 *  detached from that parent.
 	 */
-	public appendTo(container?: Builder, index?: number): Builder;
-	public appendTo(container?: HTMLElement, index?: number): Builder;
-	public appendTo(container?: any, index?: number): Builder {
+	appendTo(container?: Builder, index?: number): Builder;
+	appendTo(container?: HTMLElement, index?: number): Builder;
+	appendTo(container?: any, index?: number): Builder {
 
 		// Use builders own container if present
 		if (!container) {
@@ -194,9 +193,9 @@ export class Builder implements IDisposable {
 	 *  of the return value being the builder which called the operation (`a` in the
 	 *  first case; `b` in the second case).
 	 */
-	public append(child: HTMLElement, index?: number): Builder;
-	public append(child: Builder, index?: number): Builder;
-	public append(child: any, index?: number): Builder {
+	append(child: HTMLElement, index?: number): Builder;
+	append(child: Builder, index?: number): Builder;
+	append(child: any, index?: number): Builder {
 		assert.ok(child, 'Need a child to append');
 
 		if (DOM.isHTMLElement(child)) {
@@ -213,7 +212,7 @@ export class Builder implements IDisposable {
 	/**
 	 *  Removes the current element of this builder from its parent node.
 	 */
-	public offDOM(): Builder {
+	offDOM(): Builder {
 		if (this.currentElement.parentNode) {
 			this.currentElement.parentNode.removeChild(this.currentElement);
 		}
@@ -224,14 +223,14 @@ export class Builder implements IDisposable {
 	/**
 	 *  Returns the HTML Element the builder is currently active on.
 	 */
-	public getHTMLElement(): HTMLElement {
+	getHTMLElement(): HTMLElement {
 		return this.currentElement;
 	}
 
 	/**
 	 *  Returns the HTML Element the builder is building in.
 	 */
-	public getContainer(): HTMLElement {
+	getContainer(): HTMLElement {
 		return this.container;
 	}
 
@@ -245,7 +244,7 @@ export class Builder implements IDisposable {
 	 *  of the element. The function will be called with a new builder created with the
 	 *  provided element.
 	 */
-	public div(attributes?: any, fn?: (builder: Builder) => void): Builder {
+	div(attributes?: any, fn?: (builder: Builder) => void): Builder {
 		return this.doElement('div', attributes, fn);
 	}
 
@@ -257,7 +256,7 @@ export class Builder implements IDisposable {
 	 *  of the element. The function will be called with a new builder created with the
 	 *  provided element.
 	 */
-	public p(attributes?: any, fn?: (builder: Builder) => void): Builder {
+	p(attributes?: any, fn?: (builder: Builder) => void): Builder {
 		return this.doElement('p', attributes, fn);
 	}
 
@@ -269,7 +268,7 @@ export class Builder implements IDisposable {
 	 *  of the element. The function will be called with a new builder created with the
 	 *  provided element.
 	 */
-	public ul(attributes?: any, fn?: (builder: Builder) => void): Builder {
+	ul(attributes?: any, fn?: (builder: Builder) => void): Builder {
 		return this.doElement('ul', attributes, fn);
 	}
 
@@ -281,7 +280,7 @@ export class Builder implements IDisposable {
 	 *  of the element. The function will be called with a new builder created with the
 	 *  provided element.
 	 */
-	public li(attributes?: any, fn?: (builder: Builder) => void): Builder {
+	li(attributes?: any, fn?: (builder: Builder) => void): Builder {
 		return this.doElement('li', attributes, fn);
 	}
 
@@ -293,7 +292,7 @@ export class Builder implements IDisposable {
 	 *  of the element. The function will be called with a new builder created with the
 	 *  provided element.
 	 */
-	public span(attributes?: any, fn?: (builder: Builder) => void): Builder {
+	span(attributes?: any, fn?: (builder: Builder) => void): Builder {
 		return this.doElement('span', attributes, fn);
 	}
 
@@ -305,7 +304,7 @@ export class Builder implements IDisposable {
 	 *  of the element. The function will be called with a new builder created with the
 	 *  provided element.
 	 */
-	public img(attributes?: any, fn?: (builder: Builder) => void): Builder {
+	img(attributes?: any, fn?: (builder: Builder) => void): Builder {
 		return this.doElement('img', attributes, fn);
 	}
 
@@ -317,7 +316,7 @@ export class Builder implements IDisposable {
 	 *  of the element. The function will be called with a new builder created with the
 	 *  provided element.
 	 */
-	public a(attributes?: any, fn?: (builder: Builder) => void): Builder {
+	a(attributes?: any, fn?: (builder: Builder) => void): Builder {
 		return this.doElement('a', attributes, fn);
 	}
 
@@ -329,7 +328,7 @@ export class Builder implements IDisposable {
 	 *  of the element. The function will be called with a new builder created with the
 	 *  provided element.
 	 */
-	public element(name: string, attributes?: any, fn?: (builder: Builder) => void): Builder {
+	element(name: string, attributes?: any, fn?: (builder: Builder) => void): Builder {
 		return this.doElement(name, attributes, fn);
 	}
 
@@ -371,7 +370,7 @@ export class Builder implements IDisposable {
 	/**
 	 *  Calls focus() on the current HTML element;
 	 */
-	public domFocus(): Builder {
+	domFocus(): Builder {
 		this.currentElement.focus();
 
 		return this;
@@ -380,7 +379,7 @@ export class Builder implements IDisposable {
 	/**
 	 *  Calls blur() on the current HTML element;
 	 */
-	public domBlur(): Builder {
+	domBlur(): Builder {
 		this.currentElement.blur();
 
 		return this;
@@ -389,14 +388,14 @@ export class Builder implements IDisposable {
 	/**
 	 *  Registers listener on event types on the current element.
 	 */
-	public on<E extends Event = Event>(type: string, fn: (e: E, builder: Builder, unbind: IDisposable) => void, listenerToUnbindContainer?: IDisposable[], useCapture?: boolean): Builder;
-	public on<E extends Event = Event>(typeArray: string[], fn: (e: E, builder: Builder, unbind: IDisposable) => void, listenerToUnbindContainer?: IDisposable[], useCapture?: boolean): Builder;
-	public on<E extends Event = Event>(arg1: any, fn: (e: E, builder: Builder, unbind: IDisposable) => void, listenerToUnbindContainer?: IDisposable[], useCapture?: boolean): Builder {
+	on<E extends Event = Event>(type: string, fn: (e: E, builder: Builder, unbind: IDisposable) => void, listenerToDisposeContainer?: IDisposable[], useCapture?: boolean): Builder;
+	on<E extends Event = Event>(typeArray: string[], fn: (e: E, builder: Builder, unbind: IDisposable) => void, listenerToDisposeContainer?: IDisposable[], useCapture?: boolean): Builder;
+	on<E extends Event = Event>(arg1: any, fn: (e: E, builder: Builder, unbind: IDisposable) => void, listenerToDisposeContainer?: IDisposable[], useCapture?: boolean): Builder {
 
 		// Event Type Array
 		if (types.isArray(arg1)) {
 			arg1.forEach((type: string) => {
-				this.on(type, fn, listenerToUnbindContainer, useCapture);
+				this.on(type, fn, listenerToDisposeContainer, useCapture);
 			});
 		}
 
@@ -411,15 +410,15 @@ export class Builder implements IDisposable {
 
 			// Remember for off() use
 			if (useCapture) {
-				if (!this.captureToUnbind[type]) {
-					this.captureToUnbind[type] = [];
+				if (!this.captureToDispose[type]) {
+					this.captureToDispose[type] = [];
 				}
-				this.captureToUnbind[type].push(unbind);
+				this.captureToDispose[type].push(unbind);
 			} else {
-				if (!this.toUnbind[type]) {
-					this.toUnbind[type] = [];
+				if (!this.toDispose[type]) {
+					this.toDispose[type] = [];
 				}
-				this.toUnbind[type].push(unbind);
+				this.toDispose[type].push(unbind);
 			}
 
 			// Bind to Element
@@ -428,8 +427,8 @@ export class Builder implements IDisposable {
 			this.setProperty(LISTENER_BINDING_ID, listenerBinding);
 
 			// Add to Array if passed in
-			if (listenerToUnbindContainer && types.isArray(listenerToUnbindContainer)) {
-				listenerToUnbindContainer.push(unbind);
+			if (listenerToDisposeContainer && types.isArray(listenerToDisposeContainer)) {
+				listenerToDisposeContainer.push(unbind);
 			}
 		}
 
@@ -439,9 +438,9 @@ export class Builder implements IDisposable {
 	/**
 	 *  Removes all listeners from all elements created by the builder for the given event type.
 	 */
-	public off(type: string, useCapture?: boolean): Builder;
-	public off(typeArray: string[], useCapture?: boolean): Builder;
-	public off(arg1: any, useCapture?: boolean): Builder {
+	off(type: string, useCapture?: boolean): Builder;
+	off(typeArray: string[], useCapture?: boolean): Builder;
+	off(arg1: any, useCapture?: boolean): Builder {
 
 		// Event Type Array
 		if (types.isArray(arg1)) {
@@ -454,12 +453,12 @@ export class Builder implements IDisposable {
 		else {
 			let type = arg1;
 			if (useCapture) {
-				if (this.captureToUnbind[type]) {
-					this.captureToUnbind[type] = dispose(this.captureToUnbind[type]);
+				if (this.captureToDispose[type]) {
+					this.captureToDispose[type] = dispose(this.captureToDispose[type]);
 				}
 			} else {
-				if (this.toUnbind[type]) {
-					this.toUnbind[type] = dispose(this.toUnbind[type]);
+				if (this.toDispose[type]) {
+					this.toDispose[type] = dispose(this.toDispose[type]);
 				}
 			}
 		}
@@ -471,9 +470,9 @@ export class Builder implements IDisposable {
 	 *  Registers listener on event types on the current element and removes
 	 *  them after first invocation.
 	 */
-	public once<E extends Event = Event>(type: string, fn: (e: E, builder: Builder, unbind: IDisposable) => void, listenerToUnbindContainer?: IDisposable[], useCapture?: boolean): Builder;
-	public once<E extends Event = Event>(typesArray: string[], fn: (e: E, builder: Builder, unbind: IDisposable) => void, listenerToUnbindContainer?: IDisposable[], useCapture?: boolean): Builder;
-	public once<E extends Event = Event>(arg1: any, fn: (e: E, builder: Builder, unbind: IDisposable) => void, listenerToUnbindContainer?: IDisposable[], useCapture?: boolean): Builder {
+	once<E extends Event = Event>(type: string, fn: (e: E, builder: Builder, unbind: IDisposable) => void, listenerToDisposeContainer?: IDisposable[], useCapture?: boolean): Builder;
+	once<E extends Event = Event>(typesArray: string[], fn: (e: E, builder: Builder, unbind: IDisposable) => void, listenerToDisposeContainer?: IDisposable[], useCapture?: boolean): Builder;
+	once<E extends Event = Event>(arg1: any, fn: (e: E, builder: Builder, unbind: IDisposable) => void, listenerToDisposeContainer?: IDisposable[], useCapture?: boolean): Builder {
 
 		// Event Type Array
 		if (types.isArray(arg1)) {
@@ -493,8 +492,8 @@ export class Builder implements IDisposable {
 			}, useCapture || false);
 
 			// Add to Array if passed in
-			if (listenerToUnbindContainer && types.isArray(listenerToUnbindContainer)) {
-				listenerToUnbindContainer.push(unbind);
+			if (listenerToDisposeContainer && types.isArray(listenerToDisposeContainer)) {
+				listenerToDisposeContainer.push(unbind);
 			}
 		}
 
@@ -510,12 +509,12 @@ export class Builder implements IDisposable {
 	 *  c) an object literal passed in will apply the properties of the literal as attributes
 	 *  to the current element of the builder.
 	 */
-	public attr(name: string): string;
-	public attr(name: string, value: string): Builder;
-	public attr(name: string, value: boolean): Builder;
-	public attr(name: string, value: number): Builder;
-	public attr(attributes: any): Builder;
-	public attr(firstP: any, secondP?: any): any {
+	attr(name: string): string;
+	attr(name: string, value: string): Builder;
+	attr(name: string, value: boolean): Builder;
+	attr(name: string, value: number): Builder;
+	attr(attributes: any): Builder;
+	attr(firstP: any, secondP?: any): any {
 
 		// Apply Object Literal to Attributes of Element
 		if (types.isObject(firstP)) {
@@ -564,14 +563,14 @@ export class Builder implements IDisposable {
 	/**
 	 * Removes an attribute by the given name.
 	 */
-	public removeAttribute(prop: string): void {
+	removeAttribute(prop: string): void {
 		this.currentElement.removeAttribute(prop);
 	}
 
 	/**
 	 *  Sets the id attribute to the value provided for the current HTML element of the builder.
 	 */
-	public id(id: string): Builder {
+	id(id: string): Builder {
 		this.currentElement.setAttribute('id', id);
 
 		return this;
@@ -580,7 +579,7 @@ export class Builder implements IDisposable {
 	/**
 	 *  Sets the title attribute to the value provided for the current HTML element of the builder.
 	 */
-	public title(title: string): Builder {
+	title(title: string): Builder {
 		this.currentElement.setAttribute('title', title);
 
 		return this;
@@ -589,7 +588,7 @@ export class Builder implements IDisposable {
 	/**
 	 *  Sets the type attribute to the value provided for the current HTML element of the builder.
 	 */
-	public type(type: string): Builder {
+	type(type: string): Builder {
 		this.currentElement.setAttribute('type', type);
 
 		return this;
@@ -598,7 +597,7 @@ export class Builder implements IDisposable {
 	/**
 	 *  Sets the value attribute to the value provided for the current HTML element of the builder.
 	 */
-	public value(value: string): Builder {
+	value(value: string): Builder {
 		this.currentElement.setAttribute('value', value);
 
 		return this;
@@ -607,7 +606,7 @@ export class Builder implements IDisposable {
 	/**
 	 *  Sets the tabindex attribute to the value provided for the current HTML element of the builder.
 	 */
-	public tabindex(index: number): Builder {
+	tabindex(index: number): Builder {
 		this.currentElement.setAttribute('tabindex', index.toString());
 
 		return this;
@@ -623,10 +622,10 @@ export class Builder implements IDisposable {
 	 *  c) an object literal passed in will apply the properties of the literal as styles
 	 *  to the current element of the builder.
 	 */
-	public style(name: string): string;
-	public style(name: string, value: string): Builder;
-	public style(attributes: any): Builder;
-	public style(firstP: any, secondP?: any): any {
+	style(name: string): string;
+	style(name: string, value: string): Builder;
+	style(attributes: any): Builder;
+	style(firstP: any, secondP?: any): any {
 
 		// Apply Object Literal to Styles of Element
 		if (types.isObject(firstP)) {
@@ -692,14 +691,14 @@ export class Builder implements IDisposable {
 	/**
 	 *  Returns the computed CSS style for the current HTML element of the builder.
 	 */
-	public getComputedStyle(): CSSStyleDeclaration {
+	getComputedStyle(): CSSStyleDeclaration {
 		return DOM.getComputedStyle(this.currentElement);
 	}
 
 	/**
 	 *  Adds the variable list of arguments as class names to the current HTML element of the builder.
 	 */
-	public addClass(...classes: string[]): Builder {
+	addClass(...classes: string[]): Builder {
 		classes.forEach((nameValue: string) => {
 			let names = nameValue.split(' ');
 			names.forEach((name: string) => {
@@ -714,7 +713,7 @@ export class Builder implements IDisposable {
 	 *  Sets the class name of the current HTML element of the builder to the provided className.
 	 *  If shouldAddClass is provided - for true class is added, for false class is removed.
 	 */
-	public setClass(className: string, shouldAddClass: boolean = null): Builder {
+	setClass(className: string, shouldAddClass: boolean = null): Builder {
 		if (shouldAddClass === null) {
 			this.currentElement.className = className;
 		} else if (shouldAddClass) {
@@ -729,14 +728,14 @@ export class Builder implements IDisposable {
 	/**
 	 *  Returns whether the current HTML element of the builder has the provided class assigned.
 	 */
-	public hasClass(className: string): boolean {
+	hasClass(className: string): boolean {
 		return DOM.hasClass(this.currentElement, className);
 	}
 
 	/**
 	 *  Removes the variable list of arguments as class names from the current HTML element of the builder.
 	 */
-	public removeClass(...classes: string[]): Builder {
+	removeClass(...classes: string[]): Builder {
 		classes.forEach((nameValue: string) => {
 			let names = nameValue.split(' ');
 			names.forEach((name: string) => {
@@ -750,7 +749,7 @@ export class Builder implements IDisposable {
 	/**
 	 *  Adds or removes the provided className for the current HTML element of the builder.
 	 */
-	public toggleClass(className: string): Builder {
+	toggleClass(className: string): Builder {
 		if (this.hasClass(className)) {
 			this.removeClass(className);
 		} else {
@@ -763,7 +762,7 @@ export class Builder implements IDisposable {
 	/**
 	 *  Sets the CSS property color.
 	 */
-	public color(color: string): Builder {
+	color(color: string): Builder {
 		this.currentElement.style.color = color;
 
 		return this;
@@ -772,10 +771,10 @@ export class Builder implements IDisposable {
 	/**
 	 *  Sets the CSS property padding.
 	 */
-	public padding(padding: string): Builder;
-	public padding(top: number, right?: number, bottom?: number, left?: number): Builder;
-	public padding(top: string, right?: string, bottom?: string, left?: string): Builder;
-	public padding(top: any, right?: any, bottom?: any, left?: any): Builder {
+	padding(padding: string): Builder;
+	padding(top: number, right?: number, bottom?: number, left?: number): Builder;
+	padding(top: string, right?: string, bottom?: string, left?: string): Builder;
+	padding(top: any, right?: any, bottom?: any, left?: any): Builder {
 		if (types.isString(top) && top.indexOf(' ') >= 0) {
 			return this.padding.apply(this, top.split(' '));
 		}
@@ -802,10 +801,10 @@ export class Builder implements IDisposable {
 	/**
 	 *  Sets the CSS property margin.
 	 */
-	public margin(margin: string): Builder;
-	public margin(top: number, right?: number, bottom?: number, left?: number): Builder;
-	public margin(top: string, right?: string, bottom?: string, left?: string): Builder;
-	public margin(top: any, right?: any, bottom?: any, left?: any): Builder {
+	margin(margin: string): Builder;
+	margin(top: number, right?: number, bottom?: number, left?: number): Builder;
+	margin(top: string, right?: string, bottom?: string, left?: string): Builder;
+	margin(top: any, right?: any, bottom?: any, left?: any): Builder {
 		if (types.isString(top) && top.indexOf(' ') >= 0) {
 			return this.margin.apply(this, top.split(' '));
 		}
@@ -832,10 +831,10 @@ export class Builder implements IDisposable {
 	/**
 	 *  Sets the CSS property position.
 	 */
-	public position(position: string): Builder;
-	public position(top: number, right?: number, bottom?: number, left?: number, position?: string): Builder;
-	public position(top: string, right?: string, bottom?: string, left?: string, position?: string): Builder;
-	public position(top: any, right?: any, bottom?: any, left?: any, position?: string): Builder {
+	position(position: string): Builder;
+	position(top: number, right?: number, bottom?: number, left?: number, position?: string): Builder;
+	position(top: string, right?: string, bottom?: string, left?: string, position?: string): Builder;
+	position(top: any, right?: any, bottom?: any, left?: any, position?: string): Builder {
 		if (types.isString(top) && top.indexOf(' ') >= 0) {
 			return this.position.apply(this, top.split(' '));
 		}
@@ -868,10 +867,10 @@ export class Builder implements IDisposable {
 	/**
 	 *  Sets the CSS property size.
 	 */
-	public size(size: string): Builder;
-	public size(width: number, height?: number): Builder;
-	public size(width: string, height?: string): Builder;
-	public size(width: any, height?: any): Builder {
+	size(size: string): Builder;
+	size(width: number, height?: number): Builder;
+	size(width: string, height?: string): Builder;
+	size(width: any, height?: any): Builder {
 		if (types.isString(width) && width.indexOf(' ') >= 0) {
 			return this.size.apply(this, width.split(' '));
 		}
@@ -890,7 +889,7 @@ export class Builder implements IDisposable {
 	/**
 	 *  Sets the CSS property display.
 	 */
-	public display(display: string): Builder {
+	display(display: string): Builder {
 		this.currentElement.style.display = display;
 
 		return this;
@@ -899,7 +898,7 @@ export class Builder implements IDisposable {
 	/**
 	 *  Shows the current element of the builder.
 	 */
-	public show(): Builder {
+	show(): Builder {
 		if (this.hasClass('monaco-builder-hidden')) {
 			this.removeClass('monaco-builder-hidden');
 		}
@@ -907,7 +906,7 @@ export class Builder implements IDisposable {
 		this.attr('aria-hidden', 'false');
 
 		// Cancel any pending showDelayed() invocation
-		this.cancelVisibilityPromise();
+		this.cancelVisibilityTimeout();
 
 		return this;
 	}
@@ -919,18 +918,18 @@ export class Builder implements IDisposable {
 	 *  only show the element when a specific delay is reached (e.g. for a long running
 	 *  operation.
 	 */
-	public showDelayed(delay: number): Builder {
+	showDelayed(delay: number): Builder {
 
 		// Cancel any pending showDelayed() invocation
-		this.cancelVisibilityPromise();
+		this.cancelVisibilityTimeout();
 
-		let promise = TPromise.timeout(delay);
-		this.setProperty(VISIBILITY_BINDING_ID, promise);
-
-		promise.done(() => {
+		// Install new delay for showing
+		const handle = setTimeout(() => {
 			this.removeProperty(VISIBILITY_BINDING_ID);
 			this.show();
-		});
+		}, delay);
+
+		this.setProperty(VISIBILITY_BINDING_ID, toDisposable(() => clearTimeout(handle)));
 
 		return this;
 	}
@@ -938,14 +937,14 @@ export class Builder implements IDisposable {
 	/**
 	 *  Hides the current element of the builder.
 	 */
-	public hide(): Builder {
+	hide(): Builder {
 		if (!this.hasClass('monaco-builder-hidden')) {
 			this.addClass('monaco-builder-hidden');
 		}
 		this.attr('aria-hidden', 'true');
 
 		// Cancel any pending showDelayed() invocation
-		this.cancelVisibilityPromise();
+		this.cancelVisibilityTimeout();
 
 		return this;
 	}
@@ -953,14 +952,14 @@ export class Builder implements IDisposable {
 	/**
 	 *  Returns true if the current element of the builder is hidden.
 	 */
-	public isHidden(): boolean {
+	isHidden(): boolean {
 		return this.hasClass('monaco-builder-hidden') || this.currentElement.style.display === 'none';
 	}
 
-	private cancelVisibilityPromise(): void {
-		let promise: TPromise<void> = this.getProperty(VISIBILITY_BINDING_ID);
-		if (promise) {
-			promise.cancel();
+	private cancelVisibilityTimeout(): void {
+		const visibilityDisposable = this.getProperty(VISIBILITY_BINDING_ID) as IDisposable;
+		if (visibilityDisposable) {
+			visibilityDisposable.dispose();
 			this.removeProperty(VISIBILITY_BINDING_ID);
 		}
 	}
@@ -976,7 +975,7 @@ export class Builder implements IDisposable {
 	/**
 	 *  Sets the innerHTML attribute.
 	 */
-	public innerHtml(html: string, append?: boolean): Builder {
+	innerHtml(html: string, append?: boolean): Builder {
 		if (append) {
 			this.currentElement.innerHTML += html;
 		} else {
@@ -990,7 +989,7 @@ export class Builder implements IDisposable {
 	 *  Sets the textContent property of the element.
 	 *  All HTML special characters will be escaped.
 	 */
-	public text(text: string, append?: boolean): Builder {
+	text(text: string, append?: boolean): Builder {
 		if (append) {
 			// children is child Elements versus childNodes includes textNodes
 			if (this.currentElement.children.length === 0) {
@@ -1011,14 +1010,14 @@ export class Builder implements IDisposable {
 	/**
 	 *  Sets the innerHTML attribute in escaped form.
 	 */
-	public safeInnerHtml(html: string, append?: boolean): Builder {
+	safeInnerHtml(html: string, append?: boolean): Builder {
 		return this.innerHtml(strings.escape(html), append);
 	}
 
 	/**
 	 *  Allows to store arbritary data into the current element.
 	 */
-	public setProperty(key: string, value: any): Builder {
+	setProperty(key: string, value: any): Builder {
 		setPropertyOnElement(this.currentElement, key, value);
 
 		return this;
@@ -1027,14 +1026,14 @@ export class Builder implements IDisposable {
 	/**
 	 *  Allows to get arbritary data from the current element.
 	 */
-	public getProperty(key: string, fallback?: any): any {
+	getProperty(key: string, fallback?: any): any {
 		return getPropertyFromElement(this.currentElement, key, fallback);
 	}
 
 	/**
 	 *  Removes a property from the current element that is stored under the given key.
 	 */
-	public removeProperty(key: string): Builder {
+	removeProperty(key: string): Builder {
 		if (hasData(this.currentElement)) {
 			delete data(this.currentElement)[key];
 		}
@@ -1045,7 +1044,7 @@ export class Builder implements IDisposable {
 	/**
 	 * Returns a new builder with the child at the given index.
 	 */
-	public child(index = 0): Builder {
+	child(index = 0): Builder {
 		let children = this.currentElement.children;
 
 		return withElement(<HTMLElement>children.item(index));
@@ -1085,7 +1084,7 @@ export class Builder implements IDisposable {
 	 *  event listners registered and also clear any data binding and properties stored
 	 *  to any child element.
 	 */
-	public empty(): Builder {
+	empty(): Builder {
 		this.unbindDescendants(this.currentElement);
 
 		this.clearChildren();
@@ -1100,7 +1099,7 @@ export class Builder implements IDisposable {
 	/**
 	 *  Removes all HTML elements from the current element of the builder.
 	 */
-	public clearChildren(): Builder {
+	clearChildren(): Builder {
 
 		// Remove Elements
 		if (this.currentElement) {
@@ -1114,7 +1113,7 @@ export class Builder implements IDisposable {
 	 *  Removes the current HTML element and all its children from its parent and unbinds
 	 *  all listeners and properties set to the data slots.
 	 */
-	public destroy(): void {
+	destroy(): void {
 
 		if (this.currentElement) {
 
@@ -1144,15 +1143,15 @@ export class Builder implements IDisposable {
 
 		let type: string;
 
-		for (type in this.toUnbind) {
-			if (this.toUnbind.hasOwnProperty(type) && types.isArray(this.toUnbind[type])) {
-				this.toUnbind[type] = dispose(this.toUnbind[type]);
+		for (type in this.toDispose) {
+			if (this.toDispose.hasOwnProperty(type) && types.isArray(this.toDispose[type])) {
+				this.toDispose[type] = dispose(this.toDispose[type]);
 			}
 		}
 
-		for (type in this.captureToUnbind) {
-			if (this.captureToUnbind.hasOwnProperty(type) && types.isArray(this.captureToUnbind[type])) {
-				this.captureToUnbind[type] = dispose(this.captureToUnbind[type]);
+		for (type in this.captureToDispose) {
+			if (this.captureToDispose.hasOwnProperty(type) && types.isArray(this.captureToDispose[type])) {
+				this.captureToDispose[type] = dispose(this.captureToDispose[type]);
 			}
 		}
 
@@ -1161,22 +1160,22 @@ export class Builder implements IDisposable {
 		this.container = null;
 		this.offdom = null;
 		this.createdElements = null;
-		this.captureToUnbind = null;
-		this.toUnbind = null;
+		this.captureToDispose = null;
+		this.toDispose = null;
 	}
 
 	/**
 	 *  Removes the current HTML element and all its children from its parent and unbinds
 	 *  all listeners and properties set to the data slots.
 	 */
-	public dispose(): void {
+	dispose(): void {
 		this.destroy();
 	}
 
 	/**
 	 *  Gets the size (in pixels) of an element, including the margin.
 	 */
-	public getTotalSize(): DOM.Dimension {
+	getTotalSize(): DOM.Dimension {
 		let totalWidth = DOM.getTotalWidth(this.currentElement);
 		let totalHeight = DOM.getTotalHeight(this.currentElement);
 
@@ -1186,7 +1185,7 @@ export class Builder implements IDisposable {
 	/**
 	 *  Another variant of getting the inner dimensions of an element.
 	 */
-	public getClientArea(): DOM.Dimension {
+	getClientArea(): DOM.Dimension {
 		return DOM.getClientArea(this.currentElement);
 	}
 }
@@ -1197,7 +1196,7 @@ export class Builder implements IDisposable {
  */
 export class MultiBuilder extends Builder {
 
-	public length: number;
+	length: number;
 
 	private builders: Builder[];
 
@@ -1278,11 +1277,11 @@ export class MultiBuilder extends Builder {
 		}
 	}
 
-	public item(i: number): Builder {
+	item(i: number): Builder {
 		return this.builders[i];
 	}
 
-	public push(...items: Builder[]): void {
+	push(...items: Builder[]): void {
 		for (let i = 0; i < items.length; i++) {
 			this.builders.push(items[i]);
 		}
@@ -1290,7 +1289,7 @@ export class MultiBuilder extends Builder {
 		this.length = this.builders.length;
 	}
 
-	public clone(): MultiBuilder {
+	clone(): MultiBuilder {
 		return new MultiBuilder(this);
 	}
 }
diff --git a/src/vs/base/browser/contextmenu.ts b/src/vs/base/browser/contextmenu.ts
index 221334278e4..c303d45eeb3 100644
--- a/src/vs/base/browser/contextmenu.ts
+++ b/src/vs/base/browser/contextmenu.ts
@@ -4,10 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { IAction, IActionRunner, Action } from 'vs/base/common/actions';
+import { IAction, IActionRunner } 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';
+import { SubmenuAction } from 'vs/base/browser/ui/menu/menu';
 
 export interface IEvent {
 	shiftKey?: boolean;
@@ -16,9 +17,9 @@ export interface IEvent {
 	metaKey?: boolean;
 }
 
-export class ContextSubMenu extends Action {
+export class ContextSubMenu extends SubmenuAction {
 	constructor(label: string, public entries: (ContextSubMenu | IAction)[]) {
-		super('contextsubmenu', label, '', true);
+		super(label, entries, 'contextsubmenu');
 	}
 }
 
diff --git a/src/vs/base/browser/dnd.ts b/src/vs/base/browser/dnd.ts
index a4bc02edd33..cc5e1202acd 100644
--- a/src/vs/base/browser/dnd.ts
+++ b/src/vs/base/browser/dnd.ts
@@ -5,19 +5,20 @@
 
 'use strict';
 
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { addDisposableListener } from 'vs/base/browser/dom';
 
 /**
  * A helper that will execute a provided function when the provided HTMLElement receives
  *  dragover event for 800ms. If the drag is aborted before, the callback will not be triggered.
  */
-export class DelayedDragHandler {
-	private toDispose: IDisposable[] = [];
+export class DelayedDragHandler extends Disposable {
 	private timeout: number;
 
 	constructor(container: HTMLElement, callback: () => void) {
-		this.toDispose.push(addDisposableListener(container, 'dragover', () => {
+		super();
+
+		this._register(addDisposableListener(container, 'dragover', () => {
 			if (!this.timeout) {
 				this.timeout = setTimeout(() => {
 					callback();
@@ -28,7 +29,7 @@ export class DelayedDragHandler {
 		}));
 
 		['dragleave', 'drop', 'dragend'].forEach(type => {
-			this.toDispose.push(addDisposableListener(container, type, () => {
+			this._register(addDisposableListener(container, type, () => {
 				this.clearDragTimeout();
 			}));
 		});
@@ -41,8 +42,9 @@ export class DelayedDragHandler {
 		}
 	}
 
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
+	dispose(): void {
+		super.dispose();
+
 		this.clearDragTimeout();
 	}
 }
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
index 3856b7dbeb1..02b3d4115ea 100644
--- a/src/vs/base/browser/dom.ts
+++ b/src/vs/base/browser/dom.ts
@@ -819,6 +819,8 @@ export const EventType = {
 	MOUSE_OVER: 'mouseover',
 	MOUSE_MOVE: 'mousemove',
 	MOUSE_OUT: 'mouseout',
+	MOUSE_ENTER: 'mouseenter',
+	MOUSE_LEAVE: 'mouseleave',
 	CONTEXT_MENU: 'contextmenu',
 	WHEEL: 'wheel',
 	// Keyboard
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.css b/src/vs/base/browser/ui/actionbar/actionbar.css
index c5a2cf6ee23..4ff042d038f 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.css
+++ b/src/vs/base/browser/ui/actionbar/actionbar.css
@@ -54,7 +54,7 @@
 
 .monaco-action-bar .action-label {
 	font-size: 11px;
-	margin-right: 4px;  
+	margin-right: 4px;
 }
 
 .monaco-action-bar .action-label.octicon {
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts
index a6d79bdbcb0..b5266e63759 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.ts
+++ b/src/vs/base/browser/ui/actionbar/actionbar.ts
@@ -43,8 +43,6 @@ export class BaseActionItem implements IActionItem {
 	public _context: any;
 	public _action: IAction;
 
-	static MNEMONIC_REGEX: RegExp = /&&(.)/g;
-
 	private _actionRunner: IActionRunner;
 
 	constructor(context: any, action: IAction, protected options?: IBaseActionItemOptions) {
@@ -156,7 +154,7 @@ export class BaseActionItem implements IActionItem {
 		DOM.EventHelper.stop(event, true);
 
 		let context: any;
-		if (types.isUndefinedOrNull(this._context)) {
+		if (types.isUndefinedOrNull(this._context) || !types.isObject(this._context)) {
 			context = event;
 		} else {
 			context = this._context;
@@ -277,11 +275,7 @@ export class ActionItem extends BaseActionItem {
 
 	public _updateLabel(): void {
 		if (this.options.label) {
-			let label = this.getAction().label;
-			if (label && this.options.isMenu) {
-				label = label.replace(BaseActionItem.MNEMONIC_REGEX, '$1\u0332');
-			}
-			this.$e.text(label);
+			this.$e.text(this.getAction().label);
 		}
 	}
 
@@ -565,15 +559,6 @@ export class ActionBar implements IActionRunner {
 		return this.domNode;
 	}
 
-	private _addMnemonic(action: IAction, actionItemElement: HTMLElement): void {
-		let matches = BaseActionItem.MNEMONIC_REGEX.exec(action.label);
-		if (matches && matches.length === 2) {
-			let mnemonic = matches[1];
-
-			actionItemElement.accessKey = mnemonic.toLocaleLowerCase();
-		}
-	}
-
 	public push(arg: IAction | IAction[], options: IActionOptions = {}): void {
 
 		const actions: IAction[] = !Array.isArray(arg) ? [arg] : arg;
@@ -591,10 +576,6 @@ export class ActionBar implements IActionRunner {
 				e.stopPropagation();
 			});
 
-			if (options.isMenu) {
-				this._addMnemonic(action, actionItemElement);
-			}
-
 			let item: IActionItem = null;
 
 			if (this.options.actionItemProvider) {
@@ -659,10 +640,12 @@ export class ActionBar implements IActionRunner {
 
 	public focus(selectFirst?: boolean): void {
 		if (selectFirst && typeof this.focusedItem === 'undefined') {
-			this.focusedItem = 0;
+			// Focus the first enabled item
+			this.focusedItem = this.items.length - 1;
+			this.focusNext();
+		} else {
+			this.updateFocus();
 		}
-
-		this.updateFocus();
 	}
 
 	private focusNext(): void {
diff --git a/src/vs/base/browser/ui/button/button.ts b/src/vs/base/browser/ui/button/button.ts
index 129009f5088..dec147c543d 100644
--- a/src/vs/base/browser/ui/button/button.ts
+++ b/src/vs/base/browser/ui/button/button.ts
@@ -13,7 +13,7 @@ import { KeyCode } from 'vs/base/common/keyCodes';
 import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
 import { Event as BaseEvent, Emitter } from 'vs/base/common/event';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { Gesture, EventType } from 'vs/base/browser/touch';
 
 export interface IButtonOptions extends IButtonStyles {
@@ -33,7 +33,7 @@ const defaultOptions: IButtonStyles = {
 	buttonForeground: Color.white
 };
 
-export class Button {
+export class Button extends Disposable {
 
 	private $el: Builder;
 	private options: IButtonOptions;
@@ -43,12 +43,14 @@ export class Button {
 	private buttonForeground: Color;
 	private buttonBorder: Color;
 
-	private _onDidClick = new Emitter<any>();
-	readonly onDidClick: BaseEvent<Event> = this._onDidClick.event;
+	private _onDidClick = this._register(new Emitter<any>());
+	get onDidClick(): BaseEvent<Event> { return this._onDidClick.event; }
 
 	private focusTracker: DOM.IFocusTracker;
 
 	constructor(container: HTMLElement, options?: IButtonOptions) {
+		super();
+
 		this.options = options || Object.create(null);
 		mixin(this.options, defaultOptions, false);
 
@@ -57,10 +59,10 @@ export class Button {
 		this.buttonForeground = this.options.buttonForeground;
 		this.buttonBorder = this.options.buttonBorder;
 
-		this.$el = $('a.monaco-button').attr({
+		this.$el = this._register($('a.monaco-button').attr({
 			'tabIndex': '0',
 			'role': 'button'
-		}).appendTo(container);
+		}).appendTo(container));
 
 		Gesture.addTarget(this.$el.getHTMLElement());
 
@@ -74,7 +76,7 @@ export class Button {
 		});
 
 		this.$el.on(DOM.EventType.KEY_DOWN, e => {
-			let event = new StandardKeyboardEvent(e as KeyboardEvent);
+			const event = new StandardKeyboardEvent(e as KeyboardEvent);
 			let eventHandled = false;
 			if (this.enabled && event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
 				this._onDidClick.fire(e);
@@ -100,9 +102,9 @@ export class Button {
 		});
 
 		// 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.focusTracker = this._register(DOM.trackFocus(this.$el.getHTMLElement()));
+		this._register(this.focusTracker.onDidFocus(() => this.setHoverBackground()));
+		this._register(this.focusTracker.onDidBlur(() => this.applyStyles())); // restore standard styles
 
 		this.applyStyles();
 	}
@@ -177,27 +179,13 @@ export class Button {
 	focus(): void {
 		this.$el.domFocus();
 	}
-
-	dispose(): void {
-		if (this.$el) {
-			this.$el.dispose();
-			this.$el = null;
-
-			this.focusTracker.dispose();
-			this.focusTracker = null;
-		}
-
-		this._onDidClick.dispose();
-	}
 }
 
-export class ButtonGroup {
-	private _buttons: Button[];
-	private toDispose: IDisposable[];
+export class ButtonGroup extends Disposable {
+	private _buttons: Button[] = [];
 
 	constructor(container: HTMLElement, count: number, options?: IButtonOptions) {
-		this._buttons = [];
-		this.toDispose = [];
+		super();
 
 		this.create(container, count, options);
 	}
@@ -208,9 +196,8 @@ export class ButtonGroup {
 
 	private create(container: HTMLElement, count: number, options?: IButtonOptions): void {
 		for (let index = 0; index < count; index++) {
-			const button = new Button(container, options);
+			const button = this._register(new Button(container, options));
 			this._buttons.push(button);
-			this.toDispose.push(button);
 
 			// Implement keyboard access in buttons if there are multiple
 			if (count > 1) {
@@ -236,8 +223,4 @@ export class ButtonGroup {
 			}
 		}
 	}
-
-	dispose(): void {
-		this.toDispose = dispose(this.toDispose);
-	}
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/centered/centeredViewLayout.ts b/src/vs/base/browser/ui/centered/centeredViewLayout.ts
index 53230084614..50cac7329f2 100644
--- a/src/vs/base/browser/ui/centered/centeredViewLayout.ts
+++ b/src/vs/base/browser/ui/centered/centeredViewLayout.ts
@@ -60,8 +60,15 @@ export class CenteredViewLayout {
 
 	constructor(private container: HTMLElement, private view: IView, public readonly state: CenteredViewState = GOLDEN_RATIO) {
 		this.container.appendChild(this.view.element);
+		// Make sure to hide the split view overflow like sashes #52892
+		this.container.style.overflow = 'hidden';
 	}
 
+	get minimumWidth(): number { return this.splitView ? this.splitView.minimumSize : this.view.minimumWidth; }
+	get maximumWidth(): number { return this.splitView ? this.splitView.maximumSize : this.view.maximumWidth; }
+	get minimumHeight(): number { return this.view.minimumHeight; }
+	get maximumHeight(): number { return this.view.maximumHeight; }
+
 	layout(width: number, height: number): void {
 		this.width = width;
 		this.height = height;
diff --git a/src/vs/base/browser/ui/checkbox/checkbox.ts b/src/vs/base/browser/ui/checkbox/checkbox.ts
index c1486f8f32b..1b1c5df8521 100644
--- a/src/vs/base/browser/ui/checkbox/checkbox.ts
+++ b/src/vs/base/browser/ui/checkbox/checkbox.ts
@@ -5,6 +5,7 @@
 
 'use strict';
 
+import 'vs/css!./checkbox';
 import * as DOM from 'vs/base/browser/dom';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { Widget } from 'vs/base/browser/ui/widget';
@@ -12,7 +13,6 @@ import { Color } from 'vs/base/common/color';
 import { Emitter, Event } from 'vs/base/common/event';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import * as objects from 'vs/base/common/objects';
-import 'vs/css!./checkbox';
 
 export interface ICheckboxOpts extends ICheckboxStyles {
 	readonly actionClassName: string;
@@ -31,18 +31,19 @@ const defaultOpts = {
 export class Checkbox extends Widget {
 
 	private readonly _onChange = this._register(new Emitter<boolean>());
-	public readonly onChange: Event<boolean /* via keyboard */> = this._onChange.event;
+	get onChange(): Event<boolean /* via keyboard */> { return this._onChange.event; }
 
 	private readonly _onKeyDown = this._register(new Emitter<IKeyboardEvent>());
-	public readonly onKeyDown: Event<IKeyboardEvent> = this._onKeyDown.event;
+	get onKeyDown(): Event<IKeyboardEvent> { return this._onKeyDown.event; }
 
 	private readonly _opts: ICheckboxOpts;
-	public readonly domNode: HTMLElement;
+	readonly domNode: HTMLElement;
 
 	private _checked: boolean;
 
 	constructor(opts: ICheckboxOpts) {
 		super();
+
 		this._opts = objects.deepClone(opts);
 		objects.mixin(this._opts, defaultOpts, false);
 		this._checked = this._opts.isChecked;
@@ -75,19 +76,19 @@ export class Checkbox extends Widget {
 		});
 	}
 
-	public get enabled(): boolean {
+	get enabled(): boolean {
 		return this.domNode.getAttribute('aria-disabled') !== 'true';
 	}
 
-	public focus(): void {
+	focus(): void {
 		this.domNode.focus();
 	}
 
-	public get checked(): boolean {
+	get checked(): boolean {
 		return this._checked;
 	}
 
-	public set checked(newIsChecked: boolean) {
+	set checked(newIsChecked: boolean) {
 		this._checked = newIsChecked;
 		this.domNode.setAttribute('aria-checked', String(this._checked));
 		if (this._checked) {
@@ -99,11 +100,11 @@ export class Checkbox extends Widget {
 		this.applyStyles();
 	}
 
-	public width(): number {
+	width(): number {
 		return 2 /*marginleft*/ + 2 /*border*/ + 2 /*padding*/ + 16 /* icon width */;
 	}
 
-	public style(styles: ICheckboxStyles): void {
+	style(styles: ICheckboxStyles): void {
 		if (styles.inputActiveOptionBorder) {
 			this._opts.inputActiveOptionBorder = styles.inputActiveOptionBorder;
 		}
@@ -116,12 +117,12 @@ export class Checkbox extends Widget {
 		}
 	}
 
-	public enable(): void {
+	enable(): void {
 		this.domNode.tabIndex = 0;
 		this.domNode.setAttribute('aria-disabled', String(false));
 	}
 
-	public disable(): void {
+	disable(): void {
 		DOM.removeTabIndexAndUpdateFocus(this.domNode);
 		this.domNode.setAttribute('aria-disabled', String(true));
 	}
diff --git a/src/vs/base/browser/ui/dropdown/dropdown.ts b/src/vs/base/browser/ui/dropdown/dropdown.ts
index 969453f6942..f2b9a1f842e 100644
--- a/src/vs/base/browser/ui/dropdown/dropdown.ts
+++ b/src/vs/base/browser/ui/dropdown/dropdown.ts
@@ -28,7 +28,8 @@ export interface IBaseDropdownOptions {
 }
 
 export class BaseDropdown extends ActionRunner {
-	private _toDispose: IDisposable[];
+	private _toDispose: IDisposable[] = [];
+
 	private $el: Builder;
 	private $boxContainer: Builder;
 	private $label: Builder;
@@ -38,8 +39,6 @@ export class BaseDropdown extends ActionRunner {
 	constructor(container: HTMLElement, options: IBaseDropdownOptions) {
 		super();
 
-		this._toDispose = [];
-
 		this.$el = $('.monaco-dropdown').appendTo(container);
 
 		this.$label = $('.dropdown-label');
@@ -66,8 +65,7 @@ export class BaseDropdown extends ActionRunner {
 			}
 		}).appendTo(this.$el);
 
-		let cleanupFn = labelRenderer(this.$label.getHTMLElement());
-
+		const cleanupFn = labelRenderer(this.$label.getHTMLElement());
 		if (cleanupFn) {
 			this._toDispose.push(cleanupFn);
 		}
@@ -75,27 +73,27 @@ export class BaseDropdown extends ActionRunner {
 		Gesture.addTarget(this.$label.getHTMLElement());
 	}
 
-	public get toDispose(): IDisposable[] {
+	get toDispose(): IDisposable[] {
 		return this._toDispose;
 	}
 
-	public get element(): HTMLElement {
+	get element(): HTMLElement {
 		return this.$el.getHTMLElement();
 	}
 
-	public get label(): HTMLElement {
+	get label(): HTMLElement {
 		return this.$label.getHTMLElement();
 	}
 
-	public set tooltip(tooltip: string) {
+	set tooltip(tooltip: string) {
 		this.$label.title(tooltip);
 	}
 
-	public show(): void {
+	show(): void {
 		this.visible = true;
 	}
 
-	public hide(): void {
+	hide(): void {
 		this.visible = false;
 	}
 
@@ -103,7 +101,7 @@ export class BaseDropdown extends ActionRunner {
 		this.hide();
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		super.dispose();
 		this.hide();
 
@@ -139,7 +137,7 @@ export class Dropdown extends BaseDropdown {
 		this.contextViewProvider = options.contextViewProvider;
 	}
 
-	public show(): void {
+	show(): void {
 		super.show();
 
 		addClass(this.element, 'active');
@@ -167,7 +165,7 @@ export class Dropdown extends BaseDropdown {
 		removeClass(this.element, 'active');
 	}
 
-	public hide(): void {
+	hide(): void {
 		super.hide();
 
 		if (this.contextViewProvider) {
@@ -211,11 +209,11 @@ export class DropdownMenu extends BaseDropdown {
 		this.menuClassName = options.menuClassName || '';
 	}
 
-	public set menuOptions(options: IMenuOptions) {
+	set menuOptions(options: IMenuOptions) {
 		this._menuOptions = options;
 	}
 
-	public get menuOptions(): IMenuOptions {
+	get menuOptions(): IMenuOptions {
 		return this._menuOptions;
 	}
 
@@ -231,7 +229,7 @@ export class DropdownMenu extends BaseDropdown {
 		this._actions = actions;
 	}
 
-	public show(): void {
+	show(): void {
 		super.show();
 
 		addClass(this.element, 'active');
@@ -248,7 +246,7 @@ export class DropdownMenu extends BaseDropdown {
 		});
 	}
 
-	public hide(): void {
+	hide(): void {
 		super.hide();
 	}
 
@@ -279,8 +277,8 @@ export class DropdownMenuActionItem extends BaseActionItem {
 		this.clazz = clazz;
 	}
 
-	public render(container: HTMLElement): void {
-		let labelRenderer: ILabelRenderer = (el: HTMLElement): IDisposable => {
+	render(container: HTMLElement): void {
+		const labelRenderer: ILabelRenderer = (el: HTMLElement): IDisposable => {
 			this.builder = $('a.action-label').attr({
 				tabIndex: '0',
 				role: 'button',
@@ -294,7 +292,7 @@ export class DropdownMenuActionItem extends BaseActionItem {
 			return null;
 		};
 
-		let options: IDropdownMenuOptions = {
+		const options: IDropdownMenuOptions = {
 			contextMenuProvider: this.contextMenuProvider,
 			labelRenderer: labelRenderer
 		};
@@ -316,7 +314,7 @@ export class DropdownMenuActionItem extends BaseActionItem {
 		};
 	}
 
-	public setActionContext(newContext: any): void {
+	setActionContext(newContext: any): void {
 		super.setActionContext(newContext);
 
 		if (this.dropdownMenu) {
@@ -324,13 +322,13 @@ export class DropdownMenuActionItem extends BaseActionItem {
 		}
 	}
 
-	public show(): void {
+	show(): void {
 		if (this.dropdownMenu) {
 			this.dropdownMenu.show();
 		}
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.dropdownMenu.dispose();
 
 		super.dispose();
diff --git a/src/vs/base/browser/ui/grid/gridview.ts b/src/vs/base/browser/ui/grid/gridview.ts
index 6f40d22b0a0..98a9d0ef79c 100644
--- a/src/vs/base/browser/ui/grid/gridview.ts
+++ b/src/vs/base/browser/ui/grid/gridview.ts
@@ -9,7 +9,7 @@ import 'vs/css!./gridview';
 import { Event, anyEvent, Emitter, mapEvent, Relay } from 'vs/base/common/event';
 import { Orientation, Sash } from 'vs/base/browser/ui/sash/sash';
 import { SplitView, IView as ISplitView, Sizing, ISplitViewStyles } from 'vs/base/browser/ui/splitview/splitview';
-import { empty as EmptyDisposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { $ } from 'vs/base/browser/dom';
 import { tail2 as tail } from 'vs/base/common/arrays';
 import { Color } from 'vs/base/common/color';
@@ -27,14 +27,6 @@ export interface IView {
 	layout(width: number, height: number): void;
 }
 
-/*
-TODO:
-	- NEW: 	add a color to show a border where the sash is, similar to how other
-			widgets have a color (e.g. Button, with applyStyles). Challenge is that this
-			color has to be applied via JS and not CSS to not apply it to all views
-			NOT CSS
-*/
-
 export function orthogonal(orientation: Orientation): Orientation {
 	return orientation === Orientation.VERTICAL ? Orientation.HORIZONTAL : Orientation.VERTICAL;
 }
@@ -130,12 +122,12 @@ class BranchNode implements ISplitView, IDisposable {
 	private _onDidChange = new Emitter<number | undefined>();
 	readonly onDidChange: Event<number | undefined> = this._onDidChange.event;
 
-	private childrenChangeDisposable: IDisposable = EmptyDisposable;
+	private childrenChangeDisposable: IDisposable = Disposable.None;
 
 	private _onDidSashReset = new Emitter<number[]>();
 	readonly onDidSashReset: Event<number[]> = this._onDidSashReset.event;
-	private splitviewSashResetDisposable: IDisposable = EmptyDisposable;
-	private childrenSashResetDisposable: IDisposable = EmptyDisposable;
+	private splitviewSashResetDisposable: IDisposable = Disposable.None;
+	private childrenSashResetDisposable: IDisposable = Disposable.None;
 
 	get orthogonalStartSash(): Sash | undefined { return this.splitview.orthogonalStartSash; }
 	set orthogonalStartSash(sash: Sash | undefined) { this.splitview.orthogonalStartSash = sash; }
@@ -288,22 +280,22 @@ class BranchNode implements ISplitView, IDisposable {
 
 	trySet2x2(other: BranchNode): IDisposable {
 		if (this.children.length !== 2 || other.children.length !== 2) {
-			return EmptyDisposable;
+			return Disposable.None;
 		}
 
 		if (this.getChildSize(0) !== other.getChildSize(0)) {
-			return EmptyDisposable;
+			return Disposable.None;
 		}
 
 		const [firstChild, secondChild] = this.children;
 		const [otherFirstChild, otherSecondChild] = other.children;
 
 		if (!(firstChild instanceof LeafNode) || !(secondChild instanceof LeafNode)) {
-			return EmptyDisposable;
+			return Disposable.None;
 		}
 
 		if (!(otherFirstChild instanceof LeafNode) || !(otherSecondChild instanceof LeafNode)) {
-			return EmptyDisposable;
+			return Disposable.None;
 		}
 
 		if (this.orientation === Orientation.VERTICAL) {
@@ -493,7 +485,7 @@ export class GridView implements IDisposable {
 	private onDidSashResetRelay = new Relay<number[]>();
 	readonly onDidSashReset: Event<number[]> = this.onDidSashResetRelay.event;
 
-	private disposable2x2: IDisposable = EmptyDisposable;
+	private disposable2x2: IDisposable = Disposable.None;
 
 	private get root(): BranchNode {
 		return this._root;
@@ -558,7 +550,7 @@ export class GridView implements IDisposable {
 
 	addView(view: IView, size: number | Sizing, location: number[]): void {
 		this.disposable2x2.dispose();
-		this.disposable2x2 = EmptyDisposable;
+		this.disposable2x2 = Disposable.None;
 
 		const [rest, index] = tail(location);
 		const [pathToParent, parent] = this.getNode(rest);
@@ -590,7 +582,7 @@ export class GridView implements IDisposable {
 
 	removeView(location: number[], sizing?: Sizing): IView {
 		this.disposable2x2.dispose();
-		this.disposable2x2 = EmptyDisposable;
+		this.disposable2x2 = Disposable.None;
 
 		const [rest, index] = tail(location);
 		const [pathToParent, parent] = this.getNode(rest);
@@ -791,7 +783,7 @@ export class GridView implements IDisposable {
 
 	trySet2x2(): void {
 		this.disposable2x2.dispose();
-		this.disposable2x2 = EmptyDisposable;
+		this.disposable2x2 = Disposable.None;
 
 		if (this.root.children.length !== 2) {
 			return;
diff --git a/src/vs/base/browser/ui/iconLabel/iconLabel.ts b/src/vs/base/browser/ui/iconLabel/iconLabel.ts
index f2f641431bb..8d62877e57d 100644
--- a/src/vs/base/browser/ui/iconLabel/iconLabel.ts
+++ b/src/vs/base/browser/ui/iconLabel/iconLabel.ts
@@ -12,7 +12,7 @@ import { IMatch } from 'vs/base/common/filters';
 import uri from 'vs/base/common/uri';
 import * as paths from 'vs/base/common/paths';
 import { IWorkspaceFolderProvider, getPathLabel, IUserHomeProvider, getBaseLabel } from 'vs/base/common/labels';
-import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, combinedDisposable, Disposable } from 'vs/base/common/lifecycle';
 
 export interface IIconLabelCreationOptions {
 	supportHighlights?: boolean;
@@ -38,11 +38,11 @@ class FastLabelNode {
 	constructor(private _element: HTMLElement) {
 	}
 
-	public get element(): HTMLElement {
+	get element(): HTMLElement {
 		return this._element;
 	}
 
-	public set textContent(content: string) {
+	set textContent(content: string) {
 		if (this.disposed || content === this._textContent) {
 			return;
 		}
@@ -51,7 +51,7 @@ class FastLabelNode {
 		this._element.textContent = content;
 	}
 
-	public set className(className: string) {
+	set className(className: string) {
 		if (this.disposed || className === this._className) {
 			return;
 		}
@@ -60,7 +60,7 @@ class FastLabelNode {
 		this._element.className = className;
 	}
 
-	public set title(title: string) {
+	set title(title: string) {
 		if (this.disposed || title === this._title) {
 			return;
 		}
@@ -73,7 +73,7 @@ class FastLabelNode {
 		}
 	}
 
-	public set empty(empty: boolean) {
+	set empty(empty: boolean) {
 		if (this.disposed || empty === this._empty) {
 			return;
 		}
@@ -82,12 +82,12 @@ class FastLabelNode {
 		this._element.style.marginLeft = empty ? '0' : null;
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.disposed = true;
 	}
 }
 
-export class IconLabel {
+export class IconLabel extends Disposable {
 	private domNode: FastLabelNode;
 	private labelDescriptionContainer: FastLabelNode;
 	private labelNode: FastLabelNode | HighlightedLabel;
@@ -95,34 +95,36 @@ export class IconLabel {
 	private descriptionNodeFactory: () => FastLabelNode | HighlightedLabel;
 
 	constructor(container: HTMLElement, options?: IIconLabelCreationOptions) {
-		this.domNode = new FastLabelNode(dom.append(container, dom.$('.monaco-icon-label')));
+		super();
 
-		this.labelDescriptionContainer = new FastLabelNode(dom.append(this.domNode.element, dom.$('.monaco-icon-label-description-container')));
+		this.domNode = this._register(new FastLabelNode(dom.append(container, dom.$('.monaco-icon-label'))));
+
+		this.labelDescriptionContainer = this._register(new FastLabelNode(dom.append(this.domNode.element, dom.$('.monaco-icon-label-description-container'))));
 
 		if (options && options.supportHighlights) {
-			this.labelNode = new HighlightedLabel(dom.append(this.labelDescriptionContainer.element, dom.$('a.label-name')));
+			this.labelNode = this._register(new HighlightedLabel(dom.append(this.labelDescriptionContainer.element, dom.$('a.label-name'))));
 		} else {
-			this.labelNode = new FastLabelNode(dom.append(this.labelDescriptionContainer.element, dom.$('a.label-name')));
+			this.labelNode = this._register(new FastLabelNode(dom.append(this.labelDescriptionContainer.element, dom.$('a.label-name'))));
 		}
 
 		if (options && options.supportDescriptionHighlights) {
-			this.descriptionNodeFactory = () => new HighlightedLabel(dom.append(this.labelDescriptionContainer.element, dom.$('span.label-description')));
+			this.descriptionNodeFactory = () => this._register(new HighlightedLabel(dom.append(this.labelDescriptionContainer.element, dom.$('span.label-description'))));
 		} else {
-			this.descriptionNodeFactory = () => new FastLabelNode(dom.append(this.labelDescriptionContainer.element, dom.$('span.label-description')));
+			this.descriptionNodeFactory = () => this._register(new FastLabelNode(dom.append(this.labelDescriptionContainer.element, dom.$('span.label-description'))));
 		}
 	}
 
-	public get element(): HTMLElement {
+	get element(): HTMLElement {
 		return this.domNode.element;
 	}
 
-	public onClick(callback: (event: MouseEvent) => void): IDisposable {
+	onClick(callback: (event: MouseEvent) => void): IDisposable {
 		return combinedDisposable([
 			dom.addDisposableListener(this.labelDescriptionContainer.element, dom.EventType.CLICK, (e: MouseEvent) => callback(e)),
 		]);
 	}
 
-	public setValue(label?: string, description?: string, options?: IIconLabelValueOptions): void {
+	setValue(label?: string, description?: string, options?: IIconLabelValueOptions): void {
 		const classes = ['monaco-icon-label'];
 		if (options) {
 			if (options.extraClasses) {
@@ -162,15 +164,6 @@ export class IconLabel {
 			}
 		}
 	}
-
-	public dispose(): void {
-		this.domNode.dispose();
-		this.labelNode.dispose();
-
-		if (this.descriptionNode) {
-			this.descriptionNode.dispose();
-		}
-	}
 }
 
 export class FileLabel extends IconLabel {
@@ -181,7 +174,7 @@ export class FileLabel extends IconLabel {
 		this.setFile(file, provider, userHome);
 	}
 
-	public setFile(file: uri, provider: IWorkspaceFolderProvider, userHome: IUserHomeProvider): void {
+	setFile(file: uri, provider: IWorkspaceFolderProvider, userHome: IUserHomeProvider): void {
 		const parent = paths.dirname(file.fsPath);
 
 		this.setValue(getBaseLabel(file), parent && parent !== '.' ? getPathLabel(parent, userHome, provider) : '', { title: file.fsPath });
diff --git a/src/vs/base/browser/ui/inputbox/inputBox.ts b/src/vs/base/browser/ui/inputbox/inputBox.ts
index e13ed5bca67..de20e20ffc6 100644
--- a/src/vs/base/browser/ui/inputbox/inputBox.ts
+++ b/src/vs/base/browser/ui/inputbox/inputBox.ts
@@ -513,9 +513,9 @@ export class HistoryInputBox extends InputBox implements IHistoryNavigationWidge
 		this.history = new HistoryNavigator<string>(options.history, 100);
 	}
 
-	public addToHistory(value: string): void {
-		if (value !== this.history.current()) {
-			this.history.add(value);
+	public addToHistory(): void {
+		if (this.value && this.value !== this.getCurrentValue()) {
+			this.history.add(this.value);
 		}
 	}
 
@@ -524,17 +524,26 @@ export class HistoryInputBox extends InputBox implements IHistoryNavigationWidge
 	}
 
 	public showNextValue(): void {
-		let next = this.history.next();
+		let next = this.getNextValue();
+		if (next) {
+			next = next === this.value ? this.getNextValue() : next;
+		}
+
 		if (next) {
 			this.value = next;
 		}
 	}
 
 	public showPreviousValue(): void {
-		if (this.value.length !== 0) {
-			this.history.addIfNotPresent(this.value);
+		if (!this.history.has(this.value)) {
+			this.addToHistory();
 		}
-		const previous = this.history.previous();
+
+		let previous = this.getPreviousValue();
+		if (previous) {
+			previous = previous === this.value ? this.getPreviousValue() : previous;
+		}
+
 		if (previous) {
 			this.value = previous;
 		}
@@ -543,4 +552,21 @@ export class HistoryInputBox extends InputBox implements IHistoryNavigationWidge
 	public clearHistory(): void {
 		this.history.clear();
 	}
+
+	private getCurrentValue(): string {
+		let currentValue = this.history.current();
+		if (!currentValue) {
+			currentValue = this.history.last();
+			this.history.next();
+		}
+		return currentValue;
+	}
+
+	private getPreviousValue(): string {
+		return this.history.previous() || this.history.first();
+	}
+
+	private getNextValue(): string {
+		return this.history.next() || this.history.last();
+	}
 }
diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
index a93a19f2be3..d297818a787 100644
--- a/src/vs/base/browser/ui/list/listWidget.ts
+++ b/src/vs/base/browser/ui/list/listWidget.ts
@@ -21,23 +21,13 @@ import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { ISpliceable } from 'vs/base/common/sequence';
+import { CombinedSpliceable } from 'vs/base/browser/ui/list/splice';
 import { clamp } from 'vs/base/common/numbers';
 
 export interface IIdentityProvider<T> {
 	(element: T): string;
 }
 
-class CombinedSpliceable<T> implements ISpliceable<T> {
-
-	constructor(private spliceables: ISpliceable<T>[]) { }
-
-	splice(start: number, deleteCount: number, elements: T[]): void {
-		for (const spliceable of this.spliceables) {
-			spliceable.splice(start, deleteCount, elements);
-		}
-	}
-}
-
 interface ITraitChangeEvent {
 	indexes: number[];
 }
diff --git a/src/vs/base/browser/ui/list/splice.ts b/src/vs/base/browser/ui/list/splice.ts
new file mode 100644
index 00000000000..e65be2e8432
--- /dev/null
+++ b/src/vs/base/browser/ui/list/splice.ts
@@ -0,0 +1,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';
+
+export interface ISpliceable<T> {
+	splice(start: number, deleteCount: number, elements: T[]): void;
+}
+
+export interface ISpreadSpliceable<T> {
+	splice(start: number, deleteCount: number, ...elements: T[]): void;
+}
+
+export class CombinedSpliceable<T> implements ISpliceable<T> {
+
+	constructor(private spliceables: ISpliceable<T>[]) { }
+
+	splice(start: number, deleteCount: number, elements: T[]): void {
+		this.spliceables.forEach(s => s.splice(start, deleteCount, elements));
+	}
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/menu/menu.css b/src/vs/base/browser/ui/menu/menu.css
index 554b91d60de..fff01a4a278 100644
--- a/src/vs/base/browser/ui/menu/menu.css
+++ b/src/vs/base/browser/ui/menu/menu.css
@@ -5,6 +5,7 @@
 
 .monaco-menu .monaco-action-bar.vertical {
 	margin-left: 0;
+	overflow: visible;
 }
 
 .monaco-menu .monaco-action-bar.vertical .actions-container {
@@ -47,7 +48,8 @@
 	background: none;
 }
 
-.monaco-menu .monaco-action-bar.vertical .keybinding {
+.monaco-menu .monaco-action-bar.vertical .keybinding,
+.monaco-menu .monaco-action-bar.vertical .submenu-indicator {
 	display: inline-block;
 	-ms-flex: 2 1 auto;
 	flex: 2 1 auto;
@@ -57,7 +59,12 @@
 	text-align: right;
 }
 
-.monaco-menu .monaco-action-bar.vertical .action-item.disabled .keybinding {
+.monaco-menu .monaco-action-bar.vertical .submenu-indicator {
+	padding: 0.8em .5em;
+}
+
+.monaco-menu .monaco-action-bar.vertical .action-item.disabled .keybinding,
+.monaco-menu .monaco-action-bar.vertical .action-item.disabled .submenu-indicator {
 	opacity: 0.4;
 }
 
@@ -134,6 +141,10 @@
 	box-shadow: none;
 }
 
+.hc-black .monaco-menu .monaco-action-bar.vertical .action-item {
+	border: 1px solid transparent; /* prevents jumpig behaviour on hover or focus */
+}
+
 .hc-black .monaco-menu .monaco-action-bar.vertical .action-item.focused {
 	background: none;
 	border: 1px dotted #f38518;
diff --git a/src/vs/base/browser/ui/menu/menu.ts b/src/vs/base/browser/ui/menu/menu.ts
index 512d107f156..2eb053fbdc0 100644
--- a/src/vs/base/browser/ui/menu/menu.ts
+++ b/src/vs/base/browser/ui/menu/menu.ts
@@ -7,11 +7,13 @@
 
 import 'vs/css!./menu';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import { IActionRunner, IAction } from 'vs/base/common/actions';
-import { ActionBar, IActionItemProvider, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
-import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
+import { IActionRunner, IAction, Action } from 'vs/base/common/actions';
+import { ActionBar, IActionItemProvider, ActionsOrientation, Separator, ActionItem, IActionItemOptions } from 'vs/base/browser/ui/actionbar/actionbar';
+import { ResolvedKeybinding, KeyCode } from 'vs/base/common/keyCodes';
 import { Event } from 'vs/base/common/event';
-import { addClass } from 'vs/base/browser/dom';
+import { addClass, EventType, EventHelper, EventLike } from 'vs/base/browser/dom';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { $, Builder } from 'vs/base/browser/builder';
 
 export interface IMenuOptions {
 	context?: any;
@@ -21,6 +23,18 @@ export interface IMenuOptions {
 	ariaLabel?: string;
 }
 
+
+export class SubmenuAction extends Action {
+	constructor(label: string, public entries: (SubmenuAction | IAction)[], cssClass?: string) {
+		super(!!cssClass ? cssClass : 'submenu', label, '', true);
+	}
+}
+
+interface ISubMenuData {
+	parent: Menu;
+	submenu?: Menu;
+}
+
 export class Menu {
 
 	private actionBar: ActionBar;
@@ -35,9 +49,13 @@ export class Menu {
 		menuContainer.setAttribute('role', 'presentation');
 		container.appendChild(menuContainer);
 
+		let parentData: ISubMenuData = {
+			parent: this
+		};
+
 		this.actionBar = new ActionBar(menuContainer, {
 			orientation: ActionsOrientation.VERTICAL,
-			actionItemProvider: options.actionItemProvider,
+			actionItemProvider: action => this.doGetActionItem(action, options, parentData),
 			context: options.context,
 			actionRunner: options.actionRunner,
 			isMenu: true,
@@ -47,6 +65,24 @@ export class Menu {
 		this.actionBar.push(actions, { icon: true, label: true, isMenu: true });
 	}
 
+	private doGetActionItem(action: IAction, options: IMenuOptions, parentData: ISubMenuData): ActionItem {
+		if (action instanceof Separator) {
+			return new ActionItem(options.context, action, { icon: true });
+		} else if (action instanceof SubmenuAction) {
+			return new SubmenuActionItem(action, action.entries, parentData, options);
+		} else {
+			const menuItemOptions: IActionItemOptions = {};
+			if (options.getKeyBinding) {
+				const keybinding = options.getKeyBinding(action);
+				if (keybinding) {
+					menuItemOptions.keybinding = keybinding.getLabel();
+				}
+			}
+
+			return new MenuActionItem(options.context, action, menuItemOptions);
+		}
+	}
+
 	public get onDidCancel(): Event<void> {
 		return this.actionBar.onDidCancel;
 	}
@@ -56,7 +92,9 @@ export class Menu {
 	}
 
 	public focus() {
-		this.actionBar.focus(true);
+		if (this.actionBar) {
+			this.actionBar.focus(true);
+		}
 	}
 
 	public dispose() {
@@ -70,4 +108,179 @@ export class Menu {
 			this.listener = null;
 		}
 	}
+}
+
+class MenuActionItem extends ActionItem {
+	static MNEMONIC_REGEX: RegExp = /&&(.)/g;
+
+	constructor(ctx: any, action: IAction, options: IActionItemOptions = {}) {
+		options.isMenu = true;
+		super(action, action, options);
+	}
+
+	private _addMnemonic(action: IAction, actionItemElement: HTMLElement): void {
+		let matches = MenuActionItem.MNEMONIC_REGEX.exec(action.label);
+		if (matches && matches.length === 2) {
+			let mnemonic = matches[1];
+
+			let ariaLabel = action.label.replace(MenuActionItem.MNEMONIC_REGEX, mnemonic);
+
+			actionItemElement.accessKey = mnemonic.toLocaleLowerCase();
+			this.$e.attr('aria-label', ariaLabel);
+		} else {
+			this.$e.attr('aria-label', action.label);
+		}
+	}
+
+	public render(container: HTMLElement): void {
+		super.render(container);
+
+		this._addMnemonic(this.getAction(), container);
+		this.$e.attr('role', 'menuitem');
+	}
+
+	public _updateLabel(): void {
+		if (this.options.label) {
+			let label = this.getAction().label;
+			if (label && this.options.isMenu) {
+				label = label.replace(MenuActionItem.MNEMONIC_REGEX, '$1\u0332');
+			}
+			this.$e.text(label);
+		}
+	}
+}
+
+class SubmenuActionItem extends MenuActionItem {
+	private mysubmenu: Menu;
+	private submenuContainer: Builder;
+	private mouseOver: boolean;
+
+	constructor(
+		action: IAction,
+		private submenuActions: IAction[],
+		private parentData: ISubMenuData,
+		private submenuOptions?: IMenuOptions
+	) {
+		super(action, action, { label: true, isMenu: true });
+	}
+
+	public render(container: HTMLElement): void {
+		super.render(container);
+
+		this.builder = $(container);
+		$(this.builder).addClass('monaco-submenu-item');
+		$('span.submenu-indicator').text('\u25B6').appendTo(this.builder);
+		this.$e.attr('role', 'menu');
+
+		$(this.builder).on(EventType.KEY_UP, (e) => {
+			let event = new StandardKeyboardEvent(e as KeyboardEvent);
+			if (event.equals(KeyCode.RightArrow)) {
+				EventHelper.stop(e, true);
+
+				this.createSubmenu();
+			}
+		});
+
+		$(this.builder).on(EventType.KEY_DOWN, (e) => {
+			let event = new StandardKeyboardEvent(e as KeyboardEvent);
+			if (event.equals(KeyCode.RightArrow)) {
+				EventHelper.stop(e, true);
+			}
+		});
+
+		$(this.builder).on(EventType.MOUSE_OVER, (e) => {
+			if (!this.mouseOver) {
+				this.mouseOver = true;
+
+				setTimeout(() => {
+					if (this.mouseOver) {
+						this.cleanupExistingSubmenu(false);
+						this.createSubmenu();
+					}
+				}, 250);
+
+			}
+		});
+
+
+		$(this.builder).on(EventType.MOUSE_LEAVE, (e) => {
+			this.mouseOver = false;
+
+			setTimeout(() => {
+				if (!this.mouseOver && this.parentData.submenu === this.mysubmenu) {
+					this.parentData.parent.focus();
+					this.cleanupExistingSubmenu(true);
+				}
+
+			}, 750);
+		});
+	}
+
+	public onClick(e: EventLike) {
+		// stop clicking from trying to run an action
+		EventHelper.stop(e, true);
+	}
+
+	private cleanupExistingSubmenu(force: boolean) {
+		if (this.parentData.submenu && (force || (this.parentData.submenu !== this.mysubmenu))) {
+			this.parentData.submenu.dispose();
+			this.parentData.submenu = null;
+
+			if (this.submenuContainer) {
+				this.submenuContainer.dispose();
+				this.submenuContainer = null;
+			}
+		}
+	}
+
+	private createSubmenu() {
+		if (!this.parentData.submenu) {
+			this.submenuContainer = $(this.builder).div({ class: 'monaco-submenu menubar-menu-items-holder context-view' });
+
+			$(this.submenuContainer).style({
+				'left': `${$(this.builder).getClientArea().width}px`
+			});
+
+			$(this.submenuContainer).on(EventType.KEY_UP, (e) => {
+				let event = new StandardKeyboardEvent(e as KeyboardEvent);
+				if (event.equals(KeyCode.LeftArrow)) {
+					EventHelper.stop(e, true);
+
+					this.parentData.parent.focus();
+					this.parentData.submenu.dispose();
+					this.parentData.submenu = null;
+
+					this.submenuContainer.dispose();
+					this.submenuContainer = null;
+				}
+			});
+
+			$(this.submenuContainer).on(EventType.KEY_DOWN, (e) => {
+				let event = new StandardKeyboardEvent(e as KeyboardEvent);
+				if (event.equals(KeyCode.LeftArrow)) {
+					EventHelper.stop(e, true);
+				}
+			});
+
+
+			this.parentData.submenu = new Menu(this.submenuContainer.getHTMLElement(), this.submenuActions, this.submenuOptions);
+			this.parentData.submenu.focus();
+
+			this.mysubmenu = this.parentData.submenu;
+		}
+	}
+
+	public dispose() {
+		super.dispose();
+
+		if (this.mysubmenu) {
+			this.mysubmenu.dispose();
+			this.mysubmenu = null;
+		}
+
+		if (this.submenuContainer) {
+			this.submenuContainer.dispose();
+			this.submenuContainer = null;
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/octiconLabel/octiconLabel.ts b/src/vs/base/browser/ui/octiconLabel/octiconLabel.ts
index e55a3c61e92..0b1154a98fd 100644
--- a/src/vs/base/browser/ui/octiconLabel/octiconLabel.ts
+++ b/src/vs/base/browser/ui/octiconLabel/octiconLabel.ts
@@ -2,14 +2,13 @@
  *  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!./octicons/octicons';
 import 'vs/css!./octicons/octicons-animations';
 import { escape } from 'vs/base/common/strings';
 
 function expand(text: string): string {
-	return text.replace(/\$\(((.+?)(~(.*?))?)\)/g, (match, g1, name, g3, animation) => {
+	return text.replace(/\$\(((.+?)(~(.*?))?)\)/g, (_match, _g1, name, _g3, animation) => {
 		return `<span class="octicon octicon-${name} ${animation ? `octicon-animation-${animation}` : ''}"></span>`;
 	});
 }
@@ -20,11 +19,9 @@ export function renderOcticons(label: string): string {
 
 export class OcticonLabel {
 
-	private readonly _container: HTMLElement;
-
-	constructor(container: HTMLElement) {
-		this._container = container;
-	}
+	constructor(
+		private readonly _container: HTMLElement
+	) { }
 
 	set text(text: string) {
 		this._container.innerHTML = renderOcticons(text || '');
diff --git a/src/vs/base/browser/ui/progressbar/progressbar.ts b/src/vs/base/browser/ui/progressbar/progressbar.ts
index f1969feebac..7d294d601f5 100644
--- a/src/vs/base/browser/ui/progressbar/progressbar.ts
+++ b/src/vs/base/browser/ui/progressbar/progressbar.ts
@@ -10,7 +10,7 @@ import { TPromise, ValueCallback } from 'vs/base/common/winjs.base';
 import * as assert from 'vs/base/common/assert';
 import { Builder, $ } from 'vs/base/browser/builder';
 import * as DOM from 'vs/base/browser/dom';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
 
@@ -35,9 +35,8 @@ const defaultOpts = {
 /**
  * A progress bar with support for infinite or discrete progress.
  */
-export class ProgressBar {
+export class ProgressBar extends Disposable {
 	private options: IProgressBarOptions;
-	private toUnbind: IDisposable[];
 	private workedVal: number;
 	private element: Builder;
 	private bit: HTMLElement;
@@ -46,10 +45,11 @@ export class ProgressBar {
 	private progressBarBackground: Color;
 
 	constructor(container: HTMLElement, options?: IProgressBarOptions) {
+		super();
+
 		this.options = options || Object.create(null);
 		mixin(this.options, defaultOpts, false);
 
-		this.toUnbind = [];
 		this.workedVal = 0;
 
 		this.progressBarBackground = this.options.progressBarBackground;
@@ -70,7 +70,7 @@ export class ProgressBar {
 						break;
 				}
 
-			}, this.toUnbind);
+			}, this.toDispose);
 
 			this.bit = builder.getHTMLElement();
 		});
@@ -92,14 +92,14 @@ export class ProgressBar {
 	/**
 	 * Indicates to the progress bar that all work is done.
 	 */
-	public done(): ProgressBar {
+	done(): ProgressBar {
 		return this.doDone(true);
 	}
 
 	/**
 	 * Stops the progressbar from showing any progress instantly without fading out.
 	 */
-	public stop(): ProgressBar {
+	stop(): ProgressBar {
 		return this.doDone(false);
 	}
 
@@ -133,7 +133,7 @@ export class ProgressBar {
 	/**
 	 * Use this mode to indicate progress that has no total number of work units.
 	 */
-	public infinite(): ProgressBar {
+	infinite(): ProgressBar {
 		this.bit.style.width = '2%';
 		this.bit.style.opacity = '1';
 
@@ -149,7 +149,7 @@ export class ProgressBar {
 	 * Tells the progress bar the total number of work. Use in combination with workedVal() to let
 	 * the progress bar show the actual progress based on the work that is done.
 	 */
-	public total(value: number): ProgressBar {
+	total(value: number): ProgressBar {
 		this.workedVal = 0;
 		this.totalWork = value;
 
@@ -159,14 +159,14 @@ export class ProgressBar {
 	/**
 	 * Finds out if this progress bar is configured with total work
 	 */
-	public hasTotal(): boolean {
+	hasTotal(): boolean {
 		return !isNaN(this.totalWork);
 	}
 
 	/**
 	 * Tells the progress bar that an increment of work has been completed.
 	 */
-	public worked(value: number): ProgressBar {
+	worked(value: number): ProgressBar {
 		value = Number(value);
 		assert.ok(!isNaN(value), 'Value is not a number');
 		value = Math.max(1, value);
@@ -177,7 +177,7 @@ export class ProgressBar {
 	/**
 	 * Tells the progress bar the total amount of work that has been completed.
 	 */
-	public setWorked(value: number): ProgressBar {
+	setWorked(value: number): ProgressBar {
 		value = Number(value);
 		assert.ok(!isNaN(value), 'Value is not a number');
 		value = Math.max(1, value);
@@ -212,11 +212,11 @@ export class ProgressBar {
 		return this;
 	}
 
-	public getContainer(): HTMLElement {
+	getContainer(): HTMLElement {
 		return this.element.getHTMLElement();
 	}
 
-	public show(delay?: number): void {
+	show(delay?: number): void {
 		if (typeof delay === 'number') {
 			this.element.showDelayed(delay);
 		} else {
@@ -224,11 +224,11 @@ export class ProgressBar {
 		}
 	}
 
-	public hide(): void {
+	hide(): void {
 		this.element.hide();
 	}
 
-	public style(styles: IProgressBarStyles): void {
+	style(styles: IProgressBarStyles): void {
 		this.progressBarBackground = styles.progressBarBackground;
 
 		this.applyStyles();
@@ -241,8 +241,4 @@ export class ProgressBar {
 			this.bit.style.backgroundColor = background;
 		}
 	}
-
-	public dispose(): void {
-		this.toUnbind = dispose(this.toUnbind);
-	}
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/selectBox/selectBox.ts b/src/vs/base/browser/ui/selectBox/selectBox.ts
index 28828be39de..af1752d992e 100644
--- a/src/vs/base/browser/ui/selectBox/selectBox.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBox.ts
@@ -5,7 +5,6 @@
 
 import 'vs/css!./selectBox';
 
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Event } from 'vs/base/common/event';
 import { Widget } from 'vs/base/browser/ui/widget';
 import { Color } from 'vs/base/common/color';
@@ -58,15 +57,12 @@ export interface ISelectData {
 }
 
 export class SelectBox extends Widget implements ISelectBoxDelegate {
-	private toDispose: IDisposable[];
 	private styles: ISelectBoxStyles;
 	private selectBoxDelegate: ISelectBoxDelegate;
 
 	constructor(options: string[], selected: number, contextViewProvider: IContextViewProvider, styles: ISelectBoxStyles = deepClone(defaultStyles), selectBoxOptions?: ISelectBoxOptions) {
 		super();
 
-		this.toDispose = [];
-
 		mixin(this.styles, defaultStyles, false);
 
 		// Instantiate select implementation based on platform
@@ -76,7 +72,7 @@ export class SelectBox extends Widget implements ISelectBoxDelegate {
 			this.selectBoxDelegate = new SelectBoxList(options, selected, contextViewProvider, styles, selectBoxOptions);
 		}
 
-		this.toDispose.push(this.selectBoxDelegate);
+		this._register(this.selectBoxDelegate);
 	}
 
 	// Public SelectBox Methods - routed through delegate interface
@@ -114,9 +110,4 @@ export class SelectBox extends Widget implements ISelectBoxDelegate {
 	public applyStyles(): void {
 		this.selectBoxDelegate.applyStyles();
 	}
-
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
-		super.dispose();
-	}
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts
index cecc9f9831e..50e06012bba 100644
--- a/src/vs/base/browser/ui/toolbar/toolbar.ts
+++ b/src/vs/base/browser/ui/toolbar/toolbar.ts
@@ -12,6 +12,7 @@ import { Action, IActionRunner, IAction } from 'vs/base/common/actions';
 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';
+import { Disposable } from 'vs/base/common/lifecycle';
 
 export const CONTEXT = 'context.toolbar';
 
@@ -26,7 +27,7 @@ export interface IToolBarOptions {
 /**
  * A widget that combines an action bar for primary actions and a dropdown for secondary actions.
  */
-export class ToolBar {
+export class ToolBar extends Disposable {
 	private options: IToolBarOptions;
 	private actionBar: ActionBar;
 	private toggleMenuAction: ToggleMenuAction;
@@ -35,16 +36,18 @@ export class ToolBar {
 	private lookupKeybindings: boolean;
 
 	constructor(container: HTMLElement, contextMenuProvider: IContextMenuProvider, options: IToolBarOptions = { orientation: ActionsOrientation.HORIZONTAL }) {
+		super();
+
 		this.options = options;
 		this.lookupKeybindings = typeof this.options.getKeyBinding === 'function';
 
-		this.toggleMenuAction = new ToggleMenuAction(() => this.toggleMenuActionItem && this.toggleMenuActionItem.show());
+		this.toggleMenuAction = this._register(new ToggleMenuAction(() => this.toggleMenuActionItem && this.toggleMenuActionItem.show()));
 
 		let element = document.createElement('div');
 		element.className = 'monaco-toolbar';
 		container.appendChild(element);
 
-		this.actionBar = new ActionBar(element, {
+		this.actionBar = this._register(new ActionBar(element, {
 			orientation: options.orientation,
 			ariaLabel: options.ariaLabel,
 			actionRunner: options.actionRunner,
@@ -75,29 +78,29 @@ export class ToolBar {
 
 				return options.actionItemProvider ? options.actionItemProvider(action) : null;
 			}
-		});
+		}));
 	}
 
-	public set actionRunner(actionRunner: IActionRunner) {
+	set actionRunner(actionRunner: IActionRunner) {
 		this.actionBar.actionRunner = actionRunner;
 	}
 
-	public get actionRunner(): IActionRunner {
+	get actionRunner(): IActionRunner {
 		return this.actionBar.actionRunner;
 	}
 
-	public set context(context: any) {
+	set context(context: any) {
 		this.actionBar.context = context;
 		if (this.toggleMenuActionItem) {
 			this.toggleMenuActionItem.setActionContext(context);
 		}
 	}
 
-	public getContainer(): HTMLElement {
+	getContainer(): HTMLElement {
 		return this.actionBar.getContainer();
 	}
 
-	public getItemsWidth(): number {
+	getItemsWidth(): number {
 		let itemsWidth = 0;
 		for (let i = 0; i < this.actionBar.length(); i++) {
 			itemsWidth += this.actionBar.getWidth(i);
@@ -105,11 +108,11 @@ export class ToolBar {
 		return itemsWidth;
 	}
 
-	public setAriaLabel(label: string): void {
+	setAriaLabel(label: string): void {
 		this.actionBar.setAriaLabel(label);
 	}
 
-	public setActions(primaryActions: IAction[], secondaryActions?: IAction[]): () => void {
+	setActions(primaryActions: IAction[], secondaryActions?: IAction[]): () => void {
 		return () => {
 			let primaryActionsToSet = primaryActions ? primaryActions.slice(0) : [];
 
@@ -134,7 +137,7 @@ export class ToolBar {
 		return key ? key.getLabel() : void 0;
 	}
 
-	public addPrimaryAction(primaryAction: IAction): () => void {
+	addPrimaryAction(primaryAction: IAction): () => void {
 		return () => {
 
 			// Add after the "..." action if we have secondary actions
@@ -150,19 +153,19 @@ export class ToolBar {
 		};
 	}
 
-	public dispose(): void {
-		this.actionBar.dispose();
-		this.toggleMenuAction.dispose();
-
+	dispose(): void {
 		if (this.toggleMenuActionItem) {
 			this.toggleMenuActionItem.dispose();
+			this.toggleMenuActionItem = void 0;
 		}
+
+		super.dispose();
 	}
 }
 
 class ToggleMenuAction extends Action {
 
-	public static readonly ID = 'toolbar.toggle.more';
+	static readonly ID = 'toolbar.toggle.more';
 
 	private _menuActions: IAction[];
 	private toggleDropdownMenu: () => void;
@@ -173,17 +176,17 @@ class ToggleMenuAction extends Action {
 		this.toggleDropdownMenu = toggleDropdownMenu;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.toggleDropdownMenu();
 
 		return TPromise.as(true);
 	}
 
-	public get menuActions() {
+	get menuActions() {
 		return this._menuActions;
 	}
 
-	public set menuActions(actions: IAction[]) {
+	set menuActions(actions: IAction[]) {
 		this._menuActions = actions;
 	}
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/tree/tree.css b/src/vs/base/browser/ui/tree/tree.css
new file mode 100644
index 00000000000..ea0178046f7
--- /dev/null
+++ b/src/vs/base/browser/ui/tree/tree.css
@@ -0,0 +1,16 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-tl-row {
+	display: flex;
+	height: 100%;
+	align-items: center;
+}
+
+.monaco-tl-row > .tl-twistie {
+	font-size: 10px;
+	text-align: right;
+	padding-right: 10px;
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/tree/tree.ts b/src/vs/base/browser/ui/tree/tree.ts
new file mode 100644
index 00000000000..6cd72d3311f
--- /dev/null
+++ b/src/vs/base/browser/ui/tree/tree.ts
@@ -0,0 +1,238 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import 'vs/css!./tree';
+import { IDisposable, dispose, Disposable, toDisposable } from 'vs/base/common/lifecycle';
+import { IListOptions, List, IIdentityProvider, IMultipleSelectionController } from 'vs/base/browser/ui/list/listWidget';
+import { TreeModel, ITreeNode, ITreeElement } from 'vs/base/browser/ui/tree/treeModel';
+import { IIterator, empty } from 'vs/base/common/iterator';
+import { IDelegate, IRenderer, IListMouseEvent } from 'vs/base/browser/ui/list/list';
+import { append, $ } from 'vs/base/browser/dom';
+import { Event, Relay, chain } from 'vs/base/common/event';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { KeyCode } from 'vs/base/common/keyCodes';
+
+function toTreeListOptions<T>(options?: IListOptions<T>): IListOptions<ITreeNode<T>> {
+	if (!options) {
+		return undefined;
+	}
+
+	let identityProvider: IIdentityProvider<ITreeNode<T>> | undefined = undefined;
+	let multipleSelectionController: IMultipleSelectionController<ITreeNode<T>> | undefined = undefined;
+
+	if (options.identityProvider) {
+		identityProvider = el => options.identityProvider(el.element);
+	}
+
+	if (options.multipleSelectionController) {
+		multipleSelectionController = {
+			isSelectionSingleChangeEvent(e) {
+				return options.multipleSelectionController.isSelectionSingleChangeEvent({ ...e, element: e.element } as any);
+			},
+			isSelectionRangeChangeEvent(e) {
+				return options.multipleSelectionController.isSelectionRangeChangeEvent({ ...e, element: e.element } as any);
+			}
+		};
+	}
+
+	return {
+		...options,
+		identityProvider,
+		multipleSelectionController
+	};
+}
+
+class TreeDelegate<T> implements IDelegate<ITreeNode<T>> {
+
+	constructor(private delegate: IDelegate<T>) { }
+
+	getHeight(element: ITreeNode<T>): number {
+		return this.delegate.getHeight(element.element);
+	}
+
+	getTemplateId(element: ITreeNode<T>): string {
+		return this.delegate.getTemplateId(element.element);
+	}
+}
+
+interface ITreeListTemplateData<T> {
+	twistie: HTMLElement;
+	elementDisposable: IDisposable;
+	templateData: T;
+}
+
+class TreeRenderer<T, TTemplateData> implements IRenderer<ITreeNode<T>, ITreeListTemplateData<TTemplateData>> {
+
+	readonly templateId: string;
+	private renderedNodes = new Map<ITreeNode<T>, ITreeListTemplateData<TTemplateData>>();
+	private disposables: IDisposable[] = [];
+
+	constructor(
+		private renderer: IRenderer<T, TTemplateData>,
+		onDidChangeCollapseState: Event<ITreeNode<T>>
+	) {
+		this.templateId = renderer.templateId;
+		onDidChangeCollapseState(this.onDidChangeCollapseState, this, this.disposables);
+	}
+
+	renderTemplate(container: HTMLElement): ITreeListTemplateData<TTemplateData> {
+		const el = append(container, $('.monaco-tl-row'));
+		const twistie = append(el, $('.tl-twistie'));
+		const contents = append(el, $('.tl-contents'));
+		const templateData = this.renderer.renderTemplate(contents);
+
+		return { twistie, elementDisposable: Disposable.None, templateData };
+	}
+
+	renderElement(node: ITreeNode<T>, index: number, templateData: ITreeListTemplateData<TTemplateData>): void {
+		templateData.elementDisposable.dispose();
+
+		this.renderedNodes.set(node, templateData);
+		templateData.elementDisposable = toDisposable(() => this.renderedNodes.delete(node));
+
+		templateData.twistie.innerText = node.children.length === 0 ? '' : (node.collapsed ? '▹' : '◢');
+		templateData.twistie.style.width = `${10 + node.depth * 10}px`;
+
+		this.renderer.renderElement(node.element, index, templateData.templateData);
+	}
+
+	disposeTemplate(templateData: ITreeListTemplateData<TTemplateData>): void {
+		this.renderer.disposeTemplate(templateData.templateData);
+	}
+
+	private onDidChangeCollapseState(node: ITreeNode<T>): void {
+		const templateData = this.renderedNodes.get(node);
+
+		if (!templateData) {
+			return;
+		}
+
+		templateData.twistie.innerText = node.children.length === 0 ? '' : (node.collapsed ? '▹' : '◢');
+	}
+
+	dispose(): void {
+		this.renderedNodes.clear();
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+function getLocation<T>(node: ITreeNode<T>): number[] {
+	const location = [];
+
+	while (node.parent) {
+		location.push(node.parent.children.indexOf(node));
+		node = node.parent;
+	}
+
+	return location.reverse();
+}
+
+function isInputElement(e: HTMLElement): boolean {
+	return e.tagName === 'INPUT' || e.tagName === 'TEXTAREA';
+}
+
+export class Tree<T> implements IDisposable {
+
+	private view: List<ITreeNode<T>>;
+	private model: TreeModel<T>;
+	private disposables: IDisposable[] = [];
+
+	constructor(
+		container: HTMLElement,
+		delegate: IDelegate<T>,
+		renderers: IRenderer<T, any>[],
+		options?: IListOptions<T>
+	) {
+		const treeDelegate = new TreeDelegate(delegate);
+
+		const onDidChangeCollapseStateRelay = new Relay<ITreeNode<T>>();
+		const treeRenderers = renderers.map(r => new TreeRenderer(r, onDidChangeCollapseStateRelay.event));
+		this.disposables.push(...treeRenderers);
+
+		const treeOptions = toTreeListOptions(options);
+
+		this.view = new List(container, treeDelegate, treeRenderers, treeOptions);
+		this.model = new TreeModel<T>(this.view);
+		onDidChangeCollapseStateRelay.input = this.model.onDidChangeCollapseState;
+
+		this.view.onMouseClick(this.onMouseClick, this, this.disposables);
+
+		const onKeyDown = chain(this.view.onKeyDown)
+			.filter(e => !isInputElement(e.target as HTMLElement))
+			.map(e => new StandardKeyboardEvent(e));
+
+		onKeyDown.filter(e => e.keyCode === KeyCode.LeftArrow).on(this.onLeftArrow, this, this.disposables);
+		onKeyDown.filter(e => e.keyCode === KeyCode.RightArrow).on(this.onRightArrow, this, this.disposables);
+		onKeyDown.filter(e => e.keyCode === KeyCode.Space).on(this.onSpace, this, this.disposables);
+	}
+
+	splice(location: number[], deleteCount: number, toInsert: IIterator<ITreeElement<T>> = empty()): IIterator<ITreeElement<T>> {
+		return this.model.splice(location, deleteCount, toInsert);
+	}
+
+	private onMouseClick(e: IListMouseEvent<ITreeNode<T>>): void {
+		const node = e.element;
+		const location = getLocation(node);
+
+		this.model.toggleCollapsed(location);
+	}
+
+	private onLeftArrow(e: StandardKeyboardEvent): void {
+		e.preventDefault();
+		e.stopPropagation();
+
+		const nodes = this.view.getFocusedElements();
+
+		if (nodes.length === 0) {
+			return;
+		}
+
+		const node = nodes[0];
+		const location = getLocation(node);
+		const didCollapse = this.model.setCollapsed(location, true);
+
+		if (!didCollapse) {
+			console.log('should focus parent');
+			// this.view.setFocus([]);
+		}
+	}
+
+	private onRightArrow(e: StandardKeyboardEvent): void {
+		e.preventDefault();
+		e.stopPropagation();
+
+		const nodes = this.view.getFocusedElements();
+
+		if (nodes.length === 0) {
+			return;
+		}
+
+		const node = nodes[0];
+		const location = getLocation(node);
+		this.model.setCollapsed(location, false);
+	}
+
+	private onSpace(e: StandardKeyboardEvent): void {
+		e.preventDefault();
+		e.stopPropagation();
+
+		const nodes = this.view.getFocusedElements();
+
+		if (nodes.length === 0) {
+			return;
+		}
+
+		const node = nodes[0];
+		const location = getLocation(node);
+		this.model.toggleCollapsed(location);
+	}
+
+	dispose(): void {
+		this.disposables = dispose(this.disposables);
+		this.view.dispose();
+		this.view = null;
+		this.model = null;
+	}
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/tree/treeModel.ts b/src/vs/base/browser/ui/tree/treeModel.ts
new file mode 100644
index 00000000000..8d3c14b727b
--- /dev/null
+++ b/src/vs/base/browser/ui/tree/treeModel.ts
@@ -0,0 +1,209 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ISpliceable } from 'vs/base/common/sequence';
+import { IIterator, map, collect, iter, empty } from 'vs/base/common/iterator';
+import { Emitter, Event } from 'vs/base/common/event';
+
+export interface ITreeElement<T> {
+	readonly element: T;
+	readonly children?: IIterator<ITreeElement<T>> | ITreeElement<T>[];
+	readonly collapsed?: boolean;
+}
+
+export interface ITreeNode<T> {
+	readonly parent: IMutableTreeNode<T> | undefined;
+	readonly element: T;
+	readonly children: IMutableTreeNode<T>[];
+	readonly depth: number;
+	readonly collapsed: boolean;
+	readonly visibleCount: number;
+}
+
+interface IMutableTreeNode<T> extends ITreeNode<T> {
+	collapsed: boolean;
+	visibleCount: number;
+}
+
+function visibleCountReducer<T>(result: number, node: IMutableTreeNode<T>): number {
+	return result + (node.collapsed ? 1 : node.visibleCount);
+}
+
+function getVisibleCount<T>(nodes: IMutableTreeNode<T>[]): number {
+	return nodes.reduce(visibleCountReducer, 0);
+}
+
+function getVisibleNodes<T>(nodes: IMutableTreeNode<T>[], result: ITreeNode<T>[] = []): ITreeNode<T>[] {
+	for (const node of nodes) {
+		result.push(node);
+
+		if (!node.collapsed) {
+			getVisibleNodes(node.children, result);
+		}
+	}
+
+	return result;
+}
+
+function getTreeElementIterator<T>(elements: IIterator<ITreeElement<T>> | ITreeElement<T>[] | undefined): IIterator<ITreeElement<T>> {
+	if (!elements) {
+		return empty();
+	} else if (Array.isArray(elements)) {
+		return iter(elements);
+	} else {
+		return elements;
+	}
+}
+
+function treeElementToNode<T>(treeElement: ITreeElement<T>, parent: IMutableTreeNode<T>, visible: boolean, treeListElements: ITreeNode<T>[]): IMutableTreeNode<T> {
+	const depth = parent.depth + 1;
+	const { element, collapsed } = treeElement;
+	const node = { parent, element, children: [], depth, collapsed: !!collapsed, visibleCount: 0 };
+
+	if (visible) {
+		treeListElements.push(node);
+	}
+
+	const children = getTreeElementIterator(treeElement.children);
+	node.children = collect(map(children, el => treeElementToNode(el, node, visible && !treeElement.collapsed, treeListElements)));
+	node.visibleCount = 1 + getVisibleCount(node.children);
+
+	return node;
+}
+
+function treeNodeToElement<T>(node: IMutableTreeNode<T>): ITreeElement<T> {
+	const { element, collapsed } = node;
+	const children = map(iter(node.children), treeNodeToElement);
+
+	return { element, children, collapsed };
+}
+
+export class TreeModel<T> {
+
+	private root: IMutableTreeNode<T> = {
+		parent: undefined,
+		element: undefined,
+		children: [],
+		depth: 0,
+		collapsed: false,
+		visibleCount: 1
+	};
+
+	private _onDidChangeCollapseState = new Emitter<ITreeNode<T>>();
+	readonly onDidChangeCollapseState: Event<ITreeNode<T>> = this._onDidChangeCollapseState.event;
+
+	constructor(private list: ISpliceable<ITreeNode<T>>) { }
+
+	splice(location: number[], deleteCount: number, toInsert?: IIterator<ITreeElement<T>> | ITreeElement<T>[]): IIterator<ITreeElement<T>> {
+		if (location.length === 0) {
+			throw new Error('Invalid tree location');
+		}
+
+		const { parentNode, listIndex, visible } = this.findParentNode(location);
+		const treeListElementsToInsert: ITreeNode<T>[] = [];
+		const elementsToInsert = getTreeElementIterator(toInsert);
+		const nodesToInsert = collect(map(elementsToInsert, el => treeElementToNode(el, parentNode, visible, treeListElementsToInsert)));
+		const lastIndex = location[location.length - 1];
+		const deletedNodes = parentNode.children.splice(lastIndex, deleteCount, ...nodesToInsert);
+		const visibleDeleteCount = getVisibleCount(deletedNodes);
+
+		parentNode.visibleCount += getVisibleCount(nodesToInsert) - visibleDeleteCount;
+
+		if (visible) {
+			this.list.splice(listIndex, visibleDeleteCount, treeListElementsToInsert);
+		}
+
+		return map(iter(deletedNodes), treeNodeToElement);
+	}
+
+	setCollapsed(location: number[], collapsed: boolean): boolean {
+		return this._setCollapsed(location, collapsed);
+	}
+
+	toggleCollapsed(location: number[]): void {
+		this._setCollapsed(location);
+	}
+
+	private _setCollapsed(location: number[], collapsed?: boolean | undefined): boolean {
+		const { node, listIndex, visible } = this.findNode(location);
+
+		if (typeof collapsed === 'undefined') {
+			collapsed = !node.collapsed;
+		}
+
+		if (node.collapsed === collapsed) {
+			return false;
+		}
+
+		node.collapsed = collapsed;
+
+		if (visible) {
+			let visibleCountDiff: number;
+
+			if (collapsed) {
+				const deleteCount = getVisibleCount(node.children);
+
+				this.list.splice(listIndex + 1, deleteCount, []);
+				visibleCountDiff = -deleteCount;
+			} else {
+				const toInsert = getVisibleNodes(node.children);
+
+				this.list.splice(listIndex + 1, 0, toInsert);
+				visibleCountDiff = toInsert.length;
+			}
+
+			let mutableNode = node;
+
+			while (mutableNode) {
+				mutableNode.visibleCount += visibleCountDiff;
+				mutableNode = mutableNode.parent;
+			}
+
+			this._onDidChangeCollapseState.fire(node);
+		}
+
+		return true;
+	}
+
+	isCollapsed(location: number[]): boolean {
+		return this.findNode(location).node.collapsed;
+	}
+
+	private findNode(location: number[]): { node: IMutableTreeNode<T>, listIndex: number, visible: boolean } {
+		const { parentNode, listIndex, visible } = this.findParentNode(location);
+		const index = location[location.length - 1];
+
+		if (index < 0 || index > parentNode.children.length) {
+			throw new Error('Invalid tree location');
+		}
+
+		const node = parentNode.children[index];
+
+		return { node, listIndex, visible };
+	}
+
+	private findParentNode(location: number[], node: IMutableTreeNode<T> = this.root, listIndex: number = 0, visible = true): { parentNode: IMutableTreeNode<T>; listIndex: number; visible: boolean; } {
+		const [index, ...rest] = location;
+
+		if (index < 0 || index > node.children.length) {
+			throw new Error('Invalid tree location');
+		}
+
+		// TODO@joao perf!
+		for (let i = 0; i < index; i++) {
+			listIndex += node.children[i].visibleCount;
+		}
+
+		visible = visible && !node.collapsed;
+
+		if (rest.length === 0) {
+			return { parentNode: node, listIndex, visible };
+		}
+
+		return this.findParentNode(rest, node.children[index], listIndex + 1, visible);
+	}
+}
\ No newline at end of file
diff --git a/src/vs/base/common/arrays.ts b/src/vs/base/common/arrays.ts
index 8053f635f15..0a8cd0b2eb0 100644
--- a/src/vs/base/common/arrays.ts
+++ b/src/vs/base/common/arrays.ts
@@ -77,48 +77,56 @@ export function findFirstInSorted<T>(array: T[], p: (x: T) => boolean): number {
 	return low;
 }
 
+type Compare<T> = (a: T, b: T) => number;
+
 /**
  * Like `Array#sort` but always stable. Usually runs a little slower `than Array#sort`
  * so only use this when actually needing stable sort.
  */
-export function mergeSort<T>(data: T[], compare: (a: T, b: T) => number): T[] {
-	_divideAndMerge(data, compare);
+export function mergeSort<T>(data: T[], compare: Compare<T>): T[] {
+	_sort(data, compare, 0, data.length - 1, []);
 	return data;
 }
 
-function _divideAndMerge<T>(data: T[], compare: (a: T, b: T) => number): void {
-	if (data.length <= 1) {
-		// sorted
-		return;
+function _merge<T>(a: T[], compare: Compare<T>, lo: number, mid: number, hi: number, aux: T[]): void {
+	let leftIdx = lo, rightIdx = mid + 1;
+	for (let i = lo; i <= hi; i++) {
+		aux[i] = a[i];
 	}
-	const p = (data.length / 2) | 0;
-	const left = data.slice(0, p);
-	const right = data.slice(p);
-
-	_divideAndMerge(left, compare);
-	_divideAndMerge(right, compare);
-
-	let leftIdx = 0;
-	let rightIdx = 0;
-	let i = 0;
-	while (leftIdx < left.length && rightIdx < right.length) {
-		let ret = compare(left[leftIdx], right[rightIdx]);
-		if (ret <= 0) {
-			// smaller_equal -> take left to preserve order
-			data[i++] = left[leftIdx++];
+	for (let i = lo; i <= hi; i++) {
+		if (leftIdx > mid) {
+			// left side consumed
+			a[i] = aux[rightIdx++];
+		} else if (rightIdx > hi) {
+			// right side consumed
+			a[i] = aux[leftIdx++];
+		} else if (compare(aux[rightIdx], aux[leftIdx]) < 0) {
+			// right element is less -> comes first
+			a[i] = aux[rightIdx++];
 		} else {
-			// greater -> take right
-			data[i++] = right[rightIdx++];
+			// left element comes first (less or equal)
+			a[i] = aux[leftIdx++];
 		}
 	}
-	while (leftIdx < left.length) {
-		data[i++] = left[leftIdx++];
-	}
-	while (rightIdx < right.length) {
-		data[i++] = right[rightIdx++];
-	}
 }
 
+function _sort<T>(a: T[], compare: Compare<T>, lo: number, hi: number, aux: T[]) {
+	if (hi <= lo) {
+		return;
+	}
+	let mid = lo + ((hi - lo) / 2) | 0;
+	_sort(a, compare, lo, mid, aux);
+	_sort(a, compare, mid + 1, hi, aux);
+	if (compare(a[mid], a[mid + 1]) <= 0) {
+		// left and right are sorted and if the last-left element is less
+		// or equals than the first-right element there is nothing else
+		// to do
+		return;
+	}
+	_merge(a, compare, lo, mid, hi, aux);
+}
+
+
 export function groupBy<T>(data: T[], compare: (a: T, b: T) => number): T[][] {
 	const result: T[][] = [];
 	let currentGroup: T[];
diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts
index 233a4fccb09..4c06af4e2f5 100644
--- a/src/vs/base/common/async.ts
+++ b/src/vs/base/common/async.ts
@@ -32,6 +32,40 @@ export function toWinJsPromise<T>(arg: Thenable<T> | TPromise<T>): TPromise<T> {
 	return new TPromise((resolve, reject) => arg.then(resolve, reject));
 }
 
+export interface CancelablePromise<T> extends Promise<T> {
+	cancel(): void;
+}
+
+export function createCancelablePromise<T>(callback: (token: CancellationToken) => Thenable<T>): CancelablePromise<T> {
+	const source = new CancellationTokenSource();
+
+	const thenable = callback(source.token);
+	const promise = new Promise<T>((resolve, reject) => {
+		source.token.onCancellationRequested(() => {
+			reject(errors.canceled());
+		});
+		Promise.resolve(thenable).then(value => {
+			source.dispose();
+			resolve(value);
+		}, err => {
+			source.dispose();
+			reject(err);
+		});
+	});
+
+	return new class implements CancelablePromise<T> {
+		cancel() {
+			source.cancel();
+		}
+		then<TResult1 = T, TResult2 = never>(resolve?: ((value: T) => TResult1 | Thenable<TResult1>) | undefined | null, reject?: ((reason: any) => TResult2 | Thenable<TResult2>) | undefined | null): Promise<TResult1 | TResult2> {
+			return promise.then(resolve, reject);
+		}
+		catch<TResult = never>(reject?: ((reason: any) => TResult | Thenable<TResult>) | undefined | null): Promise<T | TResult> {
+			return this.then(undefined, reject);
+		}
+	};
+}
+
 export function asWinJsPromise<T>(callback: (token: CancellationToken) => T | TPromise<T> | Thenable<T>): TPromise<T> {
 	let source = new CancellationTokenSource();
 	return new TPromise<T>((resolve, reject, progress) => {
@@ -61,10 +95,6 @@ export function asWinJsPromise<T>(callback: (token: CancellationToken) => T | TP
 	});
 }
 
-export function asWinJSImport<T>(importPromise: Thenable<T>): TPromise<T> {
-	return toWinJsPromise(importPromise); // workaround for https://github.com/Microsoft/vscode/issues/48205
-}
-
 /**
  * Hook a cancellation token to a WinJS Promise
  */
@@ -322,7 +352,7 @@ export class Barrier {
 
 	constructor() {
 		this._isOpen = false;
-		this._promise = new TPromise<boolean>((c, e, p) => {
+		this._promise = new TPromise<boolean>((c, e) => {
 			this._completePromise = c;
 		}, () => {
 			console.warn('You should really not try to cancel this ready promise!');
@@ -368,8 +398,16 @@ export class ShallowCancelThenPromise<T> extends TPromise<T> {
 /**
  * Replacement for `WinJS.TPromise.timeout`.
  */
-export function timeout(n: number): Thenable<void> {
-	return new TPromise(resolve => setTimeout(resolve, n));
+export function timeout(n: number): CancelablePromise<void> {
+	return createCancelablePromise(token => {
+		return new Promise((resolve, reject) => {
+			const handle = setTimeout(resolve, n);
+			token.onCancellationRequested(_ => {
+				clearTimeout(handle);
+				reject(errors.canceled());
+			});
+		});
+	});
 }
 
 function isWinJSPromise(candidate: any): candidate is TPromise {
@@ -446,13 +484,35 @@ export function sequence<T>(promiseFactories: ITask<Thenable<T>>[]): TPromise<T[
 	return TPromise.as(null).then(thenHandler);
 }
 
-export function first<T>(promiseFactories: ITask<TPromise<T>>[], shouldStop: (t: T) => boolean = t => !!t): TPromise<T> {
+export function first2<T>(promiseFactories: ITask<Promise<T>>[], shouldStop: (t: T) => boolean = t => !!t, defaultValue: T = null): Promise<T> {
+
+	let index = 0;
+	const len = promiseFactories.length;
+
+	const loop = () => {
+		if (index >= len) {
+			return Promise.resolve(defaultValue);
+		}
+		const factory = promiseFactories[index++];
+		const promise = factory();
+		return promise.then(result => {
+			if (shouldStop(result)) {
+				return Promise.resolve(result);
+			}
+			return loop();
+		});
+	};
+
+	return loop();
+}
+
+export function first<T>(promiseFactories: ITask<TPromise<T>>[], shouldStop: (t: T) => boolean = t => !!t, defaultValue: T = null): TPromise<T> {
 	let index = 0;
 	const len = promiseFactories.length;
 
 	const loop: () => TPromise<T> = () => {
 		if (index >= len) {
-			return TPromise.as(null);
+			return TPromise.as(defaultValue);
 		}
 
 		const factory = promiseFactories[index++];
diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts
index 198f69c641b..eb4c7cef1c1 100644
--- a/src/vs/base/common/event.ts
+++ b/src/vs/base/common/event.ts
@@ -6,7 +6,7 @@
 
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { once as onceFn } from 'vs/base/common/functional';
-import { combinedDisposable, empty as EmptyDisposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { combinedDisposable, Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { LinkedList } from 'vs/base/common/linkedList';
 import { TPromise } from 'vs/base/common/winjs.base';
 
@@ -167,7 +167,7 @@ export class AsyncEmitter<T extends IWaitUntil> extends Emitter<T> {
 
 	private _asyncDeliveryQueue: [Listener, T, Thenable<any>[]][];
 
-	async fireAsync(eventFn: (thenables: Thenable<any>[], listener: Function) => T): TPromise<void> {
+	async fireAsync(eventFn: (thenables: Thenable<any>[], listener: Function) => T): Promise<void> {
 		if (!this._listeners) {
 			return;
 		}
@@ -200,7 +200,7 @@ export class AsyncEmitter<T extends IWaitUntil> extends Emitter<T> {
 			// freeze thenables-collection to enforce sync-calls to
 			// wait until and then wait for all thenables to resolve
 			Object.freeze(thenables);
-			await TPromise.join(thenables);
+			await Promise.all(thenables);
 		}
 	}
 }
@@ -423,6 +423,8 @@ export function forEach<I>(event: Event<I>, each: (i: I) => void): Event<I> {
 	return (listener, thisArgs = null, disposables?) => event(i => { each(i); listener.call(thisArgs, i); }, null, disposables);
 }
 
+export function filterEvent<T>(event: Event<T>, filter: (e: T) => boolean): Event<T>;
+export function filterEvent<T, R>(event: Event<T | R>, filter: (e: T | R) => e is R): Event<R>;
 export function filterEvent<T>(event: Event<T>, filter: (e: T) => boolean): Event<T> {
 	return (listener, thisArgs = null, disposables?) => event(e => filter(e) && listener.call(thisArgs, e), null, disposables);
 }
@@ -559,7 +561,7 @@ export class Relay<T> implements IDisposable {
 	private emitter = new Emitter<T>();
 	readonly event: Event<T> = this.emitter.event;
 
-	private disposable: IDisposable = EmptyDisposable;
+	private disposable: IDisposable = Disposable.None;
 
 	set input(event: Event<T>) {
 		this.disposable.dispose();
diff --git a/src/vs/base/common/history.ts b/src/vs/base/common/history.ts
index b6546800a13..5bc83979f67 100644
--- a/src/vs/base/common/history.ts
+++ b/src/vs/base/common/history.ts
@@ -27,12 +27,6 @@ export class HistoryNavigator<T> implements INavigator<T> {
 		this._onChange();
 	}
 
-	public addIfNotPresent(t: T) {
-		if (!this._history.has(t)) {
-			this.add(t);
-		}
-	}
-
 	public next(): T {
 		return this._navigator.next();
 	}
@@ -57,6 +51,10 @@ export class HistoryNavigator<T> implements INavigator<T> {
 		return this._navigator.last();
 	}
 
+	public has(t: T): boolean {
+		return this._history.has(t);
+	}
+
 	public clear(): void {
 		this._initialize([]);
 		this._onChange();
diff --git a/src/vs/base/common/iterator.ts b/src/vs/base/common/iterator.ts
index 6d76ac1eafb..778819cadb8 100644
--- a/src/vs/base/common/iterator.ts
+++ b/src/vs/base/common/iterator.ts
@@ -7,11 +7,72 @@
 
 export interface IIteratorResult<T> {
 	readonly done: boolean;
-	readonly value: T;
+	readonly value: T | undefined;
 }
 
-export interface IIterator<E> {
-	next(): IIteratorResult<E>;
+export interface IIterator<T> {
+	next(): IIteratorResult<T>;
+}
+
+const _empty: IIterator<any> = {
+	next() {
+		return { done: true, value: undefined };
+	}
+};
+
+export function empty<T>(): IIterator<T> {
+	return _empty;
+}
+
+export function iter<T>(array: T[], index = 0, length = array.length): IIterator<T> {
+	return {
+		next(): IIteratorResult<T> {
+			if (index >= length) {
+				return { done: true, value: undefined };
+			}
+
+			return { done: false, value: array[index++] };
+		}
+	};
+}
+
+export function map<T, R>(iterator: IIterator<T>, fn: (t: T) => R): IIterator<R> {
+	return {
+		next() {
+			const { done, value } = iterator.next();
+			return { done, value: done ? undefined : fn(value) };
+		}
+	};
+}
+
+export function filter<T>(iterator: IIterator<T>, fn: (t: T) => boolean): IIterator<T> {
+	return {
+		next() {
+			while (true) {
+				const { done, value } = iterator.next();
+
+				if (done) {
+					return { done, value: undefined };
+				}
+
+				if (fn(value)) {
+					return { done, value };
+				}
+			}
+		}
+	};
+}
+
+export function forEach<T>(iterator: IIterator<T>, fn: (t: T) => void): void {
+	for (let next = iterator.next(); !next.done; next = iterator.next()) {
+		fn(next.value);
+	}
+}
+
+export function collect<T>(iterator: IIterator<T>): T[] {
+	const result: T[] = [];
+	forEach(iterator, value => result.push(value));
+	return result;
 }
 
 export interface INextIterator<T> {
diff --git a/src/vs/base/common/json.ts b/src/vs/base/common/json.ts
index ffa75f46095..98a6a6f68c9 100644
--- a/src/vs/base/common/json.ts
+++ b/src/vs/base/common/json.ts
@@ -407,6 +407,7 @@ export function createScanner(text: string, ignoreTrivia: boolean = false): JSON
 			case CharacterCodes.doubleQuote:
 			case CharacterCodes.colon:
 			case CharacterCodes.comma:
+			case CharacterCodes.slash:
 				return false;
 		}
 		return true;
@@ -628,7 +629,7 @@ export type JSONPath = Segment[];
 
 export interface ParseOptions {
 	disallowComments?: boolean;
-	allowTrailingComma?: boolean;
+	disallowTrailingComma?: boolean;
 }
 
 /**
@@ -817,7 +818,7 @@ export function visit(text: string, visitor: JSONVisitor, options?: ParseOptions
 		onError = toOneArgVisit(visitor.onError);
 
 	let disallowComments = options && options.disallowComments;
-	let allowTrailingComma = options && options.allowTrailingComma;
+	let disallowTrailingComma = options && options.disallowTrailingComma;
 	function scanNext(): SyntaxKind {
 		while (true) {
 			let token = _scanner.scan();
@@ -929,7 +930,7 @@ export function visit(text: string, visitor: JSONVisitor, options?: ParseOptions
 				}
 				onSeparator(',');
 				scanNext(); // consume comma
-				if (_scanner.getToken() === SyntaxKind.CloseBraceToken && allowTrailingComma) {
+				if (_scanner.getToken() === SyntaxKind.CloseBraceToken && !disallowTrailingComma) {
 					break;
 				}
 			} else if (needsComma) {
@@ -961,7 +962,7 @@ export function visit(text: string, visitor: JSONVisitor, options?: ParseOptions
 				}
 				onSeparator(',');
 				scanNext(); // consume comma
-				if (_scanner.getToken() === SyntaxKind.CloseBracketToken && allowTrailingComma) {
+				if (_scanner.getToken() === SyntaxKind.CloseBracketToken && !disallowTrailingComma) {
 					break;
 				}
 			} else if (needsComma) {
diff --git a/src/vs/base/common/lifecycle.ts b/src/vs/base/common/lifecycle.ts
index f16ede05fb0..f2a5cf2da1d 100644
--- a/src/vs/base/common/lifecycle.ts
+++ b/src/vs/base/common/lifecycle.ts
@@ -7,10 +7,6 @@
 
 import { once } from 'vs/base/common/functional';
 
-export const empty: IDisposable = Object.freeze<IDisposable>({
-	dispose() { }
-});
-
 export interface IDisposable {
 	dispose(): void;
 }
@@ -24,7 +20,6 @@ export function dispose<T extends IDisposable>(disposable: T): T;
 export function dispose<T extends IDisposable>(...disposables: T[]): T[];
 export function dispose<T extends IDisposable>(disposables: T[]): T[];
 export function dispose<T extends IDisposable>(first: T | T[], ...rest: T[]): T | T[] {
-
 	if (Array.isArray(first)) {
 		first.forEach(d => d && d.dispose());
 		return [];
@@ -45,23 +40,16 @@ export function combinedDisposable(disposables: IDisposable[]): IDisposable {
 	return { dispose: () => dispose(disposables) };
 }
 
-export function toDisposable(...fns: (() => void)[]): IDisposable {
-	return {
-		dispose() {
-			for (const fn of fns) {
-				fn();
-			}
-		}
-	};
+export function toDisposable(fn: () => void): IDisposable {
+	return { dispose() { fn(); } };
 }
 
 export abstract class Disposable implements IDisposable {
 
-	protected _toDispose: IDisposable[];
+	static None = Object.freeze<IDisposable>({ dispose() { } });
 
-	constructor() {
-		this._toDispose = [];
-	}
+	protected _toDispose: IDisposable[] = [];
+	protected get toDispose(): IDisposable[] { return this._toDispose; }
 
 	public dispose(): void {
 		this._toDispose = dispose(this._toDispose);
@@ -69,6 +57,7 @@ export abstract class Disposable implements IDisposable {
 
 	protected _register<T extends IDisposable>(t: T): T {
 		this._toDispose.push(t);
+
 		return t;
 	}
 }
diff --git a/src/vs/base/common/objects.ts b/src/vs/base/common/objects.ts
index 31769c963f1..513ac6c9240 100644
--- a/src/vs/base/common/objects.ts
+++ b/src/vs/base/common/objects.ts
@@ -225,6 +225,7 @@ export function getOrDefault<T, R>(obj: T, fn: (obj: T) => R, defaultValue: R =
 	return typeof result === 'undefined' ? defaultValue : result;
 }
 
+type obj = { [key: string]: any; };
 /**
  * Returns an object that has keys for each value that is different in the base object. Keys
  * that do not exist in the target but in the base object are not considered.
@@ -235,7 +236,6 @@ export function getOrDefault<T, R>(obj: T, fn: (obj: T) => R, defaultValue: R =
  * @param base the object to diff against
  * @param obj the object to use for diffing
  */
-export type obj = { [key: string]: any; };
 export function distinct(base: obj, target: obj): obj {
 	const result = Object.create(null);
 
diff --git a/src/vs/base/common/tree.ts b/src/vs/base/common/tree.ts
deleted file mode 100644
index 8133774b139..00000000000
--- a/src/vs/base/common/tree.ts
+++ /dev/null
@@ -1,57 +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 { clamp } from './numbers';
-
-export interface ITreeNode<T> {
-	readonly element: T;
-	readonly children: ITreeNode<T>[];
-}
-
-function clone<T>(nodes: ITreeNode<T>[]): ITreeNode<T>[] {
-	return nodes.map(({ element, children }) => ({ element, children: clone(children) }));
-}
-
-export class Tree<T> {
-
-	private root: ITreeNode<T>[] = [];
-
-	splice(start: number[], deleteCount: number, nodes: ITreeNode<T>[] = []): ITreeNode<T>[] {
-		if (start.length === 0) {
-			throw new Error('invalid tree location');
-		}
-
-		const children = this.findChildren(start);
-		const index = start[start.length - 1];
-		return children.splice(index, deleteCount, ...clone(nodes));
-	}
-
-	getElement(location: number[]): T | undefined {
-		const node = this.findElement(location);
-		return node && node.element;
-	}
-
-	getNodes(): ITreeNode<T>[] {
-		return clone(this.root);
-	}
-
-	private findElement(location: number[]): ITreeNode<T> {
-		const children = this.findChildren(location);
-		const lastIndex = clamp(location[location.length - 1], 0, children.length);
-		return children[lastIndex];
-	}
-
-	private findChildren(location: number[], children: ITreeNode<T>[] = this.root): ITreeNode<T>[] {
-		if (location.length === 1) {
-			return children;
-		}
-
-		let [i, ...rest] = location;
-		i = clamp(i, 0, children.length);
-		return this.findChildren(rest, children[i].children);
-	}
-}
\ No newline at end of file
diff --git a/src/vs/base/common/winjs.base.d.ts b/src/vs/base/common/winjs.base.d.ts
index b176120a06b..f5b941a8873 100644
--- a/src/vs/base/common/winjs.base.d.ts
+++ b/src/vs/base/common/winjs.base.d.ts
@@ -39,7 +39,6 @@ export declare class Promise<T = any, TProgress = any> {
 
 	public static join<T1, T2>(promises: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<[T1, T2]>;
 	public static join<T>(promises: (T | PromiseLike<T>)[]): Promise<T[]>;
-	public static join<T>(promises: { [n: string]: T | PromiseLike<T> }): Promise<{ [n: string]: T }>;
 
 	public static any<T>(promises: (T | PromiseLike<T>)[]): Promise<{ key: string; value: Promise<T>; }>;
 
diff --git a/src/vs/base/common/winjs.base.js b/src/vs/base/common/winjs.base.js
index 49debfc7045..d8de83ddd3e 100644
--- a/src/vs/base/common/winjs.base.js
+++ b/src/vs/base/common/winjs.base.js
@@ -1038,6 +1038,12 @@ _winjs("WinJS/Promise/_StateMachine", ["WinJS/Core/_Global","WinJS/Core/_BaseCor
             /// error function.
             /// </returns>
             /// </signature>
+            // BEGIN monaco change
+            if (this.then !== Promise_then) {
+                this.then(onComplete, onError, onProgress);
+                return;
+            }
+            // END monaco change
             return this._state.then(this, onComplete, onError, onProgress);
         },
 
diff --git a/src/vs/base/common/worker/simpleWorker.ts b/src/vs/base/common/worker/simpleWorker.ts
index ceaaa0ff541..8b0862a816d 100644
--- a/src/vs/base/common/worker/simpleWorker.ts
+++ b/src/vs/base/common/worker/simpleWorker.ts
@@ -91,7 +91,7 @@ class SimpleWorkerProtocol {
 			c: null,
 			e: null
 		};
-		let result = new TPromise<any>((c, e, p) => {
+		let result = new TPromise<any>((c, e) => {
 			reply.c = c;
 			reply.e = e;
 		}, () => {
@@ -232,7 +232,7 @@ export class SimpleWorkerClient<T> extends Disposable {
 			loaderConfiguration = (<any>self).requirejs.s.contexts._.config;
 		}
 
-		this._lazyProxy = new TPromise<T>((c, e, p) => {
+		this._lazyProxy = new TPromise<T>((c, e) => {
 			lazyProxyFulfill = c;
 			lazyProxyReject = e;
 		}, () => { /* no cancel */ });
@@ -273,7 +273,7 @@ export class SimpleWorkerClient<T> extends Disposable {
 	}
 
 	private _request(method: string, args: any[]): TPromise<any> {
-		return new TPromise<any>((c, e, p) => {
+		return new TPromise<any>((c, e) => {
 			this._onModuleLoaded.then(() => {
 				this._protocol.sendMessage(method, args).then(c, e);
 			}, e);
@@ -363,7 +363,7 @@ export class SimpleWorkerServer {
 
 		let cc: ValueCallback;
 		let ee: ErrorCallback;
-		let r = new TPromise<any>((c, e, p) => {
+		let r = new TPromise<any>((c, e) => {
 			cc = c;
 			ee = e;
 		});
diff --git a/src/vs/base/node/encoding.ts b/src/vs/base/node/encoding.ts
index 9913c16ff88..2c68f89b6ba 100644
--- a/src/vs/base/node/encoding.ts
+++ b/src/vs/base/node/encoding.ts
@@ -11,7 +11,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { isLinux, isMacintosh } from 'vs/base/common/platform';
 import { exec } from 'child_process';
 import { Readable, Writable, WritableOptions } from 'stream';
-import { asWinJSImport } from 'vs/base/common/async';
+import { toWinJsPromise } from 'vs/base/common/async';
 
 export const UTF8 = 'utf8';
 export const UTF8_with_bom = 'utf8bom';
@@ -194,7 +194,7 @@ const IGNORE_ENCODINGS = ['ascii', 'utf-8', 'utf-16', 'utf-32'];
  * Guesses the encoding from buffer.
  */
 export function guessEncodingByBuffer(buffer: NodeBuffer): TPromise<string> {
-	return asWinJSImport(import('jschardet')).then(jschardet => {
+	return toWinJsPromise(import('jschardet')).then(jschardet => {
 		jschardet.Constants.MINIMUM_THRESHOLD = MINIMUM_THRESHOLD;
 
 		const guessed = jschardet.detect(buffer);
diff --git a/src/vs/base/node/processes.ts b/src/vs/base/node/processes.ts
index ea32b4dce2f..eb01c197f74 100644
--- a/src/vs/base/node/processes.ts
+++ b/src/vs/base/node/processes.ts
@@ -234,7 +234,7 @@ export abstract class AbstractProcess<TProgressData> {
 					if (this.cmd) {
 						childProcess = cp.spawn(this.cmd, this.args, this.options);
 					} else if (this.module) {
-						this.childProcessPromise = new TPromise<cp.ChildProcess>((c, e, p) => {
+						this.childProcessPromise = new TPromise<cp.ChildProcess>((c, e) => {
 							fork(this.module, this.args, <ForkOptions>this.options, (error: any, childProcess: cp.ChildProcess) => {
 								if (error) {
 									e(error);
@@ -323,7 +323,7 @@ export abstract class AbstractProcess<TProgressData> {
 	}
 
 	private useExec(): TPromise<boolean> {
-		return new TPromise<boolean>((c, e, p) => {
+		return new TPromise<boolean>((c, e) => {
 			if (!this.shell || !Platform.isWindows) {
 				c(false);
 			}
diff --git a/src/vs/base/node/proxy.ts b/src/vs/base/node/proxy.ts
index 5629b9032e7..d3d525ce0d0 100644
--- a/src/vs/base/node/proxy.ts
+++ b/src/vs/base/node/proxy.ts
@@ -8,8 +8,6 @@
 import { Url, parse as parseUrl } from 'url';
 import { isBoolean } from 'vs/base/common/types';
 import { Agent } from './request';
-import { TPromise } from 'vs/base/common/winjs.base';
-
 
 function getSystemProxyURI(requestURL: Url): string {
 	if (requestURL.protocol === 'http:') {
@@ -26,7 +24,7 @@ export interface IOptions {
 	strictSSL?: boolean;
 }
 
-export async function getProxyAgent(rawRequestURL: string, options: IOptions = {}): TPromise<Agent> {
+export async function getProxyAgent(rawRequestURL: string, options: IOptions = {}): Promise<Agent> {
 	const requestURL = parseUrl(rawRequestURL);
 	const proxyURL = options.proxyUrl || getSystemProxyURI(requestURL);
 
diff --git a/src/vs/base/node/ps.ts b/src/vs/base/node/ps.ts
index f0410cc42d4..a7d2d36d0ca 100644
--- a/src/vs/base/node/ps.ts
+++ b/src/vs/base/node/ps.ts
@@ -206,7 +206,8 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {
 
 						// The cpu usage value reported on Linux is the average over the process lifetime,
 						// recalculate the usage over a one second interval
-						let cmd = URI.parse(require.toUrl('vs/base/node/cpuUsage.sh')).fsPath;
+						// JSON.stringify is needed to escape spaces, https://github.com/nodejs/node/issues/6803
+						let cmd = JSON.stringify(URI.parse(require.toUrl('vs/base/node/cpuUsage.sh')).fsPath);
 						cmd += ' ' + pids.join(' ');
 
 						exec(cmd, {}, (err, stdout, stderr) => {
diff --git a/src/vs/base/node/request.ts b/src/vs/base/node/request.ts
index 79a067db70e..35506f37331 100644
--- a/src/vs/base/node/request.ts
+++ b/src/vs/base/node/request.ts
@@ -49,7 +49,7 @@ export interface IRequestFunction {
 	(options: IRequestOptions): TPromise<IRequestContext>;
 }
 
-async function getNodeRequest(options: IRequestOptions): TPromise<IRawRequestFunction> {
+async function getNodeRequest(options: IRequestOptions): Promise<IRawRequestFunction> {
 	const endpoint = parseUrl(options.url);
 	const module = endpoint.protocol === 'https:' ? await import('https') : await import('http');
 	return module.request;
@@ -60,7 +60,7 @@ export function request(options: IRequestOptions): TPromise<IRequestContext> {
 
 	const rawRequestPromise = options.getRawRequest
 		? TPromise.as(options.getRawRequest(options))
-		: getNodeRequest(options);
+		: TPromise.wrap(getNodeRequest(options));
 
 	return rawRequestPromise.then(rawRequest => {
 
diff --git a/src/vs/base/node/zip.ts b/src/vs/base/node/zip.ts
index bb3c6daf9d1..652fb21c73b 100644
--- a/src/vs/base/node/zip.ts
+++ b/src/vs/base/node/zip.ts
@@ -114,7 +114,6 @@ function extractZip(zipfile: ZipFile, targetPath: string, options: IOptions, log
 		}, e));
 		zipfile.readEntry();
 		zipfile.on('entry', (entry: Entry) => {
-			logService.debug(targetPath, 'Found', entry.fileName);
 
 			if (isCanceled) {
 				return;
diff --git a/src/vs/base/parts/ipc/common/ipc.ts b/src/vs/base/parts/ipc/common/ipc.ts
index a3985361b63..ed35efadee0 100644
--- a/src/vs/base/parts/ipc/common/ipc.ts
+++ b/src/vs/base/parts/ipc/common/ipc.ts
@@ -6,17 +6,21 @@
 'use strict';
 
 import { Promise, TPromise } from 'vs/base/common/winjs.base';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { Event, Emitter, once, filterEvent } from 'vs/base/common/event';
+import { IDisposable, toDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Event, Emitter, once, filterEvent, toPromise, Relay } from 'vs/base/common/event';
 
 enum MessageType {
-	RequestCommon,
-	RequestCancel,
+	RequestPromise,
+	RequestPromiseCancel,
 	ResponseInitialize,
-	ResponseSuccess,
-	ResponseProgress,
-	ResponseError,
-	ResponseErrorObj
+	ResponsePromiseSuccess,
+	ResponsePromiseProgress,
+	ResponsePromiseError,
+	ResponsePromiseErrorObj,
+
+	RequestEventListen,
+	RequestEventDispose,
+	ResponseEventFire,
 }
 
 function isResponse(messageType: MessageType): boolean {
@@ -36,7 +40,6 @@ interface IRawRequest extends IRawMessage {
 
 interface IRequest {
 	raw: IRawRequest;
-	emitter?: Emitter<any>;
 	flush?: () => void;
 }
 
@@ -65,7 +68,8 @@ enum State {
  * with at most one single return value.
  */
 export interface IChannel {
-	call(command: string, arg?: any): TPromise<any>;
+	call<T>(command: string, arg?: any): TPromise<T>;
+	listen<T>(event: string, arg?: any): Event<T>;
 }
 
 /**
@@ -90,7 +94,8 @@ export interface IChannelClient {
  * channels (each from a separate client) to pick from.
  */
 export interface IClientRouter {
-	route(command: string, arg: any): string;
+	routeCall(command: string, arg: any): string;
+	routeEvent(event: string, arg: any): string;
 }
 
 /**
@@ -104,6 +109,8 @@ export interface IRoutingChannelClient {
 	getChannel<T extends IChannel>(channelName: string, router: IClientRouter): T;
 }
 
+// TODO@joao cleanup this mess!
+
 export class ChannelServer implements IChannelServer, IDisposable {
 
 	private channels: { [name: string]: IChannel } = Object.create(null);
@@ -121,17 +128,22 @@ export class ChannelServer implements IChannelServer, IDisposable {
 
 	private onMessage(request: IRawRequest): void {
 		switch (request.type) {
-			case MessageType.RequestCommon:
-				this.onCommonRequest(request);
+			case MessageType.RequestPromise:
+				this.onPromise(request);
 				break;
 
-			case MessageType.RequestCancel:
-				this.onCancelRequest(request);
+			case MessageType.RequestEventListen:
+				this.onEventListen(request);
+				break;
+
+			case MessageType.RequestPromiseCancel:
+			case MessageType.RequestEventDispose:
+				this.disposeActiveRequest(request);
 				break;
 		}
 	}
 
-	private onCommonRequest(request: IRawRequest): void {
+	private onPromise(request: IRawRequest): void {
 		const channel = this.channels[request.channelName];
 		let promise: Promise;
 
@@ -144,7 +156,7 @@ export class ChannelServer implements IChannelServer, IDisposable {
 		const id = request.id;
 
 		const requestPromise = promise.then(data => {
-			this.protocol.send(<IRawResponse>{ id, data, type: MessageType.ResponseSuccess });
+			this.protocol.send(<IRawResponse>{ id, data, type: MessageType.ResponsePromiseSuccess });
 			delete this.activeRequests[request.id];
 		}, data => {
 			if (data instanceof Error) {
@@ -153,21 +165,31 @@ export class ChannelServer implements IChannelServer, IDisposable {
 						message: data.message,
 						name: data.name,
 						stack: data.stack ? (data.stack.split ? data.stack.split('\n') : data.stack) : void 0
-					}, type: MessageType.ResponseError
+					}, type: MessageType.ResponsePromiseError
 				});
 			} else {
-				this.protocol.send(<IRawResponse>{ id, data, type: MessageType.ResponseErrorObj });
+				this.protocol.send(<IRawResponse>{ id, data, type: MessageType.ResponsePromiseErrorObj });
 			}
 
 			delete this.activeRequests[request.id];
 		}, data => {
-			this.protocol.send(<IRawResponse>{ id, data, type: MessageType.ResponseProgress });
+			this.protocol.send(<IRawResponse>{ id, data, type: MessageType.ResponsePromiseProgress });
 		});
 
 		this.activeRequests[request.id] = toDisposable(() => requestPromise.cancel());
 	}
 
-	private onCancelRequest(request: IRawRequest): void {
+	private onEventListen(request: IRawRequest): void {
+		const channel = this.channels[request.channelName];
+
+		const id = request.id;
+		const event = channel.listen(request.name, request.arg);
+		const disposable = event(data => this.protocol.send(<IRawResponse>{ id, data, type: MessageType.ResponseEventFire }));
+
+		this.activeRequests[request.id] = disposable;
+	}
+
+	private disposeActiveRequest(request: IRawRequest): void {
 		const disposable = this.activeRequests[request.id];
 
 		if (disposable) {
@@ -190,63 +212,85 @@ export class ChannelServer implements IChannelServer, IDisposable {
 
 export class ChannelClient implements IChannelClient, IDisposable {
 
-	private state: State;
-	private activeRequests: Promise[];
-	private bufferedRequests: IRequest[];
-	private handlers: { [id: number]: IHandler; };
-	private lastRequestId: number;
+	private state: State = State.Uninitialized;
+	private activeRequests: IDisposable[] = [];
+	private bufferedRequests: IRequest[] = [];
+	private handlers: { [id: number]: IHandler; } = Object.create(null);
+	private lastRequestId: number = 0;
 	private protocolListener: IDisposable;
 
+	private _onDidInitialize = new Emitter<void>();
+	readonly onDidInitialize = this._onDidInitialize.event;
+
 	constructor(private protocol: IMessagePassingProtocol) {
-		this.state = State.Uninitialized;
-		this.activeRequests = [];
-		this.bufferedRequests = [];
-		this.handlers = Object.create(null);
-		this.lastRequestId = 0;
 		this.protocolListener = this.protocol.onMessage(r => this.onMessage(r));
 	}
 
 	getChannel<T extends IChannel>(channelName: string): T {
-		const call = (command: string, arg: any) => this.request(channelName, command, arg);
-		return { call } as T;
+		const call = (command: string, arg: any) => this.requestPromise(channelName, command, arg);
+		const listen = (event: string, arg: any) => this.requestEvent(channelName, event, arg);
+
+		return { call, listen } as T;
 	}
 
-	private request(channelName: string, name: string, arg: any): Promise {
-		const request = {
-			raw: {
-				id: this.lastRequestId++,
-				type: MessageType.RequestCommon,
-				channelName,
-				name,
-				arg
-			}
-		};
+	private requestPromise(channelName: string, name: string, arg: any): TPromise<any> {
+		const id = this.lastRequestId++;
+		const type = MessageType.RequestPromise;
+		const request = { raw: { id, type, channelName, name, arg } };
 
 		const activeRequest = this.state === State.Uninitialized
 			? this.bufferRequest(request)
 			: this.doRequest(request);
 
-		this.activeRequests.push(activeRequest);
+		const disposable = toDisposable(() => activeRequest.cancel());
+		this.activeRequests.push(disposable);
 
 		activeRequest
 			.then(null, _ => null)
-			.done(() => this.activeRequests = this.activeRequests.filter(i => i !== activeRequest));
+			.done(() => this.activeRequests = this.activeRequests.filter(el => el !== disposable));
 
 		return activeRequest;
 	}
 
+	private requestEvent(channelName: string, name: string, arg: any): Event<any> {
+		const id = this.lastRequestId++;
+		const type = MessageType.RequestEventListen;
+		const request = { raw: { id, type, channelName, name, arg } };
+
+		let uninitializedPromise: TPromise<any> | null = null;
+		const emitter = new Emitter<any>({
+			onFirstListenerAdd: () => {
+				uninitializedPromise = this.whenInitialized().then(() => {
+					uninitializedPromise = null;
+					this.send(request.raw);
+				});
+			},
+			onLastListenerRemove: () => {
+				if (uninitializedPromise) {
+					uninitializedPromise.cancel();
+					uninitializedPromise = null;
+				} else {
+					this.send({ id, type: MessageType.RequestEventDispose });
+				}
+			}
+		});
+
+		this.handlers[id] = response => emitter.fire(response.data);
+		return emitter.event;
+	}
+
 	private doRequest(request: IRequest): Promise {
 		const id = request.raw.id;
 
 		return new TPromise((c, e, p) => {
 			this.handlers[id] = response => {
 				switch (response.type) {
-					case MessageType.ResponseSuccess:
+					case MessageType.ResponsePromiseSuccess:
 						delete this.handlers[id];
 						c(response.data);
 						break;
 
-					case MessageType.ResponseError:
+					case MessageType.ResponsePromiseError:
 						delete this.handlers[id];
 						const error = new Error(response.data.message);
 						(<any>error).stack = response.data.stack;
@@ -254,12 +298,12 @@ export class ChannelClient implements IChannelClient, IDisposable {
 						e(error);
 						break;
 
-					case MessageType.ResponseErrorObj:
+					case MessageType.ResponsePromiseErrorObj:
 						delete this.handlers[id];
 						e(response.data);
 						break;
 
-					case MessageType.ResponseProgress:
+					case MessageType.ResponsePromiseProgress:
 						p(response.data);
 						break;
 				}
@@ -267,7 +311,7 @@ export class ChannelClient implements IChannelClient, IDisposable {
 
 			this.send(request.raw);
 		},
-			() => this.send({ id, type: MessageType.RequestCancel }));
+			() => this.send({ id, type: MessageType.RequestPromiseCancel }));
 	}
 
 	private bufferRequest(request: IRequest): Promise {
@@ -309,6 +353,7 @@ export class ChannelClient implements IChannelClient, IDisposable {
 
 		if (this.state === State.Uninitialized && response.type === MessageType.ResponseInitialize) {
 			this.state = State.Idle;
+			this._onDidInitialize.fire();
 			this.bufferedRequests.forEach(r => r.flush && r.flush());
 			this.bufferedRequests = null;
 			return;
@@ -328,12 +373,19 @@ export class ChannelClient implements IChannelClient, IDisposable {
 		}
 	}
 
+	private whenInitialized(): TPromise<void> {
+		if (this.state === State.Idle) {
+			return TPromise.as(null);
+		} else {
+			return toPromise(this.onDidInitialize);
+		}
+	}
+
 	dispose(): void {
 		this.protocolListener.dispose();
 		this.protocolListener = null;
 
-		this.activeRequests.forEach(r => r.cancel());
-		this.activeRequests = [];
+		this.activeRequests = dispose(this.activeRequests);
 	}
 }
 
@@ -381,16 +433,28 @@ export class IPCServer implements IChannelServer, IRoutingChannelClient, IDispos
 
 	getChannel<T extends IChannel>(channelName: string, router: IClientRouter): T {
 		const call = (command: string, arg: any) => {
-			const id = router.route(command, arg);
+			const id = router.routeCall(command, arg);
 
 			if (!id) {
 				return TPromise.wrapError(new Error('Client id should be provided'));
 			}
 
-			return this.getClient(id).then(client => client.getChannel(channelName).call(command, arg));
+			return getDelayedChannel(this.getClient(id).then(client => client.getChannel(channelName)))
+				.call(command, arg);
 		};
 
-		return { call } as T;
+		const listen = (event: string, arg: any) => {
+			const id = router.routeEvent(event, arg);
+
+			if (!id) {
+				return TPromise.wrapError(new Error('Client id should be provided'));
+			}
+
+			return getDelayedChannel(this.getClient(id).then(client => client.getChannel(channelName)))
+				.listen(event, arg);
+		};
+
+		return { call, listen } as T;
 	}
 
 	registerChannel(channelName: string, channel: IChannel): void {
@@ -453,7 +517,13 @@ export class IPCClient implements IChannelClient, IChannelServer, IDisposable {
 
 export function getDelayedChannel<T extends IChannel>(promise: TPromise<T>): T {
 	const call = (command: string, arg: any) => promise.then(c => c.call(command, arg));
-	return { call } as T;
+	const listen = (event: string, arg: any) => {
+		const relay = new Relay<any>();
+		promise.then(c => relay.input = c.listen(event, arg));
+		return relay.event;
+	};
+
+	return { call, listen } as T;
 }
 
 export function getNextTickChannel<T extends IChannel>(channel: T): T {
@@ -469,34 +539,19 @@ export function getNextTickChannel<T extends IChannel>(channel: T): T {
 			.then(() => channel.call(command, arg));
 	};
 
-	return { call } as T;
-}
-
-export type Serializer<T, R> = (obj: T) => R;
-export type Deserializer<T, R> = (raw: R) => T;
-
-export function eventToCall<T>(event: Event<T>, serializer: Serializer<T, any> = t => t): TPromise<void> {
-	let disposable: IDisposable;
-
-	return new TPromise(
-		(c, e, p) => disposable = event(t => p(serializer(t))),
-		() => disposable.dispose()
-	);
-}
-
-export function eventFromCall<T>(channel: IChannel, name: string, arg: any = null, deserializer: Deserializer<T, any> = t => t): Event<T> {
-	let promise: Promise;
-
-	const emitter = new Emitter<any>({
-		onFirstListenerAdd: () => {
-			promise = channel.call(name, arg)
-				.then(null, err => null, e => emitter.fire(deserializer(e)));
-		},
-		onLastListenerRemove: () => {
-			promise.cancel();
-			promise = null;
+	const listen = (event: string, arg: any): Event<any> => {
+		if (didTick) {
+			return channel.listen(event, arg);
 		}
-	});
 
-	return emitter.event;
+		const relay = new Relay();
+
+		TPromise.timeout(0)
+			.then(() => didTick = true)
+			.then(() => relay.input = channel.listen(event, arg));
+
+		return relay.event;
+	};
+
+	return { call, listen } as T;
 }
diff --git a/src/vs/base/parts/ipc/node/ipc.cp.ts b/src/vs/base/parts/ipc/node/ipc.cp.ts
index 40d8fb8ff6b..38a8a96f813 100644
--- a/src/vs/base/parts/ipc/node/ipc.cp.ts
+++ b/src/vs/base/parts/ipc/node/ipc.cp.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ChildProcess, fork, ForkOptions } from 'child_process';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, toDisposable, dispose } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Delayer } from 'vs/base/common/async';
 import { deepClone, assign } from 'vs/base/common/objects';
-import { Emitter, fromNodeEventEmitter } from 'vs/base/common/event';
+import { Emitter, fromNodeEventEmitter, Event } from 'vs/base/common/event';
 import { createQueuedSender } from 'vs/base/node/processes';
 import { ChannelServer as IPCServer, ChannelClient as IPCClient, IChannelClient, IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { isRemoteConsoleLog, log } from 'vs/base/node/console';
@@ -74,11 +74,14 @@ export interface IIPCOptions {
 export class Client implements IChannelClient, IDisposable {
 
 	private disposeDelayer: Delayer<void>;
-	private activeRequests: TPromise<void>[];
+	private activeRequests: IDisposable[];
 	private child: ChildProcess;
 	private _client: IPCClient;
 	private channels: { [name: string]: IChannel };
 
+	private _onDidProcessExit = new Emitter<{ code: number, signal: string }>();
+	readonly onDidProcessExit = this._onDidProcessExit.event;
+
 	constructor(private modulePath: string, private options: IIPCOptions) {
 		const timeout = options && options.timeout ? options.timeout : 60000;
 		this.disposeDelayer = new Delayer<void>(timeout);
@@ -89,11 +92,12 @@ export class Client implements IChannelClient, IDisposable {
 	}
 
 	getChannel<T extends IChannel>(channelName: string): T {
-		const call = (command: string, arg: any) => this.request(channelName, command, arg);
-		return { call } as T;
+		const call = (command: string, arg: any) => this.requestPromise(channelName, command, arg);
+		const listen = (event: string, arg: any) => this.requestEvent(channelName, event, arg);
+		return { call, listen } as IChannel as T;
 	}
 
-	protected request(channelName: string, name: string, arg: any): TPromise<void> {
+	protected requestPromise(channelName: string, name: string, arg: any): TPromise<void> {
 		if (!this.disposeDelayer) {
 			return TPromise.wrapError(new Error('disposed'));
 		}
@@ -110,7 +114,7 @@ export class Client implements IChannelClient, IDisposable {
 					return;
 				}
 
-				this.activeRequests.splice(this.activeRequests.indexOf(result), 1);
+				this.activeRequests.splice(this.activeRequests.indexOf(disposable), 1);
 
 				if (this.activeRequests.length === 0) {
 					this.disposeDelayer.trigger(() => this.disposeClient());
@@ -118,10 +122,44 @@ export class Client implements IChannelClient, IDisposable {
 			});
 		}, () => request.cancel());
 
-		this.activeRequests.push(result);
+		const disposable = toDisposable(() => result.cancel());
+		this.activeRequests.push(disposable);
 		return result;
 	}
 
+	protected requestEvent<T>(channelName: string, name: string, arg: any): Event<T> {
+		if (!this.disposeDelayer) {
+			return Event.None;
+		}
+
+		this.disposeDelayer.cancel();
+
+		let listener: IDisposable;
+		const emitter = new Emitter<any>({
+			onFirstListenerAdd: () => {
+				const channel = this.channels[channelName] || (this.channels[channelName] = this.client.getChannel(channelName));
+				const event: Event<T> = channel.listen(name, arg);
+
+				listener = event(emitter.fire, emitter);
+				this.activeRequests.push(listener);
+
+			},
+			onLastListenerRemove: () => {
+				if (!this.activeRequests) {
+					return;
+				}
+
+				this.activeRequests.splice(this.activeRequests.indexOf(listener), 1);
+
+				if (this.activeRequests.length === 0) {
+					this.disposeDelayer.trigger(() => this.disposeClient());
+				}
+			}
+		});
+
+		return emitter.event;
+	}
+
 	private get client(): IPCClient {
 		if (!this._client) {
 			const args = this.options && this.options.args ? this.options.args : [];
@@ -178,8 +216,7 @@ export class Client implements IChannelClient, IDisposable {
 				process.removeListener('exit', onExit);
 
 				if (this.activeRequests) {
-					this.activeRequests.forEach(req => req.cancel());
-					this.activeRequests = [];
+					this.activeRequests = dispose(this.activeRequests);
 				}
 
 				if (code !== 0 && signal !== 'SIGTERM') {
@@ -187,6 +224,8 @@ export class Client implements IChannelClient, IDisposable {
 					this.disposeDelayer.cancel();
 					this.disposeClient();
 				}
+
+				this._onDidProcessExit.fire({ code, signal });
 			});
 		}
 
@@ -203,6 +242,7 @@ export class Client implements IChannelClient, IDisposable {
 	}
 
 	dispose() {
+		this._onDidProcessExit.dispose();
 		this.disposeDelayer.cancel();
 		this.disposeDelayer = null;
 		this.disposeClient();
diff --git a/src/vs/base/parts/ipc/test/node/ipc.test.ts b/src/vs/base/parts/ipc/test/node/ipc.test.ts
index bd9c57671ae..3091fce1d7f 100644
--- a/src/vs/base/parts/ipc/test/node/ipc.test.ts
+++ b/src/vs/base/parts/ipc/test/node/ipc.test.ts
@@ -24,10 +24,6 @@ suite('IPC', () => {
 	suite('child process', () => {
 
 		test('createChannel', () => {
-			if (process.env['VSCODE_PID']) {
-				return undefined; // this test fails when run from within VS Code
-			}
-
 			const client = createClient();
 			const channel = client.getChannel<ITestChannel>('test');
 			const service = new TestServiceClient(channel);
@@ -41,10 +37,6 @@ suite('IPC', () => {
 		});
 
 		test('cancellation', () => {
-			if (process.env['VSCODE_PID']) {
-				return undefined; // this test fails when run from within VS Code
-			}
-
 			const client = createClient();
 			const channel = client.getChannel<ITestChannel>('test');
 			const service = new TestServiceClient(channel);
@@ -61,10 +53,6 @@ suite('IPC', () => {
 		});
 
 		test('events', () => {
-			if (process.env['VSCODE_PID']) {
-				return undefined; // this test fails when run from within VS Code
-			}
-
 			const client = createClient();
 			const channel = client.getChannel<ITestChannel>('test');
 			const service = new TestServiceClient(channel);
@@ -87,10 +75,6 @@ suite('IPC', () => {
 		});
 
 		test('event dispose', () => {
-			if (process.env['VSCODE_PID']) {
-				return undefined; // this test fails when run from within VS Code
-			}
-
 			const client = createClient();
 			const channel = client.getChannel<ITestChannel>('test');
 			const service = new TestServiceClient(channel);
diff --git a/src/vs/base/parts/ipc/test/node/testService.ts b/src/vs/base/parts/ipc/test/node/testService.ts
index 453ea9c85e0..a53ff5ed37b 100644
--- a/src/vs/base/parts/ipc/test/node/testService.ts
+++ b/src/vs/base/parts/ipc/test/node/testService.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { TPromise, PPromise } from 'vs/base/common/winjs.base';
-import { IChannel, eventToCall, eventFromCall } from 'vs/base/parts/ipc/common/ipc';
+import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { Event, Emitter } from 'vs/base/common/event';
 
 export interface IMarcoPoloEvent {
@@ -68,6 +68,9 @@ export class TestService implements ITestService {
 }
 
 export interface ITestChannel extends IChannel {
+	listen<IMarcoPoloEvent>(event: 'marco'): Event<IMarcoPoloEvent>;
+	listen<T>(event: string, arg?: any): Event<T>;
+
 	call(command: 'marco'): TPromise<any>;
 	call(command: 'pong', ping: string): TPromise<any>;
 	call(command: 'cancelMe'): TPromise<any>;
@@ -79,12 +82,19 @@ export class TestChannel implements ITestChannel {
 
 	constructor(private testService: ITestService) { }
 
+	listen(event: string, arg?: any): Event<any> {
+		switch (event) {
+			case 'marco': return this.testService.onMarco;
+		}
+
+		throw new Error('Event not found');
+	}
+
 	call(command: string, ...args: any[]): TPromise<any> {
 		switch (command) {
 			case 'pong': return this.testService.pong(args[0]);
 			case 'cancelMe': return this.testService.cancelMe();
 			case 'marco': return this.testService.marco();
-			case 'event:marco': return eventToCall(this.testService.onMarco);
 			case 'batchPerf': return this.testService.batchPerf(args[0].batches, args[0].size, args[0].dataSize);
 			default: return TPromise.wrapError(new Error('command not found'));
 		}
@@ -93,12 +103,9 @@ export class TestChannel implements ITestChannel {
 
 export class TestServiceClient implements ITestService {
 
-	private _onMarco: Event<IMarcoPoloEvent>;
-	get onMarco(): Event<IMarcoPoloEvent> { return this._onMarco; }
+	get onMarco(): Event<IMarcoPoloEvent> { return this.channel.listen('marco'); }
 
-	constructor(private channel: ITestChannel) {
-		this._onMarco = eventFromCall<IMarcoPoloEvent>(channel, 'event:marco');
-	}
+	constructor(private channel: ITestChannel) { }
 
 	marco(): TPromise<string> {
 		return this.channel.call('marco');
diff --git a/src/vs/base/parts/quickopen/browser/quickOpenModel.ts b/src/vs/base/parts/quickopen/browser/quickOpenModel.ts
index db04c0b00dd..74828296605 100644
--- a/src/vs/base/parts/quickopen/browser/quickOpenModel.ts
+++ b/src/vs/base/parts/quickopen/browser/quickOpenModel.ts
@@ -37,15 +37,15 @@ let IDS = 0;
 
 export class QuickOpenItemAccessorClass implements IItemAccessor<QuickOpenEntry> {
 
-	public getItemLabel(entry: QuickOpenEntry): string {
+	getItemLabel(entry: QuickOpenEntry): string {
 		return entry.getLabel();
 	}
 
-	public getItemDescription(entry: QuickOpenEntry): string {
+	getItemDescription(entry: QuickOpenEntry): string {
 		return entry.getDescription();
 	}
 
-	public getItemPath(entry: QuickOpenEntry): string {
+	getItemPath(entry: QuickOpenEntry): string {
 		const resource = entry.getResource();
 
 		return resource ? resource.fsPath : void 0;
@@ -70,70 +70,70 @@ export class QuickOpenEntry {
 	/**
 	 * A unique identifier for the entry
 	 */
-	public getId(): string {
+	getId(): string {
 		return this.id;
 	}
 
 	/**
 	 * The label of the entry to identify it from others in the list
 	 */
-	public getLabel(): string {
+	getLabel(): string {
 		return null;
 	}
 
 	/**
 	 * The options for the label to use for this entry
 	 */
-	public getLabelOptions(): IIconLabelValueOptions {
+	getLabelOptions(): IIconLabelValueOptions {
 		return null;
 	}
 
 	/**
 	 * The label of the entry to use when a screen reader wants to read about the entry
 	 */
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return this.getLabel();
 	}
 
 	/**
 	 * Detail information about the entry that is optional and can be shown below the label
 	 */
-	public getDetail(): string {
+	getDetail(): string {
 		return null;
 	}
 
 	/**
 	 * The icon of the entry to identify it from others in the list
 	 */
-	public getIcon(): string {
+	getIcon(): string {
 		return null;
 	}
 
 	/**
 	 * A secondary description that is optional and can be shown right to the label
 	 */
-	public getDescription(): string {
+	getDescription(): string {
 		return null;
 	}
 
 	/**
 	 * A tooltip to show when hovering over the entry.
 	 */
-	public getTooltip(): string {
+	getTooltip(): string {
 		return null;
 	}
 
 	/**
 	 * A tooltip to show when hovering over the description portion of the entry.
 	 */
-	public getDescriptionTooltip(): string {
+	getDescriptionTooltip(): string {
 		return null;
 	}
 
 	/**
 	 * An optional keybinding to show for an entry.
 	 */
-	public getKeybinding(): ResolvedKeybinding {
+	getKeybinding(): ResolvedKeybinding {
 		return null;
 	}
 
@@ -141,28 +141,28 @@ export class QuickOpenEntry {
 	 * A resource for this entry. Resource URIs can be used to compare different kinds of entries and group
 	 * them together.
 	 */
-	public getResource(): URI {
+	getResource(): URI {
 		return null;
 	}
 
 	/**
 	 * Allows to reuse the same model while filtering. Hidden entries will not show up in the viewer.
 	 */
-	public isHidden(): boolean {
+	isHidden(): boolean {
 		return this.hidden;
 	}
 
 	/**
 	 * Allows to reuse the same model while filtering. Hidden entries will not show up in the viewer.
 	 */
-	public setHidden(hidden: boolean): void {
+	setHidden(hidden: boolean): void {
 		this.hidden = hidden;
 	}
 
 	/**
 	 * Allows to set highlight ranges that should show up for the entry label and optionally description if set.
 	 */
-	public setHighlights(labelHighlights: IHighlight[], descriptionHighlights?: IHighlight[], detailHighlights?: IHighlight[]): void {
+	setHighlights(labelHighlights: IHighlight[], descriptionHighlights?: IHighlight[], detailHighlights?: IHighlight[]): void {
 		this.labelHighlights = labelHighlights;
 		this.descriptionHighlights = descriptionHighlights;
 		this.detailHighlights = detailHighlights;
@@ -171,7 +171,7 @@ export class QuickOpenEntry {
 	/**
 	 * Allows to return highlight ranges that should show up for the entry label and description.
 	 */
-	public getHighlights(): [IHighlight[] /* Label */, IHighlight[] /* Description */, IHighlight[] /* Detail */] {
+	getHighlights(): [IHighlight[] /* Label */, IHighlight[] /* Description */, IHighlight[] /* Detail */] {
 		return [this.labelHighlights, this.descriptionHighlights, this.detailHighlights];
 	}
 
@@ -181,7 +181,7 @@ export class QuickOpenEntry {
 	 *
 	 * The context parameter provides additional context information how the run was triggered.
 	 */
-	public run(mode: Mode, context: IContext): boolean {
+	run(mode: Mode, context: IContext): boolean {
 		return false;
 	}
 
@@ -190,7 +190,7 @@ export class QuickOpenEntry {
 	 * and the resource of this entry is the same as the resource for an editor history, it will not show up
 	 * because it is considered to be a duplicate of an editor history.
 	 */
-	public mergeWithEditorHistory(): boolean {
+	mergeWithEditorHistory(): boolean {
 		return false;
 	}
 }
@@ -211,97 +211,97 @@ export class QuickOpenEntryGroup extends QuickOpenEntry {
 	/**
 	 * The label of the group or null if none.
 	 */
-	public getGroupLabel(): string {
+	getGroupLabel(): string {
 		return this.groupLabel;
 	}
 
-	public setGroupLabel(groupLabel: string): void {
+	setGroupLabel(groupLabel: string): void {
 		this.groupLabel = groupLabel;
 	}
 
 	/**
 	 * Whether to show a border on top of the group entry or not.
 	 */
-	public showBorder(): boolean {
+	showBorder(): boolean {
 		return this.withBorder;
 	}
 
-	public setShowBorder(showBorder: boolean): void {
+	setShowBorder(showBorder: boolean): void {
 		this.withBorder = showBorder;
 	}
 
-	public getLabel(): string {
+	getLabel(): string {
 		return this.entry ? this.entry.getLabel() : super.getLabel();
 	}
 
-	public getLabelOptions(): IIconLabelValueOptions {
+	getLabelOptions(): IIconLabelValueOptions {
 		return this.entry ? this.entry.getLabelOptions() : super.getLabelOptions();
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return this.entry ? this.entry.getAriaLabel() : super.getAriaLabel();
 	}
 
-	public getDetail(): string {
+	getDetail(): string {
 		return this.entry ? this.entry.getDetail() : super.getDetail();
 	}
 
-	public getResource(): URI {
+	getResource(): URI {
 		return this.entry ? this.entry.getResource() : super.getResource();
 	}
 
-	public getIcon(): string {
+	getIcon(): string {
 		return this.entry ? this.entry.getIcon() : super.getIcon();
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.entry ? this.entry.getDescription() : super.getDescription();
 	}
 
-	public getEntry(): QuickOpenEntry {
+	getEntry(): QuickOpenEntry {
 		return this.entry;
 	}
 
-	public getHighlights(): [IHighlight[], IHighlight[], IHighlight[]] {
+	getHighlights(): [IHighlight[], IHighlight[], IHighlight[]] {
 		return this.entry ? this.entry.getHighlights() : super.getHighlights();
 	}
 
-	public isHidden(): boolean {
+	isHidden(): boolean {
 		return this.entry ? this.entry.isHidden() : super.isHidden();
 	}
 
-	public setHighlights(labelHighlights: IHighlight[], descriptionHighlights?: IHighlight[], detailHighlights?: IHighlight[]): void {
+	setHighlights(labelHighlights: IHighlight[], descriptionHighlights?: IHighlight[], detailHighlights?: IHighlight[]): void {
 		this.entry ? this.entry.setHighlights(labelHighlights, descriptionHighlights, detailHighlights) : super.setHighlights(labelHighlights, descriptionHighlights, detailHighlights);
 	}
 
-	public setHidden(hidden: boolean): void {
+	setHidden(hidden: boolean): void {
 		this.entry ? this.entry.setHidden(hidden) : super.setHidden(hidden);
 	}
 
-	public run(mode: Mode, context: IContext): boolean {
+	run(mode: Mode, context: IContext): boolean {
 		return this.entry ? this.entry.run(mode, context) : super.run(mode, context);
 	}
 }
 
 class NoActionProvider implements IActionProvider {
 
-	public hasActions(tree: ITree, element: any): boolean {
+	hasActions(tree: ITree, element: any): boolean {
 		return false;
 	}
 
-	public getActions(tree: ITree, element: any): TPromise<IAction[]> {
+	getActions(tree: ITree, element: any): TPromise<IAction[]> {
 		return TPromise.as(null);
 	}
 
-	public hasSecondaryActions(tree: ITree, element: any): boolean {
+	hasSecondaryActions(tree: ITree, element: any): boolean {
 		return false;
 	}
 
-	public getSecondaryActions(tree: ITree, element: any): TPromise<IAction[]> {
+	getSecondaryActions(tree: ITree, element: any): TPromise<IAction[]> {
 		return TPromise.as(null);
 	}
 
-	public getActionItem(tree: ITree, element: any, action: Action): IActionItem {
+	getActionItem(tree: ITree, element: any, action: Action): IActionItem {
 		return null;
 	}
 }
@@ -333,7 +333,7 @@ class Renderer implements IRenderer<QuickOpenEntry> {
 		this.actionRunner = actionRunner;
 	}
 
-	public getHeight(entry: QuickOpenEntry): number {
+	getHeight(entry: QuickOpenEntry): number {
 		if (entry.getDetail()) {
 			return 44;
 		}
@@ -341,7 +341,7 @@ class Renderer implements IRenderer<QuickOpenEntry> {
 		return 22;
 	}
 
-	public getTemplateId(entry: QuickOpenEntry): string {
+	getTemplateId(entry: QuickOpenEntry): string {
 		if (entry instanceof QuickOpenEntryGroup) {
 			return templateEntryGroup;
 		}
@@ -349,7 +349,7 @@ class Renderer implements IRenderer<QuickOpenEntry> {
 		return templateEntry;
 	}
 
-	public renderTemplate(templateId: string, container: HTMLElement, styles: IQuickOpenStyles): IQuickOpenEntryGroupTemplateData {
+	renderTemplate(templateId: string, container: HTMLElement, styles: IQuickOpenStyles): IQuickOpenEntryGroupTemplateData {
 		const entryContainer = document.createElement('div');
 		DOM.addClass(entryContainer, 'sub-content');
 		container.appendChild(entryContainer);
@@ -410,7 +410,7 @@ class Renderer implements IRenderer<QuickOpenEntry> {
 		};
 	}
 
-	public renderElement(entry: QuickOpenEntry, templateId: string, data: IQuickOpenEntryGroupTemplateData, styles: IQuickOpenStyles): void {
+	renderElement(entry: QuickOpenEntry, templateId: string, data: IQuickOpenEntryGroupTemplateData, styles: IQuickOpenStyles): void {
 
 		// Action Bar
 		if (this.actionProvider.hasActions(null, entry)) {
@@ -480,7 +480,7 @@ class Renderer implements IRenderer<QuickOpenEntry> {
 		}
 	}
 
-	public disposeTemplate(templateId: string, templateData: IQuickOpenEntryGroupTemplateData): void {
+	disposeTemplate(templateId: string, templateData: IQuickOpenEntryGroupTemplateData): void {
 		const data = templateData as IQuickOpenEntryGroupTemplateData;
 		data.actionBar.dispose();
 		data.actionBar = null;
@@ -519,21 +519,21 @@ export class QuickOpenModel implements
 		this._accessibilityProvider = this;
 	}
 
-	public get entries() { return this._entries; }
-	public get dataSource() { return this._dataSource; }
-	public get renderer() { return this._renderer; }
-	public get filter() { return this._filter; }
-	public get runner() { return this._runner; }
-	public get accessibilityProvider() { return this._accessibilityProvider; }
+	get entries() { return this._entries; }
+	get dataSource() { return this._dataSource; }
+	get renderer() { return this._renderer; }
+	get filter() { return this._filter; }
+	get runner() { return this._runner; }
+	get accessibilityProvider() { return this._accessibilityProvider; }
 
-	public set entries(entries: QuickOpenEntry[]) {
+	set entries(entries: QuickOpenEntry[]) {
 		this._entries = entries;
 	}
 
 	/**
 	 * Adds entries that should show up in the quick open viewer.
 	 */
-	public addEntries(entries: QuickOpenEntry[]): void {
+	addEntries(entries: QuickOpenEntry[]): void {
 		if (types.isArray(entries)) {
 			this._entries = this._entries.concat(entries);
 		}
@@ -542,7 +542,7 @@ export class QuickOpenModel implements
 	/**
 	 * Set the entries that should show up in the quick open viewer.
 	 */
-	public setEntries(entries: QuickOpenEntry[]): void {
+	setEntries(entries: QuickOpenEntry[]): void {
 		if (types.isArray(entries)) {
 			this._entries = entries;
 		}
@@ -553,7 +553,7 @@ export class QuickOpenModel implements
 	 *
 	 * @visibleOnly optional parameter to only return visible entries
 	 */
-	public getEntries(visibleOnly?: boolean): QuickOpenEntry[] {
+	getEntries(visibleOnly?: boolean): QuickOpenEntry[] {
 		if (visibleOnly) {
 			return this._entries.filter((e) => !e.isHidden());
 		}
@@ -561,15 +561,15 @@ export class QuickOpenModel implements
 		return this._entries;
 	}
 
-	public getId(entry: QuickOpenEntry): string {
+	getId(entry: QuickOpenEntry): string {
 		return entry.getId();
 	}
 
-	public getLabel(entry: QuickOpenEntry): string {
+	getLabel(entry: QuickOpenEntry): string {
 		return entry.getLabel();
 	}
 
-	public getAriaLabel(entry: QuickOpenEntry): string {
+	getAriaLabel(entry: QuickOpenEntry): string {
 		const ariaLabel = entry.getAriaLabel();
 		if (ariaLabel) {
 			return nls.localize('quickOpenAriaLabelEntry', "{0}, picker", entry.getAriaLabel());
@@ -578,11 +578,11 @@ export class QuickOpenModel implements
 		return nls.localize('quickOpenAriaLabel', "picker");
 	}
 
-	public isVisible(entry: QuickOpenEntry): boolean {
+	isVisible(entry: QuickOpenEntry): boolean {
 		return !entry.isHidden();
 	}
 
-	public run(entry: QuickOpenEntry, mode: Mode, context: IContext): boolean {
+	run(entry: QuickOpenEntry, mode: Mode, context: IContext): boolean {
 		return entry.run(mode, context);
 	}
 }
diff --git a/src/vs/base/parts/quickopen/browser/quickOpenViewer.ts b/src/vs/base/parts/quickopen/browser/quickOpenViewer.ts
index 07817947cbb..084c12b65df 100644
--- a/src/vs/base/parts/quickopen/browser/quickOpenViewer.ts
+++ b/src/vs/base/parts/quickopen/browser/quickOpenViewer.ts
@@ -23,7 +23,7 @@ export class DataSource implements IDataSource {
 		this.modelProvider = isFunction(arg.getModel) ? arg : { getModel: () => arg };
 	}
 
-	public getId(tree: ITree, element: any): string {
+	getId(tree: ITree, element: any): string {
 		if (!element) {
 			return null;
 		}
@@ -32,17 +32,17 @@ export class DataSource implements IDataSource {
 		return model === element ? '__root__' : model.dataSource.getId(element);
 	}
 
-	public hasChildren(tree: ITree, element: any): boolean {
+	hasChildren(tree: ITree, element: any): boolean {
 		const model = this.modelProvider.getModel();
 		return model && model === element && model.entries.length > 0;
 	}
 
-	public getChildren(tree: ITree, element: any): TPromise<any[]> {
+	getChildren(tree: ITree, element: any): TPromise<any[]> {
 		const model = this.modelProvider.getModel();
 		return TPromise.as(model === element ? model.entries : []);
 	}
 
-	public getParent(tree: ITree, element: any): TPromise<any> {
+	getParent(tree: ITree, element: any): TPromise<any> {
 		return TPromise.as(null);
 	}
 }
@@ -50,18 +50,18 @@ export class DataSource implements IDataSource {
 export class AccessibilityProvider implements IAccessibilityProvider {
 	constructor(private modelProvider: IModelProvider) { }
 
-	public getAriaLabel(tree: ITree, element: any): string {
+	getAriaLabel(tree: ITree, element: any): string {
 		const model = this.modelProvider.getModel();
 
 		return model.accessibilityProvider && model.accessibilityProvider.getAriaLabel(element);
 	}
 
-	public getPosInSet(tree: ITree, element: any): string {
+	getPosInSet(tree: ITree, element: any): string {
 		const model = this.modelProvider.getModel();
 		return String(model.entries.indexOf(element) + 1);
 	}
 
-	public getSetSize(): string {
+	getSetSize(): string {
 		const model = this.modelProvider.getModel();
 		return String(model.entries.length);
 	}
@@ -71,7 +71,7 @@ export class Filter implements IFilter {
 
 	constructor(private modelProvider: IModelProvider) { }
 
-	public isVisible(tree: ITree, element: any): boolean {
+	isVisible(tree: ITree, element: any): boolean {
 		const model = this.modelProvider.getModel();
 
 		if (!model.filter) {
@@ -89,31 +89,31 @@ export class Renderer implements IRenderer {
 		this.styles = styles;
 	}
 
-	public updateStyles(styles: IQuickOpenStyles): void {
+	updateStyles(styles: IQuickOpenStyles): void {
 		this.styles = styles;
 	}
 
-	public getHeight(tree: ITree, element: any): number {
+	getHeight(tree: ITree, element: any): number {
 		const model = this.modelProvider.getModel();
 		return model.renderer.getHeight(element);
 	}
 
-	public getTemplateId(tree: ITree, element: any): string {
+	getTemplateId(tree: ITree, element: any): string {
 		const model = this.modelProvider.getModel();
 		return model.renderer.getTemplateId(element);
 	}
 
-	public renderTemplate(tree: ITree, templateId: string, container: HTMLElement): any {
+	renderTemplate(tree: ITree, templateId: string, container: HTMLElement): any {
 		const model = this.modelProvider.getModel();
 		return model.renderer.renderTemplate(templateId, container, this.styles);
 	}
 
-	public renderElement(tree: ITree, element: any, templateId: string, templateData: any): void {
+	renderElement(tree: ITree, element: any, templateId: string, templateData: any): void {
 		const model = this.modelProvider.getModel();
 		model.renderer.renderElement(element, templateId, templateData, this.styles);
 	}
 
-	public disposeTemplate(tree: ITree, templateId: string, templateData: any): void {
+	disposeTemplate(tree: ITree, templateId: string, templateData: any): void {
 		const model = this.modelProvider.getModel();
 		model.renderer.disposeTemplate(templateId, templateData);
 	}
diff --git a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts b/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
index 53a84d50876..2a3a7f0d15a 100644
--- a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
+++ b/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
@@ -22,7 +22,7 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { DefaultController, ClickBehavior } from 'vs/base/parts/tree/browser/treeDefaults';
 import * as DOM from 'vs/base/browser/dom';
 import { KeyCode } from 'vs/base/common/keyCodes';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
@@ -65,7 +65,7 @@ export interface IShowOptions {
 
 export class QuickOpenController extends DefaultController {
 
-	public onContextMenu(tree: ITree, element: any, event: ContextMenuEvent): boolean {
+	onContextMenu(tree: ITree, element: any, event: ContextMenuEvent): boolean {
 		if (platform.isMacintosh) {
 			return this.onLeftClick(tree, element, event); // https://github.com/Microsoft/vscode/issues/1011
 		}
@@ -91,7 +91,7 @@ const defaultStyles = {
 
 const DEFAULT_INPUT_ARIA_LABEL = nls.localize('quickOpenAriaLabel', "Quick picker. Type to narrow down results.");
 
-export class QuickOpenWidget implements IModelProvider {
+export class QuickOpenWidget extends Disposable implements IModelProvider {
 
 	private static readonly MAX_WIDTH = 600;				// Max total width of quick open widget
 	private static readonly MAX_ITEMS_HEIGHT = 20 * 22;	// Max height of item list below input field
@@ -108,7 +108,6 @@ export class QuickOpenWidget implements IModelProvider {
 	private visible: boolean;
 	private isLoosingFocus: boolean;
 	private callbacks: IQuickOpenCallbacks;
-	private toUnbind: IDisposable[];
 	private quickNavigateConfiguration: IQuickNavigateConfiguration;
 	private container: HTMLElement;
 	private treeElement: HTMLElement;
@@ -120,8 +119,9 @@ export class QuickOpenWidget implements IModelProvider {
 	private renderer: Renderer;
 
 	constructor(container: HTMLElement, callbacks: IQuickOpenCallbacks, options: IQuickOpenOptions) {
+		super();
+
 		this.isDisposed = false;
-		this.toUnbind = [];
 		this.container = container;
 		this.callbacks = callbacks;
 		this.options = options;
@@ -130,19 +130,19 @@ export class QuickOpenWidget implements IModelProvider {
 		this.model = null;
 	}
 
-	public getElement(): HTMLElement {
+	getElement(): HTMLElement {
 		return $(this.builder).getHTMLElement();
 	}
 
-	public getModel(): IModel<any> {
+	getModel(): IModel<any> {
 		return this.model;
 	}
 
-	public setCallbacks(callbacks: IQuickOpenCallbacks): void {
+	setCallbacks(callbacks: IQuickOpenCallbacks): void {
 		this.callbacks = callbacks;
 	}
 
-	public create(): HTMLElement {
+	create(): HTMLElement {
 		this.builder = $().div(div => {
 
 			// Eventing
@@ -159,13 +159,13 @@ export class QuickOpenWidget implements IModelProvider {
 				.on(DOM.EventType.BLUR, (e: FocusEvent) => this.loosingFocus(e), null, true);
 
 			// Progress Bar
-			this.progressBar = new ProgressBar(div.clone(), { progressBarBackground: this.styles.progressBarBackground });
+			this.progressBar = this._register(new ProgressBar(div.clone(), { progressBarBackground: this.styles.progressBarBackground }));
 			this.progressBar.hide();
 
 			// Input Field
 			div.div({ 'class': 'quick-open-input' }, inputContainer => {
 				this.inputContainer = inputContainer;
-				this.inputBox = new InputBox(inputContainer.getHTMLElement(), null, {
+				this.inputBox = this._register(new InputBox(inputContainer.getHTMLElement(), null, {
 					placeholder: this.options.inputPlaceHolder || '',
 					ariaLabel: DEFAULT_INPUT_ARIA_LABEL,
 					inputBackground: this.styles.inputBackground,
@@ -177,7 +177,7 @@ export class QuickOpenWidget implements IModelProvider {
 					inputValidationWarningBorder: this.styles.inputValidationWarningBorder,
 					inputValidationErrorBackground: this.styles.inputValidationErrorBackground,
 					inputValidationErrorBorder: this.styles.inputValidationErrorBorder
-				});
+				}));
 
 				// ARIA
 				this.inputElement = this.inputBox.inputElement;
@@ -229,7 +229,7 @@ export class QuickOpenWidget implements IModelProvider {
 			}, div => {
 				const createTree = this.options.treeCreator || ((container, config, opts) => new Tree(container, config, opts));
 
-				this.tree = createTree(div.getHTMLElement(), {
+				this.tree = this._register(createTree(div.getHTMLElement(), {
 					dataSource: new DataSource(this),
 					controller: new QuickOpenController({ clickBehavior: ClickBehavior.ON_MOUSE_UP, keyboardSupport: this.options.keyboardSupport }),
 					renderer: (this.renderer = new Renderer(this, this.styles)),
@@ -244,16 +244,16 @@ export class QuickOpenWidget implements IModelProvider {
 						ariaLabel: nls.localize('treeAriaLabel', "Quick Picker"),
 						keyboardSupport: this.options.keyboardSupport,
 						preventRootFocus: true
-					});
+					}));
 
 				this.treeElement = this.tree.getHTMLElement();
 
 				// Handle Focus and Selection event
-				this.toUnbind.push(this.tree.onDidChangeFocus(event => {
+				this._register(this.tree.onDidChangeFocus(event => {
 					this.elementFocused(event.focus, event);
 				}));
 
-				this.toUnbind.push(this.tree.onDidChangeSelection(event => {
+				this._register(this.tree.onDidChangeSelection(event => {
 					if (event.selection && event.selection.length > 0) {
 						const mouseEvent: StandardMouseEvent = event.payload && event.payload.originalEvent instanceof StandardMouseEvent ? event.payload.originalEvent : void 0;
 						const shouldOpenInBackground = mouseEvent ? this.shouldOpenInBackground(mouseEvent) : false;
@@ -354,7 +354,7 @@ export class QuickOpenWidget implements IModelProvider {
 		return this.builder.getHTMLElement();
 	}
 
-	public style(styles: IQuickOpenStyles): void {
+	style(styles: IQuickOpenStyles): void {
 		this.styles = styles;
 
 		this.applyStyles();
@@ -442,7 +442,7 @@ export class QuickOpenWidget implements IModelProvider {
 		this.callbacks.onType(value);
 	}
 
-	public navigate(next: boolean, quickNavigate?: IQuickNavigateConfiguration): void {
+	navigate(next: boolean, quickNavigate?: IQuickNavigateConfiguration): void {
 		if (this.isVisible()) {
 
 			// Transition into quick navigate mode if not yet done
@@ -548,9 +548,9 @@ export class QuickOpenWidget implements IModelProvider {
 		};
 	}
 
-	public show(prefix: string, options?: IShowOptions): void;
-	public show(input: IModel<any>, options?: IShowOptions): void;
-	public show(param: any, options?: IShowOptions): void {
+	show(prefix: string, options?: IShowOptions): void;
+	show(input: IModel<any>, options?: IShowOptions): void;
+	show(param: any, options?: IShowOptions): void {
 		this.visible = true;
 		this.isLoosingFocus = false;
 		this.quickNavigateConfiguration = options ? options.quickNavigateConfiguration : void 0;
@@ -696,7 +696,7 @@ export class QuickOpenWidget implements IModelProvider {
 		}
 	}
 
-	public refresh(input?: IModel<any>, autoFocus?: IAutoFocus): void {
+	refresh(input?: IModel<any>, autoFocus?: IAutoFocus): void {
 		if (!this.isVisible()) {
 			return;
 		}
@@ -760,7 +760,7 @@ export class QuickOpenWidget implements IModelProvider {
 		return height;
 	}
 
-	public hide(reason?: HideReason): void {
+	hide(reason?: HideReason): void {
 		if (!this.isVisible()) {
 			return;
 		}
@@ -801,17 +801,17 @@ export class QuickOpenWidget implements IModelProvider {
 		}
 	}
 
-	public getQuickNavigateConfiguration(): IQuickNavigateConfiguration {
+	getQuickNavigateConfiguration(): IQuickNavigateConfiguration {
 		return this.quickNavigateConfiguration;
 	}
 
-	public setPlaceHolder(placeHolder: string): void {
+	setPlaceHolder(placeHolder: string): void {
 		if (this.inputBox) {
 			this.inputBox.setPlaceHolder(placeHolder);
 		}
 	}
 
-	public setValue(value: string, selectionOrStableHint?: [number, number] | null): void {
+	setValue(value: string, selectionOrStableHint?: [number, number] | null): void {
 		if (this.inputBox) {
 			this.inputBox.value = value;
 			if (selectionOrStableHint === null) {
@@ -825,13 +825,13 @@ export class QuickOpenWidget implements IModelProvider {
 		}
 	}
 
-	public setPassword(isPassword: boolean): void {
+	setPassword(isPassword: boolean): void {
 		if (this.inputBox) {
 			this.inputBox.inputElement.type = isPassword ? 'password' : 'text';
 		}
 	}
 
-	public setInput(input: IModel<any>, autoFocus: IAutoFocus, ariaLabel?: string): void {
+	setInput(input: IModel<any>, autoFocus: IAutoFocus, ariaLabel?: string): void {
 		if (!this.isVisible()) {
 			return;
 		}
@@ -864,29 +864,29 @@ export class QuickOpenWidget implements IModelProvider {
 		}, 500);
 	}
 
-	public getInput(): IModel<any> {
+	getInput(): IModel<any> {
 		return this.tree.getInput();
 	}
 
-	public showInputDecoration(decoration: Severity): void {
+	showInputDecoration(decoration: Severity): void {
 		if (this.inputBox) {
 			this.inputBox.showMessage({ type: decoration === Severity.Info ? MessageType.INFO : decoration === Severity.Warning ? MessageType.WARNING : MessageType.ERROR, content: '' });
 		}
 	}
 
-	public clearInputDecoration(): void {
+	clearInputDecoration(): void {
 		if (this.inputBox) {
 			this.inputBox.hideMessage();
 		}
 	}
 
-	public focus(): void {
+	focus(): void {
 		if (this.isVisible() && this.inputBox) {
 			this.inputBox.focus();
 		}
 	}
 
-	public accept(): void {
+	accept(): void {
 		if (this.isVisible()) {
 			const focus = this.tree.getFocus();
 			if (focus) {
@@ -895,15 +895,15 @@ export class QuickOpenWidget implements IModelProvider {
 		}
 	}
 
-	public getProgressBar(): ProgressBar {
+	getProgressBar(): ProgressBar {
 		return this.progressBar;
 	}
 
-	public getInputBox(): InputBox {
+	getInputBox(): InputBox {
 		return this.inputBox;
 	}
 
-	public setExtraClass(clazz: string): void {
+	setExtraClass(clazz: string): void {
 		const previousClass = this.builder.getProperty('extra-class');
 		if (previousClass) {
 			this.builder.removeClass(previousClass);
@@ -917,11 +917,11 @@ export class QuickOpenWidget implements IModelProvider {
 		}
 	}
 
-	public isVisible(): boolean {
+	isVisible(): boolean {
 		return this.visible;
 	}
 
-	public layout(dimension: DOM.Dimension): void {
+	layout(dimension: DOM.Dimension): void {
 		this.layoutDimensions = dimension;
 
 		// Apply to quick open width (height is dynamic by number of items to show)
@@ -971,12 +971,9 @@ export class QuickOpenWidget implements IModelProvider {
 		});
 	}
 
-	public dispose(): void {
-		this.isDisposed = true;
-		this.toUnbind = dispose(this.toUnbind);
+	dispose(): void {
+		super.dispose();
 
-		this.progressBar.dispose();
-		this.inputBox.dispose();
-		this.tree.dispose();
+		this.isDisposed = true;
 	}
 }
diff --git a/src/vs/base/parts/tree/browser/treeDefaults.ts b/src/vs/base/parts/tree/browser/treeDefaults.ts
index b5c4ca60e62..032e70e54b7 100644
--- a/src/vs/base/parts/tree/browser/treeDefaults.ts
+++ b/src/vs/base/parts/tree/browser/treeDefaults.ts
@@ -175,9 +175,9 @@ export class DefaultController implements _.IController {
 			tree.clearFocus(payload);
 			tree.clearSelection(payload);
 		} else {
-			const isMouseDown = eventish && event.browserEvent && event.browserEvent.type === 'mousedown';
-			if (!isMouseDown) {
-				eventish.preventDefault(); // we cannot preventDefault onMouseDown because this would break DND otherwise
+			const isSingleMouseDown = eventish && event.browserEvent && event.browserEvent.type === 'mousedown' && event.browserEvent.detail === 1;
+			if (!isSingleMouseDown) {
+				eventish.preventDefault(); // we cannot preventDefault onMouseDown with single click because this would break DND otherwise
 			}
 			eventish.stopPropagation();
 
diff --git a/src/vs/base/test/browser/ui/tree/treeModel.test.ts b/src/vs/base/test/browser/ui/tree/treeModel.test.ts
new file mode 100644
index 00000000000..a4901161329
--- /dev/null
+++ b/src/vs/base/test/browser/ui/tree/treeModel.test.ts
@@ -0,0 +1,334 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { TreeModel, ITreeNode } from 'vs/base/browser/ui/tree/treeModel';
+import { ISpliceable } from 'vs/base/browser/ui/list/splice';
+import { iter } from 'vs/base/common/iterator';
+
+function toSpliceable<T>(arr: T[]): ISpliceable<T> {
+	return {
+		splice(start: number, deleteCount: number, elements: T[]): void {
+			arr.splice(start, deleteCount, ...elements);
+		}
+	};
+}
+
+function toArray<T>(list: ITreeNode<T>[]): T[] {
+	return list.map(i => i.element);
+}
+
+suite('TreeModel2', function () {
+
+	test('ctor', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+		assert(model);
+		assert.equal(list.length, 0);
+	});
+
+	test('insert', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+
+		model.splice([0], 0, iter([
+			{ element: 0 },
+			{ element: 1 },
+			{ element: 2 }
+		]));
+
+		assert.deepEqual(list.length, 3);
+		assert.deepEqual(list[0].element, 0);
+		assert.deepEqual(list[0].collapsed, false);
+		assert.deepEqual(list[0].depth, 1);
+		assert.deepEqual(list[1].element, 1);
+		assert.deepEqual(list[1].collapsed, false);
+		assert.deepEqual(list[1].depth, 1);
+		assert.deepEqual(list[2].element, 2);
+		assert.deepEqual(list[2].collapsed, false);
+		assert.deepEqual(list[2].depth, 1);
+	});
+
+	test('deep insert', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+
+		model.splice([0], 0, iter([
+			{
+				element: 0, children: iter([
+					{ element: 10 },
+					{ element: 11 },
+					{ element: 12 },
+				])
+			},
+			{ element: 1 },
+			{ element: 2 }
+		]));
+
+		assert.deepEqual(list.length, 6);
+		assert.deepEqual(list[0].element, 0);
+		assert.deepEqual(list[0].collapsed, false);
+		assert.deepEqual(list[0].depth, 1);
+		assert.deepEqual(list[1].element, 10);
+		assert.deepEqual(list[1].collapsed, false);
+		assert.deepEqual(list[1].depth, 2);
+		assert.deepEqual(list[2].element, 11);
+		assert.deepEqual(list[2].collapsed, false);
+		assert.deepEqual(list[2].depth, 2);
+		assert.deepEqual(list[3].element, 12);
+		assert.deepEqual(list[3].collapsed, false);
+		assert.deepEqual(list[3].depth, 2);
+		assert.deepEqual(list[4].element, 1);
+		assert.deepEqual(list[4].collapsed, false);
+		assert.deepEqual(list[4].depth, 1);
+		assert.deepEqual(list[5].element, 2);
+		assert.deepEqual(list[5].collapsed, false);
+		assert.deepEqual(list[5].depth, 1);
+	});
+
+	test('deep insert collapsed', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+
+		model.splice([0], 0, iter([
+			{
+				element: 0, collapsed: true, children: iter([
+					{ element: 10 },
+					{ element: 11 },
+					{ element: 12 },
+				])
+			},
+			{ element: 1 },
+			{ element: 2 }
+		]));
+
+		assert.deepEqual(list.length, 3);
+		assert.deepEqual(list[0].element, 0);
+		assert.deepEqual(list[0].collapsed, true);
+		assert.deepEqual(list[0].depth, 1);
+		assert.deepEqual(list[1].element, 1);
+		assert.deepEqual(list[1].collapsed, false);
+		assert.deepEqual(list[1].depth, 1);
+		assert.deepEqual(list[2].element, 2);
+		assert.deepEqual(list[2].collapsed, false);
+		assert.deepEqual(list[2].depth, 1);
+	});
+
+	test('delete', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+
+		model.splice([0], 0, iter([
+			{ element: 0 },
+			{ element: 1 },
+			{ element: 2 }
+		]));
+
+		assert.deepEqual(list.length, 3);
+
+		model.splice([1], 1);
+		assert.deepEqual(list.length, 2);
+		assert.deepEqual(list[0].element, 0);
+		assert.deepEqual(list[0].collapsed, false);
+		assert.deepEqual(list[0].depth, 1);
+		assert.deepEqual(list[1].element, 2);
+		assert.deepEqual(list[1].collapsed, false);
+		assert.deepEqual(list[1].depth, 1);
+
+		model.splice([0], 2);
+		assert.deepEqual(list.length, 0);
+	});
+
+	test('nested delete', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+
+		model.splice([0], 0, iter([
+			{
+				element: 0, children: iter([
+					{ element: 10 },
+					{ element: 11 },
+					{ element: 12 },
+				])
+			},
+			{ element: 1 },
+			{ element: 2 }
+		]));
+
+		assert.deepEqual(list.length, 6);
+
+		model.splice([1], 2);
+		assert.deepEqual(list.length, 4);
+		assert.deepEqual(list[0].element, 0);
+		assert.deepEqual(list[0].collapsed, false);
+		assert.deepEqual(list[0].depth, 1);
+		assert.deepEqual(list[1].element, 10);
+		assert.deepEqual(list[1].collapsed, false);
+		assert.deepEqual(list[1].depth, 2);
+		assert.deepEqual(list[2].element, 11);
+		assert.deepEqual(list[2].collapsed, false);
+		assert.deepEqual(list[2].depth, 2);
+		assert.deepEqual(list[3].element, 12);
+		assert.deepEqual(list[3].collapsed, false);
+		assert.deepEqual(list[3].depth, 2);
+	});
+
+	test('deep delete', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+
+		model.splice([0], 0, iter([
+			{
+				element: 0, children: iter([
+					{ element: 10 },
+					{ element: 11 },
+					{ element: 12 },
+				])
+			},
+			{ element: 1 },
+			{ element: 2 }
+		]));
+
+		assert.deepEqual(list.length, 6);
+
+		model.splice([0], 1);
+		assert.deepEqual(list.length, 2);
+		assert.deepEqual(list[0].element, 1);
+		assert.deepEqual(list[0].collapsed, false);
+		assert.deepEqual(list[0].depth, 1);
+		assert.deepEqual(list[1].element, 2);
+		assert.deepEqual(list[1].collapsed, false);
+		assert.deepEqual(list[1].depth, 1);
+	});
+
+	test('hidden delete', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+
+		model.splice([0], 0, iter([
+			{
+				element: 0, collapsed: true, children: iter([
+					{ element: 10 },
+					{ element: 11 },
+					{ element: 12 },
+				])
+			},
+			{ element: 1 },
+			{ element: 2 }
+		]));
+
+		assert.deepEqual(list.length, 3);
+
+		model.splice([0, 1], 1);
+		assert.deepEqual(list.length, 3);
+
+		model.splice([0, 0], 2);
+		assert.deepEqual(list.length, 3);
+	});
+
+	test('collapse', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+
+		model.splice([0], 0, iter([
+			{
+				element: 0, children: iter([
+					{ element: 10 },
+					{ element: 11 },
+					{ element: 12 },
+				])
+			},
+			{ element: 1 },
+			{ element: 2 }
+		]));
+
+		assert.deepEqual(list.length, 6);
+
+		model.setCollapsed([0], true);
+		assert.deepEqual(list.length, 3);
+		assert.deepEqual(list[0].element, 0);
+		assert.deepEqual(list[0].collapsed, true);
+		assert.deepEqual(list[0].depth, 1);
+		assert.deepEqual(list[1].element, 1);
+		assert.deepEqual(list[1].collapsed, false);
+		assert.deepEqual(list[1].depth, 1);
+		assert.deepEqual(list[2].element, 2);
+		assert.deepEqual(list[2].collapsed, false);
+		assert.deepEqual(list[2].depth, 1);
+	});
+
+	test('expand', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+
+		model.splice([0], 0, iter([
+			{
+				element: 0, collapsed: true, children: iter([
+					{ element: 10 },
+					{ element: 11 },
+					{ element: 12 },
+				])
+			},
+			{ element: 1 },
+			{ element: 2 }
+		]));
+
+		assert.deepEqual(list.length, 3);
+
+		model.setCollapsed([0], false);
+		assert.deepEqual(list.length, 6);
+		assert.deepEqual(list[0].element, 0);
+		assert.deepEqual(list[0].collapsed, false);
+		assert.deepEqual(list[0].depth, 1);
+		assert.deepEqual(list[1].element, 10);
+		assert.deepEqual(list[1].collapsed, false);
+		assert.deepEqual(list[1].depth, 2);
+		assert.deepEqual(list[2].element, 11);
+		assert.deepEqual(list[2].collapsed, false);
+		assert.deepEqual(list[2].depth, 2);
+		assert.deepEqual(list[3].element, 12);
+		assert.deepEqual(list[3].collapsed, false);
+		assert.deepEqual(list[3].depth, 2);
+		assert.deepEqual(list[4].element, 1);
+		assert.deepEqual(list[4].collapsed, false);
+		assert.deepEqual(list[4].depth, 1);
+		assert.deepEqual(list[5].element, 2);
+		assert.deepEqual(list[5].collapsed, false);
+		assert.deepEqual(list[5].depth, 1);
+	});
+
+	test('collapse should recursively adjust visible count', function () {
+		const list = [] as ITreeNode<number>[];
+		const model = new TreeModel<number>(toSpliceable(list));
+
+		model.splice([0], 0, iter([
+			{
+				element: 1, children: [
+					{
+						element: 11, children: [
+							{ element: 111 }
+						]
+					}
+				]
+			},
+			{
+				element: 2, children: [
+					{ element: 21 }
+				]
+			}
+		]));
+
+		assert.deepEqual(list.length, 5);
+		assert.deepEqual(toArray(list), [1, 11, 111, 2, 21]);
+
+		model.setCollapsed([0, 0], true);
+		assert.deepEqual(list.length, 4);
+		assert.deepEqual(toArray(list), [1, 11, 2, 21]);
+
+		model.setCollapsed([1], true);
+		assert.deepEqual(list.length, 3);
+		assert.deepEqual(toArray(list), [1, 11, 2]);
+	});
+});
\ No newline at end of file
diff --git a/src/vs/base/test/common/arrays.test.ts b/src/vs/base/test/common/arrays.test.ts
index ee1a6e18b58..cff3a614965 100644
--- a/src/vs/base/test/common/arrays.test.ts
+++ b/src/vs/base/test/common/arrays.test.ts
@@ -52,6 +52,11 @@ suite('Arrays', () => {
 		assert.deepEqual(data, [1, 2, 3, 4, 5, 6, 7, 8]);
 	});
 
+	test('mergeSort, sorted array', function () {
+		let data = arrays.mergeSort([1, 2, 3, 4, 5, 6], (a, b) => a - b);
+		assert.deepEqual(data, [1, 2, 3, 4, 5, 6]);
+	});
+
 	test('mergeSort, is stable', function () {
 
 		let numbers = arrays.mergeSort([33, 22, 11, 4, 99, 1], (a, b) => 0);
diff --git a/src/vs/base/test/common/async.test.ts b/src/vs/base/test/common/async.test.ts
index d1ef408cb3f..9cab77a9881 100644
--- a/src/vs/base/test/common/async.test.ts
+++ b/src/vs/base/test/common/async.test.ts
@@ -6,16 +6,55 @@
 
 import * as assert from 'assert';
 import { TPromise } from 'vs/base/common/winjs.base';
-import * as Async from 'vs/base/common/async';
+import * as async from 'vs/base/common/async';
 import URI from 'vs/base/common/uri';
+import { isPromiseCanceledError } from 'vs/base/common/errors';
 
 suite('Async', () => {
 
+	test('cancelablePromise - set token, don\'t wait for inner promise', function () {
+		let canceled = 0;
+		let promise = async.createCancelablePromise(token => {
+			token.onCancellationRequested(_ => { canceled += 1; });
+			return new Promise(resolve => { /*never*/ });
+		});
+		let result = promise.then(_ => assert.ok(false), err => {
+			assert.equal(canceled, 1);
+			assert.ok(isPromiseCanceledError(err));
+		});
+		promise.cancel();
+		promise.cancel(); // cancel only once
+		return result;
+	});
+
+	test('cancelablePromise - cancel despite inner promise being resolved', function () {
+		let canceled = 0;
+		let promise = async.createCancelablePromise(token => {
+			token.onCancellationRequested(_ => { canceled += 1; });
+			return Promise.resolve(1234);
+		});
+		let result = promise.then(_ => assert.ok(false), err => {
+			assert.equal(canceled, 1);
+			assert.ok(isPromiseCanceledError(err));
+		});
+		promise.cancel();
+		return result;
+	});
+
+	test('cancelablePromise - get inner result', async function () {
+		let promise = async.createCancelablePromise(token => {
+			return async.timeout(12).then(_ => 1234);
+		});
+
+		let result = await promise;
+		assert.equal(result, 1234);
+	});
+
 	test('asDisposablePromise', async function () {
-		let value = await Async.asDisposablePromise(TPromise.as(1)).promise;
+		let value = await async.asDisposablePromise(TPromise.as(1)).promise;
 		assert.equal(value, 1);
 
-		let disposablePromise = Async.asDisposablePromise(TPromise.timeout(1000).then(_ => 1), 2);
+		let disposablePromise = async.asDisposablePromise(TPromise.timeout(1000).then(_ => 1), 2);
 		disposablePromise.dispose();
 		value = await disposablePromise.promise;
 		assert.equal(value, 2);
@@ -27,7 +66,7 @@ suite('Async', () => {
 			return TPromise.as(++count);
 		};
 
-		let throttler = new Async.Throttler();
+		let throttler = new async.Throttler();
 
 		return TPromise.join([
 			throttler.queue(factory).then((result) => { assert.equal(result, 1); }),
@@ -46,7 +85,7 @@ suite('Async', () => {
 			});
 		};
 
-		let throttler = new Async.Throttler();
+		let throttler = new async.Throttler();
 
 		return TPromise.join([
 			throttler.queue(factory).then((result) => { assert.equal(result, 1); }),
@@ -73,7 +112,7 @@ suite('Async', () => {
 			});
 		};
 
-		let throttler = new Async.Throttler();
+		let throttler = new async.Throttler();
 		let p1: TPromise;
 
 		const p = TPromise.join([
@@ -96,7 +135,7 @@ suite('Async', () => {
 			});
 		};
 
-		let throttler = new Async.Throttler();
+		let throttler = new async.Throttler();
 		let p2: TPromise;
 
 		const p = TPromise.join([
@@ -119,7 +158,7 @@ suite('Async', () => {
 			});
 		};
 
-		let throttler = new Async.Throttler();
+		let throttler = new async.Throttler();
 		let p3: TPromise;
 
 		const p = TPromise.join([
@@ -139,7 +178,7 @@ suite('Async', () => {
 			return TPromise.timeout(0).then(() => n);
 		};
 
-		let throttler = new Async.Throttler();
+		let throttler = new async.Throttler();
 
 		let promises: TPromise[] = [];
 
@@ -159,7 +198,7 @@ suite('Async', () => {
 			});
 		});
 
-		let throttler = new Async.Throttler();
+		let throttler = new async.Throttler();
 		let promises: TPromise[] = [];
 		let progresses: any[][] = [[], [], []];
 
@@ -180,7 +219,7 @@ suite('Async', () => {
 			return TPromise.as(++count);
 		};
 
-		let delayer = new Async.Delayer(0);
+		let delayer = new async.Delayer(0);
 		let promises: TPromise[] = [];
 
 		assert(!delayer.isTriggered());
@@ -205,7 +244,7 @@ suite('Async', () => {
 			return TPromise.as(++count);
 		};
 
-		let delayer = new Async.Delayer(0);
+		let delayer = new async.Delayer(0);
 
 		assert(!delayer.isTriggered());
 
@@ -228,7 +267,7 @@ suite('Async', () => {
 			return TPromise.as(++count);
 		};
 
-		let delayer = new Async.Delayer(0);
+		let delayer = new async.Delayer(0);
 		let promises: TPromise[] = [];
 
 		assert(!delayer.isTriggered());
@@ -255,7 +294,7 @@ suite('Async', () => {
 			return TPromise.as(++count);
 		};
 
-		let delayer = new Async.Delayer(0);
+		let delayer = new async.Delayer(0);
 		let promises: TPromise[] = [];
 
 		assert(!delayer.isTriggered());
@@ -307,7 +346,7 @@ suite('Async', () => {
 			return TPromise.as(n);
 		};
 
-		let delayer = new Async.Delayer(0);
+		let delayer = new async.Delayer(0);
 		let promises: TPromise[] = [];
 
 		assert(!delayer.isTriggered());
@@ -334,7 +373,7 @@ suite('Async', () => {
 			});
 		});
 
-		let delayer = new Async.Delayer(0);
+		let delayer = new async.Delayer(0);
 		let promises: TPromise[] = [];
 		let progresses: any[][] = [[], [], []];
 
@@ -358,7 +397,7 @@ suite('Async', () => {
 			});
 		});
 
-		let delayer = new Async.ThrottledDelayer(0);
+		let delayer = new async.ThrottledDelayer(0);
 		let promises: TPromise[] = [];
 		let progresses: any[][] = [[], [], []];
 
@@ -378,7 +417,7 @@ suite('Async', () => {
 			return TPromise.as(n);
 		};
 
-		return Async.sequence([
+		return async.sequence([
 			factoryFactory(1),
 			factoryFactory(2),
 			factoryFactory(3),
@@ -399,7 +438,7 @@ suite('Async', () => {
 			return TPromise.as(n);
 		};
 
-		let limiter = new Async.Limiter(1);
+		let limiter = new async.Limiter(1);
 
 		let promises: TPromise[] = [];
 		[0, 1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(n => promises.push(limiter.queue(factoryFactory(n))));
@@ -407,7 +446,7 @@ suite('Async', () => {
 		return TPromise.join(promises).then((res) => {
 			assert.equal(10, res.length);
 
-			limiter = new Async.Limiter(100);
+			limiter = new async.Limiter(100);
 
 			promises = [];
 			[0, 1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(n => promises.push(limiter.queue(factoryFactory(n))));
@@ -423,14 +462,14 @@ suite('Async', () => {
 			return TPromise.timeout(0).then(() => n);
 		};
 
-		let limiter = new Async.Limiter(1);
+		let limiter = new async.Limiter(1);
 		let promises: TPromise[] = [];
 		[0, 1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(n => promises.push(limiter.queue(factoryFactory(n))));
 
 		return TPromise.join(promises).then((res) => {
 			assert.equal(10, res.length);
 
-			limiter = new Async.Limiter(100);
+			limiter = new async.Limiter(100);
 
 			promises = [];
 			[0, 1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(n => promises.push(limiter.queue(factoryFactory(n))));
@@ -449,7 +488,7 @@ suite('Async', () => {
 			return TPromise.timeout(0).then(() => { activePromises--; return n; });
 		};
 
-		let limiter = new Async.Limiter(5);
+		let limiter = new async.Limiter(5);
 
 		let promises: TPromise[] = [];
 		[0, 1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(n => promises.push(limiter.queue(factoryFactory(n))));
@@ -461,7 +500,7 @@ suite('Async', () => {
 	});
 
 	test('Queue - simple', function () {
-		let queue = new Async.Queue();
+		let queue = new async.Queue();
 
 		let syncPromise = false;
 		let f1 = () => TPromise.as(true).then(() => syncPromise = true);
@@ -484,7 +523,7 @@ suite('Async', () => {
 	});
 
 	test('Queue - order is kept', function () {
-		let queue = new Async.Queue();
+		let queue = new async.Queue();
 
 		let res: number[] = [];
 
@@ -508,7 +547,7 @@ suite('Async', () => {
 	});
 
 	test('Queue - errors bubble individually but not cause stop', function () {
-		let queue = new Async.Queue();
+		let queue = new async.Queue();
 
 		let res: number[] = [];
 		let error = false;
@@ -533,7 +572,7 @@ suite('Async', () => {
 	});
 
 	test('Queue - order is kept (chained)', function () {
-		let queue = new Async.Queue();
+		let queue = new async.Queue();
 
 		let res: number[] = [];
 
@@ -561,7 +600,7 @@ suite('Async', () => {
 	});
 
 	test('Queue - events', function (done) {
-		let queue = new Async.Queue();
+		let queue = new async.Queue();
 
 		let finished = false;
 		queue.onFinished(() => {
@@ -587,7 +626,7 @@ suite('Async', () => {
 	});
 
 	test('ResourceQueue - simple', function () {
-		let queue = new Async.ResourceQueue();
+		let queue = new async.ResourceQueue();
 
 		const r1Queue = queue.queueFor(URI.file('/some/path'));
 		const r2Queue = queue.queueFor(URI.file('/some/other/path'));
diff --git a/src/vs/base/test/common/json.test.ts b/src/vs/base/test/common/json.test.ts
index 2551f00fde3..da9feea768c 100644
--- a/src/vs/base/test/common/json.test.ts
+++ b/src/vs/base/test/common/json.test.ts
@@ -43,9 +43,9 @@ function assertInvalidParse(input: string, expected: any, options?: ParseOptions
 	assert.deepEqual(actual, expected);
 }
 
-function assertTree(input: string, expected: any, expectedErrors: number[] = []): void {
+function assertTree(input: string, expected: any, expectedErrors: number[] = [], options?: ParseOptions): void {
 	var errors: ParseError[] = [];
-	var actual = parseTree(input, errors);
+	var actual = parseTree(input, errors, options);
 
 	assert.deepEqual(errors.map(e => e.error, expected), expectedErrors);
 	let checkParent = (node: Node) => {
@@ -203,7 +203,7 @@ suite('JSON', () => {
 
 	test('parse: objects with errors', () => {
 		assertInvalidParse('{,}', {});
-		assertInvalidParse('{ "foo": true, }', { foo: true });
+		assertInvalidParse('{ "foo": true, }', { foo: true }, { disallowTrailingComma: true });
 		assertInvalidParse('{ "bar": 8 "xoo": "foo" }', { bar: 8, xoo: 'foo' });
 		assertInvalidParse('{ ,"bar": 8 }', { bar: 8 });
 		assertInvalidParse('{ ,"bar": 8, "foo" }', { bar: 8 });
@@ -213,10 +213,10 @@ suite('JSON', () => {
 
 	test('parse: array with errors', () => {
 		assertInvalidParse('[,]', []);
-		assertInvalidParse('[ 1, 2, ]', [1, 2]);
+		assertInvalidParse('[ 1, 2, ]', [1, 2], { disallowTrailingComma: true });
 		assertInvalidParse('[ 1 2, 3 ]', [1, 2, 3]);
 		assertInvalidParse('[ ,1, 2, 3 ]', [1, 2, 3]);
-		assertInvalidParse('[ ,1, 2, 3, ]', [1, 2, 3]);
+		assertInvalidParse('[ ,1, 2, 3, ]', [1, 2, 3], { disallowTrailingComma: true });
 	});
 
 	test('parse: disallow commments', () => {
@@ -229,15 +229,19 @@ suite('JSON', () => {
 	});
 
 	test('parse: trailing comma', () => {
-		let options = { allowTrailingComma: true };
+		// default is allow
+		assertValidParse('{ "hello": [], }', { hello: [] });
+
+		let options = { disallowTrailingComma: false };
 		assertValidParse('{ "hello": [], }', { hello: [] }, options);
 		assertValidParse('{ "hello": [] }', { hello: [] }, options);
 		assertValidParse('{ "hello": [], "world": {}, }', { hello: [], world: {} }, options);
 		assertValidParse('{ "hello": [], "world": {} }', { hello: [], world: {} }, options);
 		assertValidParse('{ "hello": [1,] }', { hello: [1] }, options);
 
-		assertInvalidParse('{ "hello": [], }', { hello: [] });
-		assertInvalidParse('{ "hello": [], "world": {}, }', { hello: [], world: {} });
+		options = { disallowTrailingComma: true };
+		assertInvalidParse('{ "hello": [], }', { hello: [] }, options);
+		assertInvalidParse('{ "hello": [], "world": {}, }', { hello: [], world: {} }, options);
 	});
 
 	test('tree: literals', () => {
@@ -320,6 +324,6 @@ suite('JSON', () => {
 					}
 				]
 			}
-			, [ParseErrorCode.PropertyNameExpected, ParseErrorCode.ValueExpected]);
+			, [ParseErrorCode.PropertyNameExpected, ParseErrorCode.ValueExpected], { disallowTrailingComma: true });
 	});
 });
diff --git a/src/vs/base/test/common/resources.test.ts b/src/vs/base/test/common/resources.test.ts
index 2c1e18bf6ef..6a613730db3 100644
--- a/src/vs/base/test/common/resources.test.ts
+++ b/src/vs/base/test/common/resources.test.ts
@@ -5,9 +5,9 @@
 'use strict';
 
 import * as assert from 'assert';
-import URI from 'vs/base/common/uri';
-import { distinctParents, dirname } from 'vs/base/common/resources';
 import { normalize } from 'vs/base/common/paths';
+import { dirname, distinctParents, joinPath } from 'vs/base/common/resources';
+import URI from 'vs/base/common/uri';
 
 suite('Resources', () => {
 
@@ -50,4 +50,22 @@ suite('Resources', () => {
 		// does not explode (https://github.com/Microsoft/vscode/issues/41987)
 		dirname(URI.from({ scheme: 'file', authority: '/users/someone/portal.h' }));
 	});
+
+	test('joinPath', () => {
+		assert.equal(
+			joinPath(URI.file('/foo/bar'), '/file.js').toString(),
+			'file:///foo/bar/file.js');
+
+		assert.equal(
+			joinPath(URI.file('/foo/bar/'), '/file.js').toString(),
+			'file:///foo/bar/file.js');
+
+		assert.equal(
+			joinPath(URI.file('/'), '/file.js').toString(),
+			'file:///file.js');
+
+		assert.equal(
+			joinPath(URI.from({ scheme: 'myScheme', authority: 'authority', path: '/path', query: 'query', fragment: 'fragment' }), '/file.js').toString(),
+			'myScheme://authority/path/file.js?query#fragment');
+	});
 });
\ No newline at end of file
diff --git a/src/vs/base/test/common/tree.test.ts b/src/vs/base/test/common/tree.test.ts
deleted file mode 100644
index f750300dc52..00000000000
--- a/src/vs/base/test/common/tree.test.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import { Tree } from 'vs/base/common/tree';
-
-suite('Base Tree', () => {
-
-	test('ctor', () => {
-		const tree = new Tree<number>();
-		assert(tree);
-
-		const nodes = tree.getNodes();
-		assert.equal(nodes.length, 0);
-	});
-
-	test('insert', () => {
-		const tree = new Tree<number>();
-
-		tree.splice([0], 0, [
-			{ element: 0, children: [] },
-			{ element: 1, children: [] },
-			{ element: 2, children: [] }
-		]);
-
-		const nodes = tree.getNodes();
-		assert.deepEqual(nodes.length, 3);
-		assert.deepEqual(nodes[0].element, 0);
-		assert.deepEqual(nodes[1].element, 1);
-		assert.deepEqual(nodes[2].element, 2);
-	});
-
-	test('deep insert', () => {
-		const tree = new Tree<number>();
-
-		tree.splice([0], 0, [
-			{
-				element: 0, children: [
-					{ element: 10, children: [] },
-					{ element: 11, children: [] },
-					{ element: 12, children: [] },
-				]
-			},
-			{ element: 1, children: [] },
-			{ element: 2, children: [] }
-		]);
-
-		const nodes = tree.getNodes();
-		assert.deepEqual(nodes.length, 3);
-		assert.deepEqual(nodes[0].element, 0);
-		assert.deepEqual(nodes[0].children.length, 3);
-		assert.deepEqual(nodes[0].children[0].element, 10);
-		assert.deepEqual(nodes[0].children[1].element, 11);
-		assert.deepEqual(nodes[0].children[2].element, 12);
-		assert.deepEqual(nodes[1].element, 1);
-		assert.deepEqual(nodes[2].element, 2);
-	});
-
-	test('delete', () => {
-		const tree = new Tree<number>();
-
-		tree.splice([0], 0, [
-			{ element: 0, children: [] },
-			{ element: 1, children: [] },
-			{ element: 2, children: [] }
-		]);
-
-		tree.splice([0], 3, []);
-
-		const nodes = tree.getNodes();
-		assert.equal(nodes.length, 0);
-	});
-
-	test('nested delete', () => {
-		const tree = new Tree<number>();
-
-		tree.splice([0], 0, [
-			{
-				element: 0, children: [
-					{ element: 10, children: [] },
-					{ element: 11, children: [] },
-					{ element: 12, children: [] },
-				]
-			},
-			{ element: 1, children: [] },
-			{ element: 2, children: [] }
-		]);
-
-		tree.splice([0, 1], 1, []);
-
-		const nodes = tree.getNodes();
-		assert.deepEqual(nodes.length, 3);
-		assert.deepEqual(nodes[0].element, 0);
-		assert.deepEqual(nodes[0].children.length, 2);
-		assert.deepEqual(nodes[0].children[0].element, 10);
-		assert.deepEqual(nodes[0].children[1].element, 12);
-		assert.deepEqual(nodes[1].element, 1);
-		assert.deepEqual(nodes[2].element, 2);
-	});
-
-	test('deep delete', () => {
-		const tree = new Tree<number>();
-
-		tree.splice([0], 0, [
-			{
-				element: 0, children: [
-					{ element: 10, children: [] },
-					{ element: 11, children: [] },
-					{ element: 12, children: [] },
-				]
-			},
-			{ element: 1, children: [] },
-			{ element: 2, children: [] }
-		]);
-
-		tree.splice([0], 1, []);
-
-		const nodes = tree.getNodes();
-		assert.deepEqual(nodes.length, 2);
-		assert.deepEqual(nodes[0].element, 1);
-		assert.deepEqual(nodes[1].element, 2);
-	});
-});
diff --git a/src/vs/base/test/common/utils.ts b/src/vs/base/test/common/utils.ts
index 1875a6f6450..f0e948976fa 100644
--- a/src/vs/base/test/common/utils.ts
+++ b/src/vs/base/test/common/utils.ts
@@ -8,7 +8,7 @@
 import * as errors from 'vs/base/common/errors';
 import * as paths from 'vs/base/common/paths';
 import URI from 'vs/base/common/uri';
-import { PPromise, ProgressCallback, TProgressCallback, TPromise, TValueCallback } from 'vs/base/common/winjs.base';
+import { PPromise, TProgressCallback, TPromise, TValueCallback } from 'vs/base/common/winjs.base';
 
 export class DeferredTPromise<T> extends TPromise<T> {
 
@@ -16,17 +16,15 @@ export class DeferredTPromise<T> extends TPromise<T> {
 
 	private completeCallback: TValueCallback<T>;
 	private errorCallback: (err: any) => void;
-	private progressCallback: ProgressCallback;
 
 	constructor() {
 		let captured: any;
-		super((c, e, p) => {
-			captured = { c, e, p };
+		super((c, e) => {
+			captured = { c, e };
 		}, () => this.oncancel());
 		this.canceled = false;
 		this.completeCallback = captured.c;
 		this.errorCallback = captured.e;
-		this.progressCallback = captured.p;
 	}
 
 	public complete(value: T) {
@@ -37,10 +35,6 @@ export class DeferredTPromise<T> extends TPromise<T> {
 		this.errorCallback(err);
 	}
 
-	public progress(p: any) {
-		this.progressCallback(p);
-	}
-
 	private oncancel(): void {
 		this.canceled = true;
 	}
diff --git a/src/vs/base/test/common/winjs.promise.test.ts b/src/vs/base/test/common/winjs.promise.test.ts
new file mode 100644
index 00000000000..c8f0070d124
--- /dev/null
+++ b/src/vs/base/test/common/winjs.promise.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 * as assert from 'assert';
+import * as winjs from 'vs/base/common/winjs.base';
+
+suite('WinJS and ES6 Promises', function () {
+
+	test('Promise.resolve', function () {
+		let resolveTPromise;
+		const tPromise = new winjs.Promise((c, e) => {
+			resolveTPromise = c;
+		});
+
+		const es6Promise = Promise.resolve(tPromise);
+
+		const done = es6Promise.then(function (result) {
+			assert.equal(result, 'passed');
+		});
+
+		resolveTPromise('passed');
+
+		return done;
+	});
+
+	test('new Promise', function () {
+		let resolveTPromise;
+		const tPromise = new winjs.Promise((c, e) => {
+			resolveTPromise = c;
+		});
+
+		const es6Promise = new Promise(function (c, e) {
+			c(tPromise);
+		});
+
+		const done = es6Promise.then(function (result) {
+			assert.equal(result, 'passed');
+		});
+
+		resolveTPromise('passed');
+
+		return done;
+	});
+
+	test('1. Uncaught TypeError: this._state.then is not a function', () => {
+		let p1 = winjs.Promise.wrap<number>(new Promise<number>(function (c, e) { c(1); }));
+		Promise.all([p1]);
+	});
+
+	test('2. Uncaught TypeError: this._state.then is not a function', () => {
+		let p1 = winjs.Promise.wrap<number>(new Promise<number>(function (c, e) { c(1); }));
+		let thenFunc = p1.then.bind(p1);
+		setTimeout(() => {
+			thenFunc(() => { });
+		}, 0);
+	});
+
+	test('3. Uncaught TypeError: this._state.then is not a function', () => {
+		let c;
+		let p1 = new winjs.Promise(function (_c, e) { c = _c; });
+		let thenFunc = p1.then.bind(p1);
+		setTimeout(() => {
+			c(1);
+			thenFunc(() => { });
+		}, 0);
+	});
+});
diff --git a/src/vs/code/electron-browser/issue/issueReporter.js b/src/vs/code/electron-browser/issue/issueReporter.js
index 5b246f9491b..53abd748d7b 100644
--- a/src/vs/code/electron-browser/issue/issueReporter.js
+++ b/src/vs/code/electron-browser/issue/issueReporter.js
@@ -45,6 +45,8 @@ function readFile(file) {
 	});
 }
 
+const writeFile = (file, content) => new Promise((c, e) => fs.writeFile(file, content, 'utf8', err => err ? e(err) : c()));
+
 function main() {
 	const args = parseURLQueryArgs();
 	const configuration = JSON.parse(args['config'] || '{}') || {};
@@ -127,8 +129,15 @@ function main() {
 				let json = JSON.parse(content);
 				bundles[bundle] = json;
 				cb(undefined, json);
-			})
-			.catch(cb);
+			}).catch((error) => {
+				try {
+					if (nlsConfig._corruptedFile) {
+						writeFile(nlsConfig._corruptedFile, 'corrupted').catch(function (error) { console.error(error); });
+					}
+				} finally {
+					cb(error, undefined);
+				}
+			});
 		};
 	}
 
diff --git a/src/vs/code/electron-browser/processExplorer/processExplorer.js b/src/vs/code/electron-browser/processExplorer/processExplorer.js
index 1fdb4bb8296..0a798fb876d 100644
--- a/src/vs/code/electron-browser/processExplorer/processExplorer.js
+++ b/src/vs/code/electron-browser/processExplorer/processExplorer.js
@@ -45,6 +45,8 @@ function readFile(file) {
 	});
 }
 
+const writeFile = (file, content) => new Promise((c, e) => fs.writeFile(file, content, 'utf8', err => err ? e(err) : c()));
+
 function main() {
 	const args = parseURLQueryArgs();
 	const configuration = JSON.parse(args['config'] || '{}') || {};
@@ -102,8 +104,15 @@ function main() {
 				let json = JSON.parse(content);
 				bundles[bundle] = json;
 				cb(undefined, json);
-			})
-			.catch(cb);
+			}).catch((error) => {
+				try {
+					if (nlsConfig._corruptedFile) {
+						writeFile(nlsConfig._corruptedFile, 'corrupted').catch(function (error) { console.error(error); });
+					}
+				} finally {
+					cb(error, undefined);
+				}
+			});
 		};
 	}
 
diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcess.js b/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
index 98d6e852940..d7dd08b4e3d 100644
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
@@ -53,6 +53,8 @@ function readFile(file) {
 	});
 }
 
+const writeFile = (file, content) => new Promise((c, e) => fs.writeFile(file, content, 'utf8', err => err ? e(err) : c()));
+
 function main() {
 	const args = parseURLQueryArgs();
 	const configuration = JSON.parse(args['config'] || '{}') || {};
@@ -111,8 +113,15 @@ function main() {
 				let json = JSON.parse(content);
 				bundles[bundle] = json;
 				cb(undefined, json);
-			})
-				.catch(cb);
+			}).catch((error) => {
+				try {
+					if (nlsConfig._corruptedFile) {
+						writeFile(nlsConfig._corruptedFile, 'corrupted').catch(function (error) { console.error(error); });
+					}
+				} finally {
+					cb(error, undefined);
+				}
+			});
 		};
 	}
 
diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
index 58473214eeb..97f712452c9 100644
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
@@ -42,6 +42,7 @@ import { ILocalizationsService } from 'vs/platform/localizations/common/localiza
 import { LocalizationsChannel } from 'vs/platform/localizations/common/localizationsIpc';
 import { DialogChannelClient } from 'vs/platform/dialogs/common/dialogIpc';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 
 export interface ISharedProcessConfiguration {
 	readonly machineId: string;
@@ -61,11 +62,13 @@ const eventPrefix = 'monacoworkbench';
 
 function main(server: Server, initData: ISharedProcessInitData, configuration: ISharedProcessConfiguration): void {
 	const services = new ServiceCollection();
+	const disposables: IDisposable[] = [];
+	process.once('exit', () => dispose(disposables));
 
 	const environmentService = new EnvironmentService(initData.args, process.execPath);
-	const logLevelClient = new LogLevelSetterChannelClient(server.getChannel('loglevel', { route: () => 'main' }));
+	const logLevelClient = new LogLevelSetterChannelClient(server.getChannel('loglevel', { routeCall: () => 'main', routeEvent: () => 'main' }));
 	const logService = new FollowerLogService(logLevelClient, createSpdLogService('sharedprocess', initData.logLevel, environmentService.logsPath));
-	process.once('exit', () => logService.dispose());
+	disposables.push(logService);
 
 	logService.info('main', JSON.stringify(configuration));
 
@@ -74,14 +77,18 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
 	services.set(IConfigurationService, new SyncDescriptor(ConfigurationService));
 	services.set(IRequestService, new SyncDescriptor(RequestService));
 
-	const windowsChannel = server.getChannel('windows', { route: () => 'main' });
+	const windowsChannel = server.getChannel('windows', { routeCall: () => 'main', routeEvent: () => 'main' });
 	const windowsService = new WindowsChannelClient(windowsChannel);
 	services.set(IWindowsService, windowsService);
 
 	const activeWindowManager = new ActiveWindowManager(windowsService);
 	const dialogChannel = server.getChannel('dialog', {
-		route: () => {
-			logService.info('Routing dialog request to the client', activeWindowManager.activeClientId);
+		routeCall: () => {
+			logService.info('Routing dialog call request to the client', activeWindowManager.activeClientId);
+			return activeWindowManager.activeClientId;
+		},
+		routeEvent: () => {
+			logService.info('Routing dialog listen request to the client', activeWindowManager.activeClientId);
 			return activeWindowManager.activeClientId;
 		}
 	});
@@ -98,7 +105,7 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
 
 		// It is important to dispose the AI adapter properly because
 		// only then they flush remaining data.
-		process.once('exit', () => appenders.forEach(a => a.dispose()));
+		disposables.push(...appenders);
 
 		const appender = combinedAppender(...appenders);
 		server.registerChannel('telemetryAppender', new TelemetryAppenderChannel(appender));
@@ -138,6 +145,7 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
 			server.registerChannel('localizations', localizationsChannel);
 
 			createSharedProcessContributions(instantiationService2);
+			disposables.push(extensionManagementService as ExtensionManagementService);
 		});
 	});
 }
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index aebb464f8d2..f2a7d0cae04 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { app, ipcMain as ipc } from 'electron';
+import { app, ipcMain as ipc, systemPreferences } from 'electron';
 import * as platform from 'vs/base/common/platform';
 import { WindowsManager } from 'vs/code/electron-main/windows';
 import { IWindowsService, OpenContext, ActiveWindowManager } from 'vs/platform/windows/common/windows';
@@ -85,7 +85,7 @@ export class CodeApplication {
 		@ILogService private logService: ILogService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@ILifecycleService private lifecycleService: ILifecycleService,
-		@IConfigurationService configurationService: ConfigurationService,
+		@IConfigurationService private configurationService: ConfigurationService,
 		@IStateService private stateService: IStateService,
 		@IHistoryMainService private historyMainService: IHistoryMainService
 	) {
@@ -99,6 +99,7 @@ export class CodeApplication {
 		// We handle uncaught exceptions here to prevent electron from opening a dialog to the user
 		errors.setUnexpectedErrorHandler(err => this.onUnexpectedError(err));
 		process.on('uncaughtException', err => this.onUnexpectedError(err));
+		process.on('unhandledRejection', (reason: any, promise: Promise<any>) => errors.onUnexpectedError(reason));
 
 		app.on('will-quit', () => {
 			this.logService.trace('App#will-quit: disposing resources');
@@ -261,7 +262,7 @@ export class CodeApplication {
 		}
 	}
 
-	public startup(): TPromise<void> {
+	startup(): TPromise<void> {
 		this.logService.debug('Starting VS Code');
 		this.logService.debug(`from: ${this.environmentService.appRoot}`);
 		this.logService.debug('args:', this.environmentService.args);
@@ -274,6 +275,20 @@ export class CodeApplication {
 			app.setAppUserModelId(product.win32AppUserModelId);
 		}
 
+		// Fix native tabs on macOS 10.13
+		// macOS enables a compatibility patch for any bundle ID beginning with
+		// "com.microsoft.", which breaks native tabs for VS Code when using this
+		// identifier (from the official build).
+		// Explicitly opt out of the patch here before creating any windows.
+		// See: https://github.com/Microsoft/vscode/issues/35361#issuecomment-399794085
+		try {
+			if (platform.isMacintosh && this.configurationService.getValue<boolean>('window.nativeTabs') === true && !systemPreferences.getUserDefault('NSUseImprovedLayoutPass', 'boolean')) {
+				systemPreferences.setUserDefault('NSUseImprovedLayoutPass', 'boolean', true as any);
+			}
+		} catch (error) {
+			this.logService.error(error);
+		}
+
 		// Create Electron IPC Server
 		this.electronIpcServer = new ElectronIPCServer();
 
@@ -411,7 +426,8 @@ export class CodeApplication {
 
 		// Create a URL handler which forwards to the last active window
 		const activeWindowManager = new ActiveWindowManager(windowsService);
-		const urlHandlerChannel = this.electronIpcServer.getChannel('urlHandler', { route: () => activeWindowManager.activeClientId });
+		const route = () => activeWindowManager.activeClientId;
+		const urlHandlerChannel = this.electronIpcServer.getChannel('urlHandler', { routeCall: route, routeEvent: route });
 		const multiplexURLHandler = new URLHandlerChannelClient(urlHandlerChannel);
 
 		// On Mac, Code can be running without any open windows, so we must create a window to handle urls,
@@ -420,7 +436,7 @@ export class CodeApplication {
 			const environmentService = accessor.get(IEnvironmentService);
 
 			urlService.registerHandler({
-				async handleURL(uri: URI): TPromise<boolean> {
+				handleURL(uri: URI): TPromise<boolean> {
 					if (windowsMainService.getWindowCount() === 0) {
 						const cli = { ...environmentService.args, goto: true };
 						const [window] = windowsMainService.open({ context: OpenContext.API, cli, forceEmpty: true });
@@ -428,7 +444,7 @@ export class CodeApplication {
 						return window.ready().then(() => urlService.open(uri));
 					}
 
-					return false;
+					return TPromise.as(false);
 				}
 			});
 		}
diff --git a/src/vs/code/electron-main/launch.ts b/src/vs/code/electron-main/launch.ts
index c0e2ce460e0..d1781a1a89b 100644
--- a/src/vs/code/electron-main/launch.ts
+++ b/src/vs/code/electron-main/launch.ts
@@ -20,6 +20,7 @@ import { Schemas } from 'vs/base/common/network';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import URI from 'vs/base/common/uri';
 import { BrowserWindow } from 'electron';
+import { Event } from 'vs/base/common/event';
 
 export const ID = 'launchService';
 export const ILaunchService = createDecorator<ILaunchService>(ID);
@@ -79,7 +80,11 @@ export class LaunchChannel implements ILaunchChannel {
 
 	constructor(private service: ILaunchService) { }
 
-	public call(command: string, arg: any): TPromise<any> {
+	listen<T>(event: string): Event<T> {
+		throw new Error('No event found');
+	}
+
+	call(command: string, arg: any): TPromise<any> {
 		switch (command) {
 			case 'start':
 				const { args, userEnv } = arg as IStartArguments;
@@ -105,19 +110,19 @@ export class LaunchChannelClient implements ILaunchService {
 
 	constructor(private channel: ILaunchChannel) { }
 
-	public start(args: ParsedArgs, userEnv: IProcessEnvironment): TPromise<void> {
+	start(args: ParsedArgs, userEnv: IProcessEnvironment): TPromise<void> {
 		return this.channel.call('start', { args, userEnv });
 	}
 
-	public getMainProcessId(): TPromise<number> {
+	getMainProcessId(): TPromise<number> {
 		return this.channel.call('get-main-process-id', null);
 	}
 
-	public getMainProcessInfo(): TPromise<IMainProcessInfo> {
+	getMainProcessInfo(): TPromise<IMainProcessInfo> {
 		return this.channel.call('get-main-process-info', null);
 	}
 
-	public getLogsPath(): TPromise<string> {
+	getLogsPath(): TPromise<string> {
 		return this.channel.call('get-logs-path', null);
 	}
 }
@@ -135,7 +140,7 @@ export class LaunchService implements ILaunchService {
 		@IConfigurationService private readonly configurationService: IConfigurationService
 	) { }
 
-	public start(args: ParsedArgs, userEnv: IProcessEnvironment): TPromise<void> {
+	start(args: ParsedArgs, userEnv: IProcessEnvironment): TPromise<void> {
 		this.logService.trace('Received data from other instance: ', args, userEnv);
 
 		const urlsToOpen = parseOpenUrl(args);
@@ -237,13 +242,13 @@ export class LaunchService implements ILaunchService {
 		return TPromise.as(null);
 	}
 
-	public getMainProcessId(): TPromise<number> {
+	getMainProcessId(): TPromise<number> {
 		this.logService.trace('Received request for process ID from other instance.');
 
 		return TPromise.as(process.pid);
 	}
 
-	public getMainProcessInfo(): TPromise<IMainProcessInfo> {
+	getMainProcessInfo(): TPromise<IMainProcessInfo> {
 		this.logService.trace('Received request for main process info from other instance.');
 
 		const windows: IWindowInfo[] = [];
@@ -263,7 +268,7 @@ export class LaunchService implements ILaunchService {
 		} as IMainProcessInfo);
 	}
 
-	public getLogsPath(): TPromise<string> {
+	getLogsPath(): TPromise<string> {
 		this.logService.trace('Received request for logs path from other instance.');
 
 		return TPromise.as(this.environmentService.logsPath);
diff --git a/src/vs/code/electron-main/logUploader.ts b/src/vs/code/electron-main/logUploader.ts
index cf76bbbcd1b..7142aa19a4c 100644
--- a/src/vs/code/electron-main/logUploader.ts
+++ b/src/vs/code/electron-main/logUploader.ts
@@ -37,7 +37,7 @@ export async function uploadLogs(
 	channel: ILaunchChannel,
 	requestService: IRequestService,
 	environmentService: IEnvironmentService
-): TPromise<any> {
+): Promise<any> {
 	const endpoint = Endpoint.getFromProduct();
 	if (!endpoint) {
 		console.error(localize('invalidEndpoint', 'Invalid log uploader endpoint'));
@@ -75,7 +75,7 @@ async function postLogs(
 	endpoint: Endpoint,
 	outZip: string,
 	requestService: IRequestService
-): TPromise<PostResult> {
+): Promise<PostResult> {
 	const dotter = setInterval(() => console.log('.'), 5000);
 	let result: IRequestContext;
 	try {
@@ -152,4 +152,4 @@ function doZip(
 		default:
 			return cp.execFile('zip', ['-r', outZip, '.'], { cwd: logsPath }, callback);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
index 632ecd517ab..4349d32b4f8 100644
--- a/src/vs/code/electron-main/main.ts
+++ b/src/vs/code/electron-main/main.ts
@@ -81,7 +81,7 @@ function createServices(args: ParsedArgs, bufferLogService: BufferLogService): I
 /**
  * Cleans up older logs, while keeping the 10 most recent ones.
 */
-async function cleanupOlderLogs(environmentService: EnvironmentService): TPromise<void> {
+async function cleanupOlderLogs(environmentService: EnvironmentService): Promise<void> {
 	const currentLog = path.basename(environmentService.logsPath);
 	const logsRoot = path.dirname(environmentService.logsPath);
 	const children = await readdir(logsRoot);
diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts
index 5a386043068..c1a4ddf0b1a 100644
--- a/src/vs/code/electron-main/menus.ts
+++ b/src/vs/code/electron-main/menus.ts
@@ -385,7 +385,8 @@ export class CodeMenu {
 		const saveAllFiles = this.createMenuItem(nls.localize({ key: 'miSaveAll', comment: ['&& denotes a mnemonic'] }, "Save A&&ll"), 'workbench.action.files.saveAll');
 
 		const autoSaveEnabled = [AutoSaveConfiguration.AFTER_DELAY, AutoSaveConfiguration.ON_FOCUS_CHANGE, AutoSaveConfiguration.ON_WINDOW_CHANGE].some(s => this.currentAutoSaveSetting === s);
-		const autoSave = new MenuItem(this.likeAction('vscode.toggleAutoSave', { label: this.mnemonicLabel(nls.localize('miAutoSave', "Auto Save")), type: 'checkbox', checked: autoSaveEnabled, enabled: this.windowsMainService.getWindowCount() > 0, click: () => this.windowsMainService.sendToFocused('vscode.toggleAutoSave') }, false));
+
+		const autoSave = this.createMenuItem(this.mnemonicLabel(nls.localize('miAutoSave', "Auto Save")), 'workbench.action.toggleAutoSave', this.windowsMainService.getWindowCount() > 0, autoSaveEnabled);
 
 		const preferences = this.getPreferencesMenu();
 
@@ -658,7 +659,7 @@ export class CodeMenu {
 		// Panels
 		const output = this.createMenuItem(nls.localize({ key: 'miToggleOutput', comment: ['&& denotes a mnemonic'] }, "&&Output"), 'workbench.action.output.toggleOutput');
 		const debugConsole = this.createMenuItem(nls.localize({ key: 'miToggleDebugConsole', comment: ['&& denotes a mnemonic'] }, "De&&bug Console"), 'workbench.debug.action.toggleRepl');
-		const integratedTerminal = this.createMenuItem(nls.localize({ key: 'miToggleIntegratedTerminal', comment: ['&& denotes a mnemonic'] }, "&&Integrated Terminal"), 'workbench.action.terminal.toggleTerminal');
+		const terminal = this.createMenuItem(nls.localize({ key: 'miToggleTerminal', comment: ['&& denotes a mnemonic'] }, "&&Terminal"), 'workbench.action.terminal.toggleTerminal');
 		const problems = this.createMenuItem(nls.localize({ key: 'miMarker', comment: ['&& denotes a mnemonic'] }, "&&Problems"), 'workbench.actions.view.problems');
 
 		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 }));
@@ -759,7 +760,7 @@ export class CodeMenu {
 			output,
 			problems,
 			debugConsole,
-			integratedTerminal,
+			terminal,
 			__separator__(),
 			fullscreen,
 			toggleZenMode,
@@ -868,25 +869,11 @@ export class CodeMenu {
 		const newTerminal = this.createMenuItem(nls.localize({ key: 'miNewTerminal', comment: ['&& denotes a mnemonic'] }, "&&New Terminal"), 'workbench.action.terminal.new');
 		const splitTerminal = this.createMenuItem(nls.localize({ key: 'miSplitTerminal', comment: ['&& denotes a mnemonic'] }, "&&Split Terminal"), 'workbench.action.terminal.split');
 		const killTerminal = this.createMenuItem(nls.localize({ key: 'miKillTerminal', comment: ['&& denotes a mnemonic'] }, "&&Kill Terminal"), 'workbench.action.terminal.kill');
-
 		const clear = this.createMenuItem(nls.localize({ key: 'miClear', comment: ['&& denotes a mnemonic'] }, "&&Clear"), 'workbench.action.terminal.clear');
-		// const deleteWordLeft = this.createMenuItem(nls.localize({ key: 'miDeleteWordLeft', comment: ['&& denotes a mnemonic'] }, "Delete Word To &&Left"), 'workbench.action.terminal.deleteWordLeft');
-		// const deleteWordRight = this.createMenuItem(nls.localize({ key: 'miDeleteWordRight', comment: ['&& denotes a mnemonic'] }, "Delete Word To &&Right"), 'workbench.action.terminal.deleteWordRight');
-		// const moveToLineStart = this.createMenuItem(nls.localize({ key: 'miMoveToLineStart', comment: ['&& denotes a mnemonic'] }, "Move to Line Start"), 'workbench.action.terminal.moveToLineStart');
-		// const moveToLineEnd = this.createMenuItem(nls.localize({ key: 'miMoveToLineEnd', comment: ['&& denotes a mnemonic'] }, "Move to Line &&End"), 'workbench.action.terminal.moveToLineEnd');
-
 		const runActiveFile = this.createMenuItem(nls.localize({ key: 'miRunActiveFile', comment: ['&& denotes a mnemonic'] }, "Run &&Active File"), 'workbench.action.terminal.runActiveFile');
 		const runSelectedText = this.createMenuItem(nls.localize({ key: 'miRunSelectedText', comment: ['&& denotes a mnemonic'] }, "Run &&Selected Text"), 'workbench.action.terminal.runSelectedText');
-
-		// const scrollUp = this.createMenuItem(nls.localize({ key: 'miScrollUp', comment: ['&& denotes a mnemonic'] }, "Scroll Up"), 'workbench.action.terminal.scrollUp');
-		// const scrollDown = this.createMenuItem(nls.localize({ key: 'miScrollDown', comment: ['&& denotes a mnemonic'] }, "Scroll Down"), 'workbench.action.terminal.scrollDown');
-		// const scrollUpPage = this.createMenuItem(nls.localize({ key: 'miScrollUpPage', comment: ['&& denotes a mnemonic'] }, "Scroll Up Page"), 'workbench.action.terminal.scrollUpPage');
-		// const scrollDownPage = this.createMenuItem(nls.localize({ key: 'miScrollDownPage', comment: ['&& denotes a mnemonic'] }, "Scroll Down Page"), 'workbench.action.terminal.scrollDownPage');
-		// const scrollToTop = this.createMenuItem(nls.localize({ key: 'miScrollToTop', comment: ['&& denotes a mnemonic'] }, "Scroll To Top"), 'workbench.action.terminal.scrollToTop');
-		// const scrollToBottom = this.createMenuItem(nls.localize({ key: 'miScrollToBottom', comment: ['&& denotes a mnemonic'] }, "Scroll To Bottom"), 'workbench.action.terminal.scrollToBottom');
 		const scrollToPreviousCommand = this.createMenuItem(nls.localize({ key: 'miScrollToPreviousCommand', comment: ['&& denotes a mnemonic'] }, "Scroll To Previous Command"), 'workbench.action.terminal.scrollToPreviousCommand');
 		const scrollToNextCommand = this.createMenuItem(nls.localize({ key: 'miScrollToNextCommand', comment: ['&& denotes a mnemonic'] }, "Scroll To Next Command"), 'workbench.action.terminal.scrollToNextCommand');
-
 		const selectToPreviousCommand = this.createMenuItem(nls.localize({ key: 'miSelectToPreviousCommand', comment: ['&& denotes a mnemonic'] }, "Select To Previous Command"), 'workbench.action.terminal.selectToPreviousCommand');
 		const selectToNextCommand = this.createMenuItem(nls.localize({ key: 'miSelectToNextCommand', comment: ['&& denotes a mnemonic'] }, "Select To Next Command"), 'workbench.action.terminal.selectToNextCommand');
 
@@ -896,36 +883,14 @@ export class CodeMenu {
 			killTerminal,
 			__separator__(),
 			clear,
-		];
-		// if (!isWindows) {
-		// 	menuItems.push(
-		// 		deleteWordLeft,
-		// 		deleteWordRight,
-		// 	);
-
-		// }
-		// if (isMacintosh) {
-		// 	menuItems.push(
-		// 		moveToLineStart,
-		// 		moveToLineEnd
-		// 	);
-		// }
-		menuItems.push(
 			runActiveFile,
 			runSelectedText,
 			__separator__(),
-			// scrollUp,
-			// scrollDown,
-			// scrollUpPage,
-			// scrollDownPage,
-			// scrollToTop,
-			// scrollToBottom,
 			scrollToPreviousCommand,
 			scrollToNextCommand,
-			// __separator__(),
 			selectToPreviousCommand,
 			selectToNextCommand
-		);
+		];
 
 		menuItems.forEach(item => terminalMenu.append(item));
 	}
@@ -1015,7 +980,7 @@ export class CodeMenu {
 		const w = this.windowsMainService.getFocusedWindow();
 		if (w && w.win) {
 			const contents = w.win.webContents;
-			if (w.hasHiddenTitleBarStyle() && !w.win.isFullScreen() && !contents.isDevToolsOpened()) {
+			if (isMacintosh && w.hasHiddenTitleBarStyle() && !w.win.isFullScreen() && !contents.isDevToolsOpened()) {
 				contents.openDevTools({ mode: 'undocked' }); // due to https://github.com/electron/electron/issues/3647
 			} else {
 				contents.toggleDevTools();
diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
index 5dba67940e6..5c70b90de69 100644
--- a/src/vs/code/electron-main/window.ts
+++ b/src/vs/code/electron-main/window.ts
@@ -55,8 +55,8 @@ interface ITouchBarSegment extends Electron.SegmentedControlSegment {
 
 export class CodeWindow implements ICodeWindow {
 
-	public static readonly themeStorageKey = 'theme';
-	public static readonly themeBackgroundStorageKey = 'themeBackground';
+	static readonly themeStorageKey = 'theme';
+	static readonly themeBackgroundStorageKey = 'themeBackground';
 
 	private static readonly DEFAULT_BG_LIGHT = '#FFFFFF';
 	private static readonly DEFAULT_BG_DARK = '#1E1E1E';
@@ -229,35 +229,35 @@ export class CodeWindow implements ICodeWindow {
 		this._lastFocusTime = Date.now(); // since we show directly, we need to set the last focus time too
 	}
 
-	public hasHiddenTitleBarStyle(): boolean {
+	hasHiddenTitleBarStyle(): boolean {
 		return this.hiddenTitleBarStyle;
 	}
 
-	public get isExtensionDevelopmentHost(): boolean {
+	get isExtensionDevelopmentHost(): boolean {
 		return !!this.config.extensionDevelopmentPath;
 	}
 
-	public get isExtensionTestHost(): boolean {
+	get isExtensionTestHost(): boolean {
 		return !!this.config.extensionTestsPath;
 	}
 
-	public get extensionDevelopmentPath(): string {
+	get extensionDevelopmentPath(): string {
 		return this.config.extensionDevelopmentPath;
 	}
 
-	public get config(): IWindowConfiguration {
+	get config(): IWindowConfiguration {
 		return this.currentConfig;
 	}
 
-	public get id(): number {
+	get id(): number {
 		return this._id;
 	}
 
-	public get win(): Electron.BrowserWindow {
+	get win(): Electron.BrowserWindow {
 		return this._win;
 	}
 
-	public setRepresentedFilename(filename: string): void {
+	setRepresentedFilename(filename: string): void {
 		if (isMacintosh) {
 			this.win.setRepresentedFilename(filename);
 		} else {
@@ -265,7 +265,7 @@ export class CodeWindow implements ICodeWindow {
 		}
 	}
 
-	public getRepresentedFilename(): string {
+	getRepresentedFilename(): string {
 		if (isMacintosh) {
 			return this.win.getRepresentedFilename();
 		}
@@ -273,7 +273,7 @@ export class CodeWindow implements ICodeWindow {
 		return this.representedFilename;
 	}
 
-	public focus(): void {
+	focus(): void {
 		if (!this._win) {
 			return;
 		}
@@ -285,23 +285,23 @@ export class CodeWindow implements ICodeWindow {
 		this._win.focus();
 	}
 
-	public get lastFocusTime(): number {
+	get lastFocusTime(): number {
 		return this._lastFocusTime;
 	}
 
-	public get backupPath(): string {
+	get backupPath(): string {
 		return this.currentConfig ? this.currentConfig.backupPath : void 0;
 	}
 
-	public get openedWorkspace(): IWorkspaceIdentifier {
+	get openedWorkspace(): IWorkspaceIdentifier {
 		return this.currentConfig ? this.currentConfig.workspace : void 0;
 	}
 
-	public get openedFolderPath(): string {
+	get openedFolderPath(): string {
 		return this.currentConfig ? this.currentConfig.folderPath : void 0;
 	}
 
-	public setReady(): void {
+	setReady(): void {
 		this._readyState = ReadyState.READY;
 
 		// inform all waiting promises that we are ready now
@@ -310,7 +310,7 @@ export class CodeWindow implements ICodeWindow {
 		}
 	}
 
-	public ready(): TPromise<ICodeWindow> {
+	ready(): TPromise<ICodeWindow> {
 		return new TPromise<ICodeWindow>((c) => {
 			if (this._readyState === ReadyState.READY) {
 				return c(this);
@@ -321,7 +321,7 @@ export class CodeWindow implements ICodeWindow {
 		});
 	}
 
-	public get readyState(): ReadyState {
+	get readyState(): ReadyState {
 		return this._readyState;
 	}
 
@@ -517,7 +517,7 @@ export class CodeWindow implements ICodeWindow {
 		});
 	}
 
-	public load(config: IWindowConfiguration, isReload?: boolean, disableExtensions?: boolean): void {
+	load(config: IWindowConfiguration, isReload?: boolean, disableExtensions?: boolean): void {
 
 		// If this is the first time the window is loaded, we associate the paths
 		// directly with the window because we assume the loading will just work
@@ -574,7 +574,7 @@ export class CodeWindow implements ICodeWindow {
 		}
 	}
 
-	public reload(configuration?: IWindowConfiguration, cli?: ParsedArgs): void {
+	reload(configuration?: IWindowConfiguration, cli?: ParsedArgs): void {
 
 		// If config is not provided, copy our current one
 		if (!configuration) {
@@ -678,7 +678,7 @@ export class CodeWindow implements ICodeWindow {
 		return background;
 	}
 
-	public serializeWindowState(): IWindowState {
+	serializeWindowState(): IWindowState {
 		if (!this._win) {
 			return defaultWindowState();
 		}
@@ -834,14 +834,14 @@ export class CodeWindow implements ICodeWindow {
 		return null;
 	}
 
-	public getBounds(): Electron.Rectangle {
+	getBounds(): Electron.Rectangle {
 		const pos = this._win.getPosition();
 		const dimension = this._win.getSize();
 
 		return { x: pos[0], y: pos[1], width: dimension[0], height: dimension[1] };
 	}
 
-	public toggleFullScreen(): void {
+	toggleFullScreen(): void {
 		const willBeFullScreen = !this._win.isFullScreen();
 
 		// set fullscreen flag on window
@@ -916,7 +916,7 @@ export class CodeWindow implements ICodeWindow {
 		}
 	}
 
-	public onWindowTitleDoubleClick(): void {
+	onWindowTitleDoubleClick(): void {
 
 		// Respect system settings on mac with regards to title click on windows title
 		if (isMacintosh) {
@@ -943,25 +943,25 @@ export class CodeWindow implements ICodeWindow {
 		}
 	}
 
-	public close(): void {
+	close(): void {
 		if (this._win) {
 			this._win.close();
 		}
 	}
 
-	public sendWhenReady(channel: string, ...args: any[]): void {
+	sendWhenReady(channel: string, ...args: any[]): void {
 		this.ready().then(() => {
 			this.send(channel, ...args);
 		});
 	}
 
-	public send(channel: string, ...args: any[]): void {
+	send(channel: string, ...args: any[]): void {
 		if (this._win) {
 			this._win.webContents.send(channel, ...args);
 		}
 	}
 
-	public updateTouchBar(groups: ISerializableCommandAction[][]): void {
+	updateTouchBar(groups: ISerializableCommandAction[][]): void {
 		if (!isMacintosh) {
 			return; // only supported on macOS
 		}
@@ -1033,7 +1033,7 @@ export class CodeWindow implements ICodeWindow {
 		return segments;
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		if (this.showTimeoutHandle) {
 			clearTimeout(this.showTimeoutHandle);
 		}
diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
index bc331038334..04d9d28c4ee 100644
--- a/src/vs/code/electron-main/windows.ts
+++ b/src/vs/code/electron-main/windows.ts
@@ -153,7 +153,7 @@ export class WindowsManager implements IWindowsMainService {
 		this.workspacesManager = new WorkspacesManager(workspacesMainService, backupMainService, environmentService, this);
 	}
 
-	public ready(initialUserEnv: IProcessEnvironment): void {
+	ready(initialUserEnv: IProcessEnvironment): void {
 		this.initialUserEnv = initialUserEnv;
 
 		this.registerListeners();
@@ -323,7 +323,7 @@ export class WindowsManager implements IWindowsMainService {
 		};
 	}
 
-	public open(openConfig: IOpenConfiguration): ICodeWindow[] {
+	open(openConfig: IOpenConfiguration): ICodeWindow[] {
 		openConfig = this.validateOpenConfig(openConfig);
 
 		let pathsToOpen = this.getPathsToOpen(openConfig);
@@ -1010,7 +1010,7 @@ export class WindowsManager implements IWindowsMainService {
 		return { openFolderInNewWindow, openFilesInNewWindow };
 	}
 
-	public openExtensionDevelopmentHostWindow(openConfig: IOpenConfiguration): void {
+	openExtensionDevelopmentHostWindow(openConfig: IOpenConfiguration): void {
 
 		// Reload an existing extension development host window on the same path
 		// We currently do not allow more than one extension development window
@@ -1286,7 +1286,7 @@ export class WindowsManager implements IWindowsMainService {
 		return state;
 	}
 
-	public reload(win: ICodeWindow, cli?: ParsedArgs): void {
+	reload(win: ICodeWindow, cli?: ParsedArgs): void {
 
 		// Only reload when the window has not vetoed this
 		this.lifecycleService.unload(win, UnloadReason.RELOAD).done(veto => {
@@ -1299,18 +1299,18 @@ export class WindowsManager implements IWindowsMainService {
 		});
 	}
 
-	public closeWorkspace(win: ICodeWindow): void {
+	closeWorkspace(win: ICodeWindow): void {
 		this.openInBrowserWindow({
 			cli: this.environmentService.args,
 			windowToUse: win
 		});
 	}
 
-	public saveAndEnterWorkspace(win: ICodeWindow, path: string): TPromise<IEnterWorkspaceResult> {
+	saveAndEnterWorkspace(win: ICodeWindow, path: string): TPromise<IEnterWorkspaceResult> {
 		return this.workspacesManager.saveAndEnterWorkspace(win, path).then(result => this.doEnterWorkspace(win, result));
 	}
 
-	public createAndEnterWorkspace(win: ICodeWindow, folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<IEnterWorkspaceResult> {
+	createAndEnterWorkspace(win: ICodeWindow, folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<IEnterWorkspaceResult> {
 		return this.workspacesManager.createAndEnterWorkspace(win, folders, path).then(result => this.doEnterWorkspace(win, result));
 	}
 
@@ -1325,7 +1325,7 @@ export class WindowsManager implements IWindowsMainService {
 		return result;
 	}
 
-	public pickWorkspaceAndOpen(options: INativeOpenDialogOptions): void {
+	pickWorkspaceAndOpen(options: INativeOpenDialogOptions): void {
 		this.workspacesManager.pickWorkspaceAndOpen(options);
 	}
 
@@ -1366,7 +1366,7 @@ export class WindowsManager implements IWindowsMainService {
 		}));
 	}
 
-	public focusLastActive(cli: ParsedArgs, context: OpenContext): ICodeWindow {
+	focusLastActive(cli: ParsedArgs, context: OpenContext): ICodeWindow {
 		const lastActive = this.getLastActiveWindow();
 		if (lastActive) {
 			lastActive.focus();
@@ -1378,15 +1378,15 @@ export class WindowsManager implements IWindowsMainService {
 		return this.open({ context, cli, forceEmpty: true })[0];
 	}
 
-	public getLastActiveWindow(): ICodeWindow {
+	getLastActiveWindow(): ICodeWindow {
 		return getLastActiveWindow(WindowsManager.WINDOWS);
 	}
 
-	public openNewWindow(context: OpenContext): ICodeWindow[] {
+	openNewWindow(context: OpenContext): ICodeWindow[] {
 		return this.open({ context, cli: this.environmentService.args, forceNewWindow: true, forceEmpty: true });
 	}
 
-	public waitForWindowCloseOrLoad(windowId: number): TPromise<void> {
+	waitForWindowCloseOrLoad(windowId: number): TPromise<void> {
 		return new TPromise<void>(c => {
 			function handler(id: number) {
 				if (id === windowId) {
@@ -1402,7 +1402,7 @@ export class WindowsManager implements IWindowsMainService {
 		});
 	}
 
-	public sendToFocused(channel: string, ...args: any[]): void {
+	sendToFocused(channel: string, ...args: any[]): void {
 		const focusedWindow = this.getFocusedWindow() || this.getLastActiveWindow();
 
 		if (focusedWindow) {
@@ -1410,7 +1410,7 @@ export class WindowsManager implements IWindowsMainService {
 		}
 	}
 
-	public sendToAll(channel: string, payload?: any, windowIdsToIgnore?: number[]): void {
+	sendToAll(channel: string, payload?: any, windowIdsToIgnore?: number[]): void {
 		WindowsManager.WINDOWS.forEach(w => {
 			if (windowIdsToIgnore && windowIdsToIgnore.indexOf(w.id) >= 0) {
 				return; // do not send if we are instructed to ignore it
@@ -1420,7 +1420,7 @@ export class WindowsManager implements IWindowsMainService {
 		});
 	}
 
-	public getFocusedWindow(): ICodeWindow {
+	getFocusedWindow(): ICodeWindow {
 		const win = BrowserWindow.getFocusedWindow();
 		if (win) {
 			return this.getWindowById(win.id);
@@ -1429,7 +1429,7 @@ export class WindowsManager implements IWindowsMainService {
 		return null;
 	}
 
-	public getWindowById(windowId: number): ICodeWindow {
+	getWindowById(windowId: number): ICodeWindow {
 		const res = WindowsManager.WINDOWS.filter(w => w.id === windowId);
 		if (res && res.length === 1) {
 			return res[0];
@@ -1438,11 +1438,11 @@ export class WindowsManager implements IWindowsMainService {
 		return null;
 	}
 
-	public getWindows(): ICodeWindow[] {
+	getWindows(): ICodeWindow[] {
 		return WindowsManager.WINDOWS;
 	}
 
-	public getWindowCount(): number {
+	getWindowCount(): number {
 		return WindowsManager.WINDOWS.length;
 	}
 
@@ -1510,15 +1510,15 @@ export class WindowsManager implements IWindowsMainService {
 		this._onWindowClose.fire(win.id);
 	}
 
-	public pickFileFolderAndOpen(options: INativeOpenDialogOptions): void {
+	pickFileFolderAndOpen(options: INativeOpenDialogOptions): void {
 		this.doPickAndOpen(options, true /* pick folders */, true /* pick files */);
 	}
 
-	public pickFolderAndOpen(options: INativeOpenDialogOptions): void {
+	pickFolderAndOpen(options: INativeOpenDialogOptions): void {
 		this.doPickAndOpen(options, true /* pick folders */, false /* pick files */);
 	}
 
-	public pickFileAndOpen(options: INativeOpenDialogOptions): void {
+	pickFileAndOpen(options: INativeOpenDialogOptions): void {
 		this.doPickAndOpen(options, false /* pick folders */, true /* pick files */);
 	}
 
@@ -1556,19 +1556,19 @@ export class WindowsManager implements IWindowsMainService {
 		this.dialogs.pickAndOpen(internalOptions);
 	}
 
-	public showMessageBox(options: Electron.MessageBoxOptions, win?: ICodeWindow): TPromise<IMessageBoxResult> {
+	showMessageBox(options: Electron.MessageBoxOptions, win?: ICodeWindow): TPromise<IMessageBoxResult> {
 		return this.dialogs.showMessageBox(options, win);
 	}
 
-	public showSaveDialog(options: Electron.SaveDialogOptions, win?: ICodeWindow): TPromise<string> {
+	showSaveDialog(options: Electron.SaveDialogOptions, win?: ICodeWindow): TPromise<string> {
 		return this.dialogs.showSaveDialog(options, win);
 	}
 
-	public showOpenDialog(options: Electron.OpenDialogOptions, win?: ICodeWindow): TPromise<string[]> {
+	showOpenDialog(options: Electron.OpenDialogOptions, win?: ICodeWindow): TPromise<string[]> {
 		return this.dialogs.showOpenDialog(options, win);
 	}
 
-	public quit(): void {
+	quit(): void {
 
 		// If the user selected to exit from an extension development host window, do not quit, but just
 		// close the window unless this is the last window that is opened.
@@ -1608,7 +1608,7 @@ class Dialogs {
 		this.noWindowDialogQueue = new Queue<any>();
 	}
 
-	public pickAndOpen(options: INativeOpenDialogOptions): void {
+	pickAndOpen(options: INativeOpenDialogOptions): void {
 		this.getFileOrFolderPaths(options).then(paths => {
 			const numberOfPaths = paths ? paths.length : 0;
 
@@ -1694,7 +1694,7 @@ class Dialogs {
 		return windowDialogQueue;
 	}
 
-	public showMessageBox(options: Electron.MessageBoxOptions, window?: ICodeWindow): TPromise<IMessageBoxResult> {
+	showMessageBox(options: Electron.MessageBoxOptions, window?: ICodeWindow): TPromise<IMessageBoxResult> {
 		return this.getDialogQueue(window).queue(() => {
 			return new TPromise((c, e) => {
 				dialog.showMessageBox(window ? window.win : void 0, options, (response: number, checkboxChecked: boolean) => {
@@ -1704,7 +1704,7 @@ class Dialogs {
 		});
 	}
 
-	public showSaveDialog(options: Electron.SaveDialogOptions, window?: ICodeWindow): TPromise<string> {
+	showSaveDialog(options: Electron.SaveDialogOptions, window?: ICodeWindow): TPromise<string> {
 
 		function normalizePath(path: string): string {
 			if (path && isMacintosh) {
@@ -1723,7 +1723,7 @@ class Dialogs {
 		});
 	}
 
-	public showOpenDialog(options: Electron.OpenDialogOptions, window?: ICodeWindow): TPromise<string[]> {
+	showOpenDialog(options: Electron.OpenDialogOptions, window?: ICodeWindow): TPromise<string[]> {
 
 		function normalizePaths(paths: string[]): string[] {
 			if (paths && paths.length > 0 && isMacintosh) {
@@ -1767,7 +1767,7 @@ class WorkspacesManager {
 	) {
 	}
 
-	public saveAndEnterWorkspace(window: ICodeWindow, path: string): TPromise<IEnterWorkspaceResult> {
+	saveAndEnterWorkspace(window: ICodeWindow, path: string): TPromise<IEnterWorkspaceResult> {
 		if (!window || !window.win || window.readyState !== ReadyState.READY || !window.openedWorkspace || !path || !this.isValidTargetWorkspacePath(window, path)) {
 			return TPromise.as(null); // return early if the window is not ready or disposed or does not have a workspace
 		}
@@ -1775,7 +1775,7 @@ class WorkspacesManager {
 		return this.doSaveAndOpenWorkspace(window, window.openedWorkspace, path);
 	}
 
-	public createAndEnterWorkspace(window: ICodeWindow, folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<IEnterWorkspaceResult> {
+	createAndEnterWorkspace(window: ICodeWindow, folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<IEnterWorkspaceResult> {
 		if (!window || !window.win || window.readyState !== ReadyState.READY) {
 			return TPromise.as(null); // return early if the window is not ready or disposed
 		}
@@ -1844,7 +1844,7 @@ class WorkspacesManager {
 		});
 	}
 
-	public pickWorkspaceAndOpen(options: INativeOpenDialogOptions): void {
+	pickWorkspaceAndOpen(options: INativeOpenDialogOptions): void {
 		const window = this.windowsMainService.getWindowById(options.windowId) || this.windowsMainService.getFocusedWindow() || this.windowsMainService.getLastActiveWindow();
 
 		this.windowsMainService.pickFileAndOpen({
@@ -1862,7 +1862,7 @@ class WorkspacesManager {
 		});
 	}
 
-	public promptToSaveUntitledWorkspace(window: ICodeWindow, workspace: IWorkspaceIdentifier): TPromise<boolean> {
+	promptToSaveUntitledWorkspace(window: ICodeWindow, workspace: IWorkspaceIdentifier): TPromise<boolean> {
 		enum ConfirmResult {
 			SAVE,
 			DONT_SAVE,
diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts
index 0c5a6074797..5dfbc3be44a 100644
--- a/src/vs/code/node/cli.ts
+++ b/src/vs/code/node/cli.ts
@@ -31,7 +31,7 @@ interface IMainCli {
 	main: (argv: ParsedArgs) => TPromise<void>;
 }
 
-export async function main(argv: string[]): TPromise<any> {
+export async function main(argv: string[]): Promise<any> {
 	let args: ParsedArgs;
 
 	try {
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index af389ec5dc2..396dd120f12 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -7,6 +7,7 @@ import { localize } from 'vs/nls';
 import product from 'vs/platform/node/product';
 import pkg from 'vs/platform/node/package';
 import * as path from 'path';
+import * as semver from 'semver';
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { sequence } from 'vs/base/common/async';
@@ -38,6 +39,8 @@ import { ILogService, getLogLevel } from 'vs/platform/log/common/log';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { CommandLineDialogService } from 'vs/platform/dialogs/node/dialogService';
+import { areSameExtensions, getGalleryExtensionIdFromLocal } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import Severity from 'vs/base/common/severity';
 
 const notFound = (id: string) => localize('notFound', "Extension '{0}' not found.", id);
 const notInstalled = (id: string) => localize('notInstalled', "Extension '{0}' is not installed.", id);
@@ -58,7 +61,8 @@ class Main {
 	constructor(
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@IExtensionManagementService private extensionManagementService: IExtensionManagementService,
-		@IExtensionGalleryService private extensionGalleryService: IExtensionGalleryService
+		@IExtensionGalleryService private extensionGalleryService: IExtensionGalleryService,
+		@IDialogService private dialogService: IDialogService
 	) { }
 
 	run(argv: ParsedArgs): TPromise<any> {
@@ -112,15 +116,8 @@ class Main {
 		const galleryTasks: Task[] = extensions
 			.filter(e => !/\.vsix$/i.test(e))
 			.map(id => () => {
-				return this.extensionManagementService.getInstalled(LocalExtensionType.User).then(installed => {
-					const isInstalled = installed.some(e => getId(e.manifest) === id);
-
-					if (isInstalled) {
-						console.log(localize('alreadyInstalled', "Extension '{0}' is already installed.", id));
-						return TPromise.as(null);
-					}
-
-					return this.extensionGalleryService.query({ names: [id], source: 'cli' })
+				return this.extensionManagementService.getInstalled(LocalExtensionType.User)
+					.then(installed => this.extensionGalleryService.query({ names: [id], source: 'cli' })
 						.then<IPager<IGalleryExtension>>(null, err => {
 							if (err.responseText) {
 								try {
@@ -130,7 +127,6 @@ class Main {
 									// noop
 								}
 							}
-
 							return TPromise.wrapError(err);
 						})
 						.then(result => {
@@ -140,29 +136,52 @@ class Main {
 								return TPromise.wrapError(new Error(`${notFound(id)}\n${useId}`));
 							}
 
-							console.log(localize('foundExtension', "Found '{0}' in the marketplace.", id));
-							console.log(localize('installing', "Installing..."));
+							const [installedExtension] = installed.filter(e => areSameExtensions({ id: getGalleryExtensionIdFromLocal(e) }, { id }));
+							if (installedExtension) {
+								const outdated = semver.gt(extension.version, installedExtension.manifest.version);
+								if (outdated) {
+									const updateMessage = localize('updateMessage', "Extension '{0}' v{1} is already installed, but a newer version {2} is available in the marketplace. Would you like to update?", id, installedExtension.manifest.version, extension.version);
+									return this.dialogService.show(Severity.Info, updateMessage, [localize('yes', "Yes"), localize('no', "No")])
+										.then(option => {
+											if (option === 0) {
+												return this.installFromGallery(id, extension);
+											}
+											console.log(localize('cancelInstall', "Cancelled installing Extension '{0}'.", id));
+											return TPromise.as(null);
+										});
 
-							return this.extensionManagementService.installFromGallery(extension)
-								.then(
-									() => console.log(localize('successInstall', "Extension '{0}' v{1} was successfully installed!", id, extension.version)),
-									error => {
-										if (isPromiseCanceledError(error)) {
-											console.log(localize('cancelVsixInstall', "Cancelled installing Extension '{0}'.", id));
-											return null;
-										} else {
-											return TPromise.wrapError(error);
-										}
-									});
-						});
-				});
+								} else {
+									console.log(localize('alreadyInstalled', "Extension '{0}' is already installed.", id));
+									return TPromise.as(null);
+								}
+							} else {
+								console.log(localize('foundExtension', "Found '{0}' in the marketplace.", id));
+								return this.installFromGallery(id, extension);
+							}
+
+						}));
 			});
 
 		return sequence([...vsixTasks, ...galleryTasks]);
 	}
 
+	private installFromGallery(id: string, extension: IGalleryExtension): TPromise<void> {
+		console.log(localize('installing', "Installing..."));
+		return this.extensionManagementService.installFromGallery(extension)
+			.then(
+				() => console.log(localize('successInstall', "Extension '{0}' v{1} was successfully installed!", id, extension.version)),
+				error => {
+					if (isPromiseCanceledError(error)) {
+						console.log(localize('cancelVsixInstall', "Cancelled installing Extension '{0}'.", id));
+						return null;
+					} else {
+						return TPromise.wrapError(error);
+					}
+				});
+	}
+
 	private uninstallExtension(extensions: string[]): TPromise<any> {
-		async function getExtensionId(extensionDescription: string): TPromise<string> {
+		async function getExtensionId(extensionDescription: string): Promise<string> {
 			if (!/\.vsix$/i.test(extensionDescription)) {
 				return extensionDescription;
 			}
@@ -175,7 +194,7 @@ class Main {
 		return sequence(extensions.map(extension => () => {
 			return getExtensionId(extension).then(id => {
 				return this.extensionManagementService.getInstalled(LocalExtensionType.User).then(installed => {
-					const [extension] = installed.filter(e => getId(e.manifest) === id);
+					const [extension] = installed.filter(e => areSameExtensions({ id: getGalleryExtensionIdFromLocal(e) }, { id }));
 
 					if (!extension) {
 						return TPromise.wrapError(new Error(`${notInstalled(id)}\n${useId}`));
diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts
index 7a327a52752..9774ab0405b 100644
--- a/src/vs/editor/common/config/commonEditorConfig.ts
+++ b/src/vs/editor/common/config/commonEditorConfig.ts
@@ -82,6 +82,7 @@ export abstract class CommonEditorConfiguration extends Disposable implements ed
 		this._rawOptions.scrollbar = objects.mixin({}, this._rawOptions.scrollbar || {});
 		this._rawOptions.minimap = objects.mixin({}, this._rawOptions.minimap || {});
 		this._rawOptions.find = objects.mixin({}, this._rawOptions.find || {});
+		this._rawOptions.hover = objects.mixin({}, this._rawOptions.hover || {});
 
 		this._validatedOptions = editorOptions.EditorOptionsValidator.validate(this._rawOptions, EDITOR_DEFAULTS);
 		this.editor = null;
@@ -352,6 +353,11 @@ const editorConfiguration: IConfigurationNode = {
 			'default': EDITOR_DEFAULTS.contribInfo.hover.delay,
 			'description': nls.localize('hover.delay', "Controls the delay after which to show the hover")
 		},
+		'editor.hover.sticky': {
+			'type': 'boolean',
+			'default': EDITOR_DEFAULTS.contribInfo.hover.sticky,
+			'description': nls.localize('hover.sticky', "Controls if the hover should remain visible when mouse is moved over it")
+		},
 		'editor.find.seedSearchStringFromSelection': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.contribInfo.find.seedSearchStringFromSelection,
@@ -526,7 +532,7 @@ const editorConfiguration: IConfigurationNode = {
 				nls.localize('snippetSuggestions.inline', "Show snippets suggestions with other suggestions."),
 				nls.localize('snippetSuggestions.none', "Do not show snippet suggestions."),
 			],
-			'default': EDITOR_DEFAULTS.contribInfo.snippetSuggestions,
+			'default': EDITOR_DEFAULTS.contribInfo.suggest.snippets,
 			'description': nls.localize('snippetSuggestions', "Controls whether snippets are shown with other suggestions and how they are sorted.")
 		},
 		'editor.emptySelectionClipboard': {
@@ -562,6 +568,16 @@ const editorConfiguration: IConfigurationNode = {
 			'minimum': 0,
 			'description': nls.localize('suggestLineHeight', "Line height for the suggest widget")
 		},
+		'editor.suggest.filterGraceful': {
+			type: 'boolean',
+			default: true,
+			description: nls.localize('suggest.filterGraceful', "Controls whether filtering and sorting suggestions accounts for small typos.")
+		},
+		'editor.suggest.snippetsPreventQuickSuggestions': {
+			type: 'boolean',
+			default: true,
+			description: nls.localize('suggest.snippetsPreventQuickSuggestions', "Control whether an active snippet prevents quick suggestions.")
+		},
 		'editor.selectionHighlight': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.contribInfo.selectionHighlight,
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 7e20281925b..14365ee9925 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -151,6 +151,22 @@ export interface IEditorHoverOptions {
 	 * Defaults to 300.
 	 */
 	delay?: number;
+	/**
+	 * Is the hover sticky such that it can be clicked and its contents selected?
+	 * Defaults to true.
+	 */
+	sticky?: boolean;
+}
+
+export interface ISuggestOptions {
+	/**
+	 * Enable graceful matching. Defaults to true.
+	 */
+	filterGraceful?: boolean;
+	/**
+	 * Prevent quick suggestions when a snippet is active. Defaults to true.
+	 */
+	snippetsPreventQuickSuggestions?: boolean;
 }
 
 /**
@@ -385,7 +401,7 @@ export interface IEditorOptions {
 	/**
 	 * Configure the editor's hover.
 	 */
-	hover?: boolean | IEditorHoverOptions;
+	hover?: IEditorHoverOptions;
 	/**
 	 * Enable detecting links and making them clickable.
 	 * Defaults to true.
@@ -420,6 +436,10 @@ export interface IEditorOptions {
 	 * Defaults to 'auto'. It is best to leave this to 'auto'.
 	 */
 	accessibilitySupport?: 'auto' | 'off' | 'on';
+	/**
+	 * Suggest options.
+	 */
+	suggest?: ISuggestOptions;
 	/**
 	 * Enable quick suggestions (shadow suggestions)
 	 * Defaults to true.
@@ -822,6 +842,13 @@ export interface InternalEditorFindOptions {
 export interface InternalEditorHoverOptions {
 	readonly enabled: boolean;
 	readonly delay: number;
+	readonly sticky: boolean;
+}
+
+export interface InternalSuggestOptions {
+	readonly filterGraceful: boolean;
+	readonly snippets: 'top' | 'bottom' | 'inline' | 'none';
+	readonly snippetsPreventQuickSuggestions: boolean;
 }
 
 export interface EditorWrappingInfo {
@@ -891,11 +918,12 @@ export interface EditorContribOptions {
 	readonly suggestOnTriggerCharacters: boolean;
 	readonly acceptSuggestionOnEnter: 'on' | 'smart' | 'off';
 	readonly acceptSuggestionOnCommitCharacter: boolean;
-	readonly snippetSuggestions: 'top' | 'bottom' | 'inline' | 'none';
+	// readonly snippetSuggestions: 'top' | 'bottom' | 'inline' | 'none';
 	readonly wordBasedSuggestions: boolean;
 	readonly suggestSelection: 'first' | 'recentlyUsed' | 'recentlyUsedByPrefix';
 	readonly suggestFontSize: number;
 	readonly suggestLineHeight: number;
+	readonly suggest: InternalSuggestOptions;
 	readonly selectionHighlight: boolean;
 	readonly occurrencesHighlight: boolean;
 	readonly codeLens: boolean;
@@ -1216,9 +1244,25 @@ export class InternalEditorOptions {
 		return (
 			a.enabled === b.enabled
 			&& a.delay === b.delay
+			&& a.sticky === b.sticky
 		);
 	}
 
+	/**
+	 * @internal
+	 */
+	private static _equalsSuggestOptions(a: InternalSuggestOptions, b: InternalSuggestOptions): any {
+		if (a === b) {
+			return true;
+		} else if (!a || !b) {
+			return false;
+		} else {
+			return a.filterGraceful === b.filterGraceful
+				&& a.snippets === b.snippets
+				&& a.snippetsPreventQuickSuggestions === b.snippetsPreventQuickSuggestions;
+		}
+	}
+
 	/**
 	 * @internal
 	 */
@@ -1254,11 +1298,11 @@ export class InternalEditorOptions {
 			&& a.suggestOnTriggerCharacters === b.suggestOnTriggerCharacters
 			&& a.acceptSuggestionOnEnter === b.acceptSuggestionOnEnter
 			&& a.acceptSuggestionOnCommitCharacter === b.acceptSuggestionOnCommitCharacter
-			&& a.snippetSuggestions === b.snippetSuggestions
 			&& a.wordBasedSuggestions === b.wordBasedSuggestions
 			&& a.suggestSelection === b.suggestSelection
 			&& a.suggestFontSize === b.suggestFontSize
 			&& a.suggestLineHeight === b.suggestLineHeight
+			&& this._equalsSuggestOptions(a.suggest, b.suggest)
 			&& a.selectionHighlight === b.selectionHighlight
 			&& a.occurrencesHighlight === b.occurrencesHighlight
 			&& a.codeLens === b.codeLens
@@ -1702,10 +1746,23 @@ export class EditorOptionsValidator {
 
 		return {
 			enabled: _boolean(opts.enabled, defaults.enabled),
-			delay: _clampedInt(opts.delay, defaults.delay, 0, 10000)
+			delay: _clampedInt(opts.delay, defaults.delay, 0, 10000),
+			sticky: _boolean(opts.sticky, defaults.sticky)
 		};
 	}
 
+	private static _sanitizeSuggestOpts(opts: IEditorOptions, defaults: InternalSuggestOptions): InternalSuggestOptions {
+		if (!opts.suggest) {
+			return defaults;
+		}
+		return {
+			filterGraceful: _boolean(opts.suggest.filterGraceful, defaults.filterGraceful),
+			snippets: _stringSet<'top' | 'bottom' | 'inline' | 'none'>(opts.snippetSuggestions, defaults.snippets, ['top', 'bottom', 'inline', 'none']),
+			snippetsPreventQuickSuggestions: _boolean(opts.suggest.snippetsPreventQuickSuggestions, defaults.filterGraceful),
+		};
+	}
+
+
 	private static _sanitizeViewInfo(opts: IEditorOptions, defaults: InternalEditorViewOptions): InternalEditorViewOptions {
 
 		let rulers: number[] = [];
@@ -1836,11 +1893,11 @@ export class EditorOptionsValidator {
 			suggestOnTriggerCharacters: _boolean(opts.suggestOnTriggerCharacters, defaults.suggestOnTriggerCharacters),
 			acceptSuggestionOnEnter: _stringSet<'on' | 'smart' | 'off'>(opts.acceptSuggestionOnEnter, defaults.acceptSuggestionOnEnter, ['on', 'smart', 'off']),
 			acceptSuggestionOnCommitCharacter: _boolean(opts.acceptSuggestionOnCommitCharacter, defaults.acceptSuggestionOnCommitCharacter),
-			snippetSuggestions: _stringSet<'top' | 'bottom' | 'inline' | 'none'>(opts.snippetSuggestions, defaults.snippetSuggestions, ['top', 'bottom', 'inline', 'none']),
 			wordBasedSuggestions: _boolean(opts.wordBasedSuggestions, defaults.wordBasedSuggestions),
 			suggestSelection: _stringSet<'first' | 'recentlyUsed' | 'recentlyUsedByPrefix'>(opts.suggestSelection, defaults.suggestSelection, ['first', 'recentlyUsed', 'recentlyUsedByPrefix']),
 			suggestFontSize: _clampedInt(opts.suggestFontSize, defaults.suggestFontSize, 0, 1000),
 			suggestLineHeight: _clampedInt(opts.suggestLineHeight, defaults.suggestLineHeight, 0, 1000),
+			suggest: this._sanitizeSuggestOpts(opts, defaults.suggest),
 			selectionHighlight: _boolean(opts.selectionHighlight, defaults.selectionHighlight),
 			occurrencesHighlight: _boolean(opts.occurrencesHighlight, defaults.occurrencesHighlight),
 			codeLens: _boolean(opts.codeLens, defaults.codeLens),
@@ -1944,11 +2001,11 @@ export class InternalEditorOptionsFactory {
 				suggestOnTriggerCharacters: opts.contribInfo.suggestOnTriggerCharacters,
 				acceptSuggestionOnEnter: opts.contribInfo.acceptSuggestionOnEnter,
 				acceptSuggestionOnCommitCharacter: opts.contribInfo.acceptSuggestionOnCommitCharacter,
-				snippetSuggestions: opts.contribInfo.snippetSuggestions,
 				wordBasedSuggestions: opts.contribInfo.wordBasedSuggestions,
 				suggestSelection: opts.contribInfo.suggestSelection,
 				suggestFontSize: opts.contribInfo.suggestFontSize,
 				suggestLineHeight: opts.contribInfo.suggestLineHeight,
+				suggest: opts.contribInfo.suggest,
 				selectionHighlight: (accessibilityIsOn ? false : opts.contribInfo.selectionHighlight), // DISABLED WHEN SCREEN READER IS ATTACHED
 				occurrencesHighlight: (accessibilityIsOn ? false : opts.contribInfo.occurrencesHighlight), // DISABLED WHEN SCREEN READER IS ATTACHED
 				codeLens: (accessibilityIsOn ? false : opts.contribInfo.codeLens), // DISABLED WHEN SCREEN READER IS ATTACHED
@@ -2401,7 +2458,8 @@ export const EDITOR_DEFAULTS: IValidatedEditorOptions = {
 		selectionClipboard: true,
 		hover: {
 			enabled: true,
-			delay: 300
+			delay: 300,
+			sticky: true
 		},
 		links: true,
 		contextmenu: true,
@@ -2414,11 +2472,15 @@ export const EDITOR_DEFAULTS: IValidatedEditorOptions = {
 		suggestOnTriggerCharacters: true,
 		acceptSuggestionOnEnter: 'on',
 		acceptSuggestionOnCommitCharacter: true,
-		snippetSuggestions: 'inline',
 		wordBasedSuggestions: true,
 		suggestSelection: 'recentlyUsed',
 		suggestFontSize: 0,
 		suggestLineHeight: 0,
+		suggest: {
+			filterGraceful: true,
+			snippets: 'inline',
+			snippetsPreventQuickSuggestions: true
+		},
 		selectionHighlight: true,
 		occurrencesHighlight: true,
 		codeLens: true,
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index 53dc47f82e1..1a4005d6a1b 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -46,7 +46,7 @@ export function createTextBufferFactory(text: string): model.ITextBufferFactory
 }
 
 export function createTextBufferFactoryFromStream(stream: IStringStream, filter?: (chunk: string) => string): TPromise<model.ITextBufferFactory> {
-	return new TPromise<model.ITextBufferFactory>((c, e, p) => {
+	return new TPromise<model.ITextBufferFactory>((c, e) => {
 		let done = false;
 		let builder = createTextBufferBuilder();
 
diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts
index 7905ccba0f4..94f3bf63ed2 100644
--- a/src/vs/editor/common/modes.ts
+++ b/src/vs/editor/common/modes.ts
@@ -906,7 +906,7 @@ export function isResourceTextEdit(thing: any): thing is ResourceTextEdit {
 export interface ResourceFileEdit {
 	oldUri: URI;
 	newUri: URI;
-	options: { overwrite?: boolean, ignoreIfExists?: boolean };
+	options: { overwrite?: boolean, ignoreIfExists?: boolean, recursive?: boolean };
 }
 
 export interface ResourceTextEdit {
diff --git a/src/vs/editor/contrib/codeAction/codeAction.ts b/src/vs/editor/contrib/codeAction/codeAction.ts
index c13ef19a29d..9a6ea89f441 100644
--- a/src/vs/editor/contrib/codeAction/codeAction.ts
+++ b/src/vs/editor/contrib/codeAction/codeAction.ts
@@ -7,7 +7,6 @@ import { isFalsyOrEmpty, mergeSort, flatten } from 'vs/base/common/arrays';
 import { asWinJsPromise } from 'vs/base/common/async';
 import { illegalArgument, onUnexpectedExternalError, isPromiseCanceledError } from 'vs/base/common/errors';
 import URI from 'vs/base/common/uri';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
 import { Range } from 'vs/editor/common/core/range';
 import { ITextModel } from 'vs/editor/common/model';
@@ -15,8 +14,9 @@ import { CodeAction, CodeActionProviderRegistry, CodeActionContext, CodeActionTr
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { CodeActionFilter, CodeActionKind, CodeActionTrigger } from './codeActionTrigger';
 import { Selection } from 'vs/editor/common/core/selection';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
-export function getCodeActions(model: ITextModel, rangeOrSelection: Range | Selection, trigger?: CodeActionTrigger): TPromise<CodeAction[]> {
+export function getCodeActions(model: ITextModel, rangeOrSelection: Range | Selection, trigger?: CodeActionTrigger, token: CancellationToken = CancellationToken.None): Promise<CodeAction[]> {
 	const codeActionContext: CodeActionContext = {
 		only: trigger && trigger.filter && trigger.filter.kind ? trigger.filter.kind.value : undefined,
 		trigger: trigger && trigger.type === 'manual' ? CodeActionTriggerKind.Manual : CodeActionTriggerKind.Automatic
@@ -38,7 +38,7 @@ export function getCodeActions(model: ITextModel, rangeOrSelection: Range | Sele
 		});
 	});
 
-	return TPromise.join(promises)
+	return Promise.all(promises)
 		.then(flatten)
 		.then(allCodeActions => mergeSort(allCodeActions, codeActionsComparator));
 }
@@ -88,5 +88,5 @@ registerLanguageCommand('_executeCodeActionProvider', function (accessor, args)
 		throw illegalArgument();
 	}
 
-	return getCodeActions(model, model.validateRange(range), undefined);
+	return getCodeActions(model, model.validateRange(range), { type: 'manual', filter: { includeSourceActions: true } });
 });
diff --git a/src/vs/editor/contrib/codeAction/codeActionCommands.ts b/src/vs/editor/contrib/codeAction/codeActionCommands.ts
index 9ea29d8e5e4..c86a8b15608 100644
--- a/src/vs/editor/contrib/codeAction/codeActionCommands.ts
+++ b/src/vs/editor/contrib/codeAction/codeActionCommands.ts
@@ -25,6 +25,7 @@ import { LightBulbWidget } from './lightBulbWidget';
 import { escapeRegExpCharacters } from 'vs/base/common/strings';
 import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
 import { IProgressService } from 'vs/platform/progress/common/progress';
+import { CancelablePromise } from 'vs/base/common/async';
 
 function contextKeyForSupportedActions(kind: CodeActionKind) {
 	return ContextKeyExpr.regex(
@@ -46,7 +47,7 @@ export class QuickFixController implements IEditorContribution {
 	private _lightBulbWidget: LightBulbWidget;
 	private _disposables: IDisposable[] = [];
 
-	private _activeRequest: TPromise<CodeAction[]> | undefined;
+	private _activeRequest: CancelablePromise<CodeAction[]> | undefined;
 
 	constructor(editor: ICodeEditor,
 		@IMarkerService markerService: IMarkerService,
@@ -124,7 +125,7 @@ export class QuickFixController implements IEditorContribution {
 		this._codeActionContextMenu.show(this._lightBulbWidget.model.actions, coords);
 	}
 
-	public triggerFromEditorSelection(filter?: CodeActionFilter, autoApply?: CodeActionAutoApply): TPromise<CodeAction[] | undefined> {
+	public triggerFromEditorSelection(filter?: CodeActionFilter, autoApply?: CodeActionAutoApply): Thenable<CodeAction[] | undefined> {
 		return this._model.trigger({ type: 'manual', filter, autoApply });
 	}
 
@@ -139,8 +140,8 @@ export class QuickFixController implements IEditorContribution {
 		this._lightBulbWidget.title = title;
 	}
 
-	private async _onApplyCodeAction(action: CodeAction): TPromise<void> {
-		await applyCodeAction(action, this._bulkEditService, this._commandService, this._editor);
+	private _onApplyCodeAction(action: CodeAction): TPromise<void> {
+		return TPromise.wrap(applyCodeAction(action, this._bulkEditService, this._commandService, this._editor));
 	}
 }
 
@@ -149,7 +150,7 @@ export async function applyCodeAction(
 	bulkEditService: IBulkEditService,
 	commandService: ICommandService,
 	editor?: ICodeEditor,
-) {
+): Promise<void> {
 	if (action.edit) {
 		await bulkEditService.apply(action.edit, { editor });
 	}
diff --git a/src/vs/editor/contrib/codeAction/codeActionModel.ts b/src/vs/editor/contrib/codeAction/codeActionModel.ts
index acbd68b1fa1..98211ae24dd 100644
--- a/src/vs/editor/contrib/codeAction/codeActionModel.ts
+++ b/src/vs/editor/contrib/codeAction/codeActionModel.ts
@@ -17,6 +17,7 @@ import { IMarkerService } from 'vs/platform/markers/common/markers';
 import { getCodeActions } from './codeAction';
 import { CodeActionTrigger } from './codeActionTrigger';
 import { IProgressService } from 'vs/platform/progress/common/progress';
+import { createCancelablePromise, CancelablePromise } from 'vs/base/common/async';
 
 export const SUPPORTED_CODE_ACTIONS = new RawContextKey<string>('supportedCodeAction', '');
 
@@ -99,7 +100,7 @@ export class CodeActionOracle {
 		return selection;
 	}
 
-	private _createEventAndSignalChange(trigger: CodeActionTrigger, selection: Selection | undefined): TPromise<CodeAction[] | undefined> {
+	private _createEventAndSignalChange(trigger: CodeActionTrigger, selection: Selection | undefined): Thenable<CodeAction[] | undefined> {
 		if (!selection) {
 			// cancel
 			this._signalChange({
@@ -113,10 +114,10 @@ export class CodeActionOracle {
 			const model = this._editor.getModel();
 			const markerRange = this._getRangeOfMarker(selection);
 			const position = markerRange ? markerRange.getStartPosition() : selection.getStartPosition();
-			const actions = getCodeActions(model, selection, trigger);
+			const actions = createCancelablePromise(token => getCodeActions(model, selection, trigger, token));
 
 			if (this._progressService && trigger.type === 'manual') {
-				this._progressService.showWhile(actions, 250);
+				this._progressService.showWhile(TPromise.wrap(actions), 250);
 			}
 
 			this._signalChange({
@@ -134,7 +135,7 @@ export interface CodeActionsComputeEvent {
 	trigger: CodeActionTrigger;
 	rangeOrSelection: Range | Selection;
 	position: Position;
-	actions: TPromise<CodeAction[]>;
+	actions: CancelablePromise<CodeAction[]>;
 }
 
 export class CodeActionModel {
@@ -196,7 +197,7 @@ export class CodeActionModel {
 		}
 	}
 
-	trigger(trigger: CodeActionTrigger): TPromise<CodeAction[] | undefined> {
+	trigger(trigger: CodeActionTrigger): Thenable<CodeAction[] | undefined> {
 		if (this._codeActionOracle) {
 			return this._codeActionOracle.trigger(trigger);
 		}
diff --git a/src/vs/editor/contrib/codeAction/codeActionWidget.ts b/src/vs/editor/contrib/codeAction/codeActionWidget.ts
index 0020eca69a4..b680ed6008b 100644
--- a/src/vs/editor/contrib/codeAction/codeActionWidget.ts
+++ b/src/vs/editor/contrib/codeAction/codeActionWidget.ts
@@ -28,7 +28,7 @@ export class CodeActionContextMenu {
 		private readonly _onApplyCodeAction: (action: CodeAction) => TPromise<any>
 	) { }
 
-	show(fixes: TPromise<CodeAction[]>, at: { x: number; y: number } | Position) {
+	show(fixes: Thenable<CodeAction[]>, at: { x: number; y: number } | Position) {
 
 		const actions = fixes.then(value => {
 			return value.map(action => {
@@ -53,7 +53,7 @@ export class CodeActionContextMenu {
 				}
 				return at;
 			},
-			getActions: () => actions,
+			getActions: () => TPromise.wrap(actions),
 			onHide: () => {
 				this._visible = false;
 				this._editor.focus();
diff --git a/src/vs/editor/contrib/codeAction/lightBulbWidget.ts b/src/vs/editor/contrib/codeAction/lightBulbWidget.ts
index fd77972c961..0fd9d8270f1 100644
--- a/src/vs/editor/contrib/codeAction/lightBulbWidget.ts
+++ b/src/vs/editor/contrib/codeAction/lightBulbWidget.ts
@@ -116,7 +116,7 @@ export class LightBulbWidget implements IDisposable, IContentWidget {
 		this._model = value;
 
 		const selection = this._model.rangeOrSelection;
-		this._model.actions.done(fixes => {
+		this._model.actions.then(fixes => {
 			if (!token.isCancellationRequested && fixes && fixes.length > 0) {
 				if (selection.isEmpty() && fixes.every(fix => fix.kind && CodeActionKind.Refactor.contains(fix.kind))) {
 					this.hide();
@@ -126,7 +126,7 @@ export class LightBulbWidget implements IDisposable, IContentWidget {
 			} else {
 				this.hide();
 			}
-		}, err => {
+		}).catch(err => {
 			this.hide();
 		});
 	}
diff --git a/src/vs/editor/contrib/codelens/codelens.ts b/src/vs/editor/contrib/codelens/codelens.ts
index 92821ec5ee6..9c58affec6a 100644
--- a/src/vs/editor/contrib/codelens/codelens.ts
+++ b/src/vs/editor/contrib/codelens/codelens.ts
@@ -8,12 +8,10 @@
 import { illegalArgument, onUnexpectedExternalError } from 'vs/base/common/errors';
 import { mergeSort } from 'vs/base/common/arrays';
 import URI from 'vs/base/common/uri';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { ITextModel } from 'vs/editor/common/model';
 import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
 import { CodeLensProviderRegistry, CodeLensProvider, ICodeLensSymbol } from 'vs/editor/common/modes';
 import { IModelService } from 'vs/editor/common/services/modelService';
-import { asWinJsPromise } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
 
 export interface ICodeLensData {
@@ -21,20 +19,20 @@ export interface ICodeLensData {
 	provider: CodeLensProvider;
 }
 
-export function getCodeLensData(model: ITextModel): TPromise<ICodeLensData[]> {
+export function getCodeLensData(model: ITextModel, token: CancellationToken): Promise<ICodeLensData[]> {
 
 	const symbols: ICodeLensData[] = [];
 	const provider = CodeLensProviderRegistry.ordered(model);
 
-	const promises = provider.map(provider => asWinJsPromise(token => provider.provideCodeLenses(model, token)).then(result => {
+	const promises = provider.map(provider => Promise.resolve(provider.provideCodeLenses(model, token)).then(result => {
 		if (Array.isArray(result)) {
 			for (let symbol of result) {
 				symbols.push({ symbol, provider });
 			}
 		}
-	}, onUnexpectedExternalError));
+	}).catch(onUnexpectedExternalError));
 
-	return TPromise.join(promises).then(() => {
+	return Promise.all(promises).then(() => {
 
 		return mergeSort(symbols, (a, b) => {
 			// sort by lineNumber, provider-rank, and column
@@ -70,7 +68,7 @@ registerLanguageCommand('_executeCodeLensProvider', function (accessor, args) {
 	}
 
 	const result: ICodeLensSymbol[] = [];
-	return getCodeLensData(model).then(value => {
+	return getCodeLensData(model, CancellationToken.None).then(value => {
 
 		let resolve: Thenable<any>[] = [];
 
diff --git a/src/vs/editor/contrib/codelens/codelensController.ts b/src/vs/editor/contrib/codelens/codelensController.ts
index 0cd0fb98162..be43648e661 100644
--- a/src/vs/editor/contrib/codelens/codelensController.ts
+++ b/src/vs/editor/contrib/codelens/codelensController.ts
@@ -5,10 +5,9 @@
 
 'use strict';
 
-import { RunOnceScheduler, asWinJsPromise } from 'vs/base/common/async';
+import { RunOnceScheduler, CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
 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 * as editorCommon from 'vs/editor/common/editorCommon';
 import { CodeLensProviderRegistry, ICodeLensSymbol } from 'vs/editor/common/modes';
@@ -30,9 +29,9 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 	private _globalToDispose: IDisposable[];
 	private _localToDispose: IDisposable[];
 	private _lenses: CodeLens[];
-	private _currentFindCodeLensSymbolsPromise: TPromise<ICodeLensData[]>;
+	private _currentFindCodeLensSymbolsPromise: CancelablePromise<ICodeLensData[]>;
 	private _modelChangeCounter: number;
-	private _currentFindOccPromise: TPromise<any>;
+	private _currentResolveCodeLensSymbolsPromise: CancelablePromise<any>;
 	private _detectVisibleLenses: RunOnceScheduler;
 
 	constructor(
@@ -72,9 +71,9 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 			this._currentFindCodeLensSymbolsPromise = null;
 			this._modelChangeCounter++;
 		}
-		if (this._currentFindOccPromise) {
-			this._currentFindOccPromise.cancel();
-			this._currentFindOccPromise = null;
+		if (this._currentResolveCodeLensSymbolsPromise) {
+			this._currentResolveCodeLensSymbolsPromise.cancel();
+			this._currentResolveCodeLensSymbolsPromise = null;
 		}
 		this._localToDispose = dispose(this._localToDispose);
 	}
@@ -117,7 +116,7 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 				this._currentFindCodeLensSymbolsPromise.cancel();
 			}
 
-			this._currentFindCodeLensSymbolsPromise = getCodeLensData(model);
+			this._currentFindCodeLensSymbolsPromise = createCancelablePromise(token => getCodeLensData(model, token));
 
 			this._currentFindCodeLensSymbolsPromise.then((result) => {
 				if (counterValue === this._modelChangeCounter) { // only the last one wins
@@ -267,9 +266,9 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 	}
 
 	private _onViewportChanged(): void {
-		if (this._currentFindOccPromise) {
-			this._currentFindOccPromise.cancel();
-			this._currentFindOccPromise = null;
+		if (this._currentResolveCodeLensSymbolsPromise) {
+			this._currentResolveCodeLensSymbolsPromise.cancel();
+			this._currentResolveCodeLensSymbolsPromise = null;
 		}
 
 		const model = this._editor.getModel();
@@ -291,28 +290,34 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 			return;
 		}
 
-		const promises = toResolve.map((request, i) => {
+		this._currentResolveCodeLensSymbolsPromise = createCancelablePromise(token => {
 
-			const resolvedSymbols = new Array<ICodeLensSymbol>(request.length);
-			const promises = request.map((request, i) => {
-				if (typeof request.provider.resolveCodeLens === 'function') {
-					return asWinJsPromise((token) => {
-						return request.provider.resolveCodeLens(model, request.symbol, token);
-					}).then(symbol => {
-						resolvedSymbols[i] = symbol;
-					});
-				}
-				resolvedSymbols[i] = request.symbol;
-				return TPromise.as(void 0);
+			const promises = toResolve.map((request, i) => {
+
+				const resolvedSymbols = new Array<ICodeLensSymbol>(request.length);
+				const promises = request.map((request, i) => {
+					if (typeof request.provider.resolveCodeLens === 'function') {
+						return Promise.resolve(request.provider.resolveCodeLens(model, request.symbol, token)).then(symbol => {
+							resolvedSymbols[i] = symbol;
+						});
+					}
+					resolvedSymbols[i] = request.symbol;
+					return Promise.resolve(void 0);
+				});
+
+				return Promise.all(promises).then(() => {
+					lenses[i].updateCommands(resolvedSymbols);
+				});
 			});
 
-			return TPromise.join(promises).then(() => {
-				lenses[i].updateCommands(resolvedSymbols);
-			});
+			return Promise.all(promises);
 		});
 
-		this._currentFindOccPromise = TPromise.join(promises).then(() => {
-			this._currentFindOccPromise = null;
+		this._currentResolveCodeLensSymbolsPromise.then(() => {
+			this._currentResolveCodeLensSymbolsPromise = null;
+		}).catch(err => {
+			this._currentResolveCodeLensSymbolsPromise = null;
+			onUnexpectedError(err);
 		});
 	}
 }
diff --git a/src/vs/editor/contrib/colorPicker/color.ts b/src/vs/editor/contrib/colorPicker/color.ts
index e3f8d687510..2ebc3d1b8ca 100644
--- a/src/vs/editor/contrib/colorPicker/color.ts
+++ b/src/vs/editor/contrib/colorPicker/color.ts
@@ -13,6 +13,7 @@ import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
 import { Range, IRange } from 'vs/editor/common/core/range';
 import { illegalArgument } from 'vs/base/common/errors';
 import { IModelService } from 'vs/editor/common/services/modelService';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 
 export interface IColorData {
@@ -20,10 +21,10 @@ export interface IColorData {
 	provider: DocumentColorProvider;
 }
 
-export function getColors(model: ITextModel): TPromise<IColorData[]> {
+export function getColors(model: ITextModel, token: CancellationToken): Promise<IColorData[]> {
 	const colors: IColorData[] = [];
 	const providers = ColorProviderRegistry.ordered(model).reverse();
-	const promises = providers.map(provider => asWinJsPromise(token => provider.provideDocumentColors(model, token)).then(result => {
+	const promises = providers.map(provider => Promise.resolve(provider.provideDocumentColors(model, token)).then(result => {
 		if (Array.isArray(result)) {
 			for (let colorInfo of result) {
 				colors.push({ colorInfo, provider });
@@ -31,11 +32,11 @@ export function getColors(model: ITextModel): TPromise<IColorData[]> {
 		}
 	}));
 
-	return TPromise.join(promises).then(() => colors);
+	return Promise.all(promises).then(() => colors);
 }
 
-export function getColorPresentations(model: ITextModel, colorInfo: IColorInformation, provider: DocumentColorProvider): TPromise<IColorPresentation[]> {
-	return asWinJsPromise(token => provider.provideColorPresentations(model, colorInfo, token));
+export function getColorPresentations(model: ITextModel, colorInfo: IColorInformation, provider: DocumentColorProvider, token: CancellationToken): Promise<IColorPresentation[]> {
+	return Promise.resolve(provider.provideColorPresentations(model, colorInfo, token));
 }
 
 registerLanguageCommand('_executeDocumentColorProvider', function (accessor, args) {
diff --git a/src/vs/editor/contrib/colorPicker/colorDetector.ts b/src/vs/editor/contrib/colorPicker/colorDetector.ts
index 97fbb7b8852..b3836d6aa68 100644
--- a/src/vs/editor/contrib/colorPicker/colorDetector.ts
+++ b/src/vs/editor/contrib/colorPicker/colorDetector.ts
@@ -6,7 +6,6 @@
 import { RGBA } from 'vs/base/common/color';
 import { hash } from 'vs/base/common/hash';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -17,6 +16,7 @@ import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService
 import { getColors, IColorData } from 'vs/editor/contrib/colorPicker/color';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
+import { TimeoutTimer, CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
 
 const MAX_DECORATORS = 500;
 
@@ -28,8 +28,8 @@ export class ColorDetector implements IEditorContribution {
 
 	private _globalToDispose: IDisposable[] = [];
 	private _localToDispose: IDisposable[] = [];
-	private _computePromise: TPromise<void>;
-	private _timeoutPromise: TPromise<void>;
+	private _computePromise: CancelablePromise<void>;
+	private _timeoutTimer: TimeoutTimer;
 
 	private _decorationsIds: string[] = [];
 	private _colorDatas = new Map<string, IColorData>();
@@ -61,7 +61,7 @@ export class ColorDetector implements IEditorContribution {
 			}
 		}));
 
-		this._timeoutPromise = null;
+		this._timeoutTimer = null;
 		this._computePromise = null;
 		this._isEnabled = this.isEnabled();
 		this.onModelChanged();
@@ -115,29 +115,31 @@ export class ColorDetector implements IEditorContribution {
 		}
 
 		this._localToDispose.push(this._editor.onDidChangeModelContent((e) => {
-			if (!this._timeoutPromise) {
-				this._timeoutPromise = TPromise.timeout(ColorDetector.RECOMPUTE_TIME);
-				this._timeoutPromise.then(() => {
-					this._timeoutPromise = null;
+			if (!this._timeoutTimer) {
+				this._timeoutTimer = new TimeoutTimer();
+				this._timeoutTimer.cancelAndSet(() => {
+					this._timeoutTimer = null;
 					this.beginCompute();
-				});
+				}, ColorDetector.RECOMPUTE_TIME);
 			}
 		}));
 		this.beginCompute();
 	}
 
 	private beginCompute(): void {
-		this._computePromise = getColors(this._editor.getModel()).then(colorInfos => {
-			this.updateDecorations(colorInfos);
-			this.updateColorDecorators(colorInfos);
-			this._computePromise = null;
+		this._computePromise = createCancelablePromise(token => {
+			return getColors(this._editor.getModel(), token).then(colorInfos => {
+				this.updateDecorations(colorInfos);
+				this.updateColorDecorators(colorInfos);
+				this._computePromise = null;
+			});
 		});
 	}
 
 	private stop(): void {
-		if (this._timeoutPromise) {
-			this._timeoutPromise.cancel();
-			this._timeoutPromise = null;
+		if (this._timeoutTimer) {
+			this._timeoutTimer.cancel();
+			this._timeoutTimer = null;
 		}
 		if (this._computePromise) {
 			this._computePromise.cancel();
diff --git a/src/vs/editor/contrib/contextmenu/contextmenu.ts b/src/vs/editor/contrib/contextmenu/contextmenu.ts
index abdc0f2abd0..a3467f32a75 100644
--- a/src/vs/editor/contrib/contextmenu/contextmenu.ts
+++ b/src/vs/editor/contrib/contextmenu/contextmenu.ts
@@ -142,7 +142,9 @@ export class ContextMenuController implements IEditorContribution {
 		// Disable hover
 		const oldHoverSetting = this._editor.getConfiguration().contribInfo.hover;
 		this._editor.updateOptions({
-			hover: false
+			hover: {
+				enabled: false
+			}
 		});
 
 		let menuPosition = forcedPosition;
diff --git a/src/vs/editor/contrib/documentSymbols/outlineModel.ts b/src/vs/editor/contrib/documentSymbols/outlineModel.ts
index 91c634a3bd1..a2a8a2447f8 100644
--- a/src/vs/editor/contrib/documentSymbols/outlineModel.ts
+++ b/src/vs/editor/contrib/documentSymbols/outlineModel.ts
@@ -6,8 +6,6 @@
 
 import { DocumentSymbolProviderRegistry, DocumentSymbolProvider, DocumentSymbol } from 'vs/editor/common/modes';
 import { ITextModel } from 'vs/editor/common/model';
-import { asWinJsPromise } from 'vs/base/common/async';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { fuzzyScore, FuzzyScore } from 'vs/base/common/filters';
 import { IPosition } from 'vs/editor/common/core/position';
 import { Range, IRange } from 'vs/editor/common/core/range';
@@ -17,6 +15,7 @@ import { commonPrefixLength } from 'vs/base/common/strings';
 import { IMarker, MarkerSeverity } from 'vs/platform/markers/common/markers';
 import { onUnexpectedExternalError } from 'vs/base/common/errors';
 import { LRUCache } from 'vs/base/common/map';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 
 export abstract class TreeElement {
 	abstract id: string;
@@ -196,17 +195,42 @@ export class OutlineGroup extends TreeElement {
 
 export class OutlineModel extends TreeElement {
 
-	private static readonly _requests = new LRUCache<string, { promiseCnt: number, promise: TPromise<any>, model: OutlineModel }>(9, .75);
+	private static readonly _requests = new LRUCache<string, { promiseCnt: number, source: CancellationTokenSource, promise: Promise<any>, model: OutlineModel }>(9, .75);
+	private static readonly _keys = new class {
 
-	static create(textModel: ITextModel): TPromise<OutlineModel> {
+		private _counter = 1;
+		private _data = new WeakMap<DocumentSymbolProvider, number>();
 
-		let key = `${textModel.id}/${textModel.getVersionId()}/${DocumentSymbolProviderRegistry.all(textModel).length}`;
+		for(textModel: ITextModel): string {
+			return `${textModel.id}/${textModel.getVersionId()}/${this._hash(DocumentSymbolProviderRegistry.all(textModel))}`;
+		}
+
+		private _hash(providers: DocumentSymbolProvider[]): string {
+			let result = '';
+			for (const provider of providers) {
+				let n = this._data.get(provider);
+				if (typeof n === 'undefined') {
+					n = this._counter++;
+					this._data.set(provider, n);
+				}
+				result += n;
+			}
+			return result;
+		}
+	};
+
+
+	static create(textModel: ITextModel, token: CancellationToken): Promise<OutlineModel> {
+
+		let key = this._keys.for(textModel);
 		let data = OutlineModel._requests.get(key);
 
 		if (!data) {
+			let source = new CancellationTokenSource();
 			data = {
 				promiseCnt: 0,
-				promise: OutlineModel._create(textModel),
+				source,
+				promise: OutlineModel._create(textModel, source.token),
 				model: undefined,
 			};
 			OutlineModel._requests.set(key, data);
@@ -214,13 +238,21 @@ export class OutlineModel extends TreeElement {
 
 		if (data.model) {
 			// resolved -> return data
-			return TPromise.as(data.model);
+			return Promise.resolve(data.model);
 		}
 
 		// increase usage counter
 		data.promiseCnt += 1;
 
-		return new TPromise((resolve, reject) => {
+		token.onCancellationRequested(() => {
+			// last -> cancel provider request, remove cached promise
+			if (--data.promiseCnt === 0) {
+				data.source.cancel();
+				OutlineModel._requests.delete(key);
+			}
+		});
+
+		return new Promise((resolve, reject) => {
 			data.promise.then(model => {
 				data.model = model;
 				resolve(model);
@@ -228,16 +260,10 @@ export class OutlineModel extends TreeElement {
 				OutlineModel._requests.delete(key);
 				reject(err);
 			});
-		}, () => {
-			// last -> cancel provider request, remove cached promise
-			if (--data.promiseCnt === 0) {
-				data.promise.cancel();
-				OutlineModel._requests.delete(key);
-			}
 		});
 	}
 
-	static _create(textModel: ITextModel): TPromise<OutlineModel> {
+	static _create(textModel: ITextModel, token: CancellationToken): Promise<OutlineModel> {
 
 		let result = new OutlineModel(textModel);
 		let promises = DocumentSymbolProviderRegistry.ordered(textModel).map((provider, index) => {
@@ -245,7 +271,7 @@ export class OutlineModel extends TreeElement {
 			let id = TreeElement.findId(`provider_${index}`, result);
 			let group = new OutlineGroup(id, result, provider, index);
 
-			return asWinJsPromise(token => provider.provideDocumentSymbols(result.textModel, token)).then(result => {
+			return Promise.resolve(provider.provideDocumentSymbols(result.textModel, token)).then(result => {
 				if (!isFalsyOrEmpty(result)) {
 					for (const info of result) {
 						OutlineModel._makeOutlineElement(info, group);
@@ -260,7 +286,7 @@ export class OutlineModel extends TreeElement {
 			});
 		});
 
-		return TPromise.join(promises).then(() => {
+		return Promise.all(promises).then(() => {
 
 			let count = 0;
 			for (const key in result._groups) {
diff --git a/src/vs/editor/contrib/documentSymbols/outlineTree.ts b/src/vs/editor/contrib/documentSymbols/outlineTree.ts
index fa58d75a59f..19489cbae98 100644
--- a/src/vs/editor/contrib/documentSymbols/outlineTree.ts
+++ b/src/vs/editor/contrib/documentSymbols/outlineTree.ts
@@ -96,14 +96,14 @@ export class OutlineDataSource implements IDataSource {
 		return false;
 	}
 
-	async getChildren(tree: ITree, element: TreeElement): TPromise<TreeElement[]> {
+	getChildren(tree: ITree, element: TreeElement): TPromise<TreeElement[]> {
 		let res = values(element.children);
 		// console.log(element.id + ' with children ' + res.length);
-		return res;
+		return TPromise.wrap(res);
 	}
 
-	async getParent(tree: ITree, element: TreeElement | any): TPromise<TreeElement> {
-		return element && element.parent;
+	getParent(tree: ITree, element: TreeElement | any): TPromise<TreeElement> {
+		return TPromise.wrap(element && element.parent);
 	}
 
 	shouldAutoexpand(tree: ITree, element: TreeElement): boolean {
@@ -181,11 +181,12 @@ export class OutlineRenderer implements IRenderer {
 		}
 
 		const { count, topSev } = element.marker;
-		const color = this._themeService.getTheme().getColor(topSev === MarkerSeverity.Error ? listErrorForeground : listWarningForeground).toString();
+		const color = this._themeService.getTheme().getColor(topSev === MarkerSeverity.Error ? listErrorForeground : listWarningForeground);
+		const cssColor = color ? color.toString() : 'inherit';
 
 		// color of the label
 		if (this.renderProblemColors) {
-			template.labelContainer.style.setProperty('--outline-element-color', color);
+			template.labelContainer.style.setProperty('--outline-element-color', cssColor);
 		} else {
 			template.labelContainer.style.removeProperty('--outline-element-color');
 		}
@@ -199,14 +200,14 @@ export class OutlineRenderer implements IRenderer {
 			dom.removeClass(template.decoration, 'bubble');
 			template.decoration.innerText = count < 10 ? count.toString() : '+9';
 			template.decoration.title = count === 1 ? localize('1.problem', "1 problem in this element") : localize('N.problem', "{0} problems in this element", count);
-			template.decoration.style.setProperty('--outline-element-color', color);
+			template.decoration.style.setProperty('--outline-element-color', cssColor);
 
 		} else {
 			dom.show(template.decoration);
 			dom.addClass(template.decoration, 'bubble');
 			template.decoration.innerText = '\uf052';
 			template.decoration.title = localize('deep.problem', "Contains elements with problems");
-			template.decoration.style.setProperty('--outline-element-color', color);
+			template.decoration.style.setProperty('--outline-element-color', cssColor);
 		}
 	}
 
@@ -280,7 +281,7 @@ export class OutlineTreeState {
 		return { selected, focused, expanded };
 	}
 
-	static async restore(tree: ITree, state: OutlineTreeState, eventPayload: any): TPromise<void> {
+	static async restore(tree: ITree, state: OutlineTreeState, eventPayload: any): Promise<void> {
 		let model = <OutlineModel>tree.getInput();
 		if (!state || !(model instanceof OutlineModel)) {
 			return TPromise.as(undefined);
diff --git a/src/vs/editor/contrib/documentSymbols/test/outlineModel.test.ts b/src/vs/editor/contrib/documentSymbols/test/outlineModel.test.ts
index bd34ffd3550..c07576219f8 100644
--- a/src/vs/editor/contrib/documentSymbols/test/outlineModel.test.ts
+++ b/src/vs/editor/contrib/documentSymbols/test/outlineModel.test.ts
@@ -12,6 +12,7 @@ import { Range } from 'vs/editor/common/core/range';
 import { IMarker, MarkerSeverity } from 'vs/platform/markers/common/markers';
 import { TextModel } from 'vs/editor/common/model/textModel';
 import URI from 'vs/base/common/uri';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 
 suite('OutlineModel', function () {
 
@@ -26,16 +27,16 @@ suite('OutlineModel', function () {
 			}
 		});
 
-		await OutlineModel.create(model);
+		await OutlineModel.create(model, CancellationToken.None);
 		assert.equal(count, 1);
 
 		// cached
-		await OutlineModel.create(model);
+		await OutlineModel.create(model, CancellationToken.None);
 		assert.equal(count, 1);
 
 		// new version
 		model.applyEdits([{ text: 'XXX', range: new Range(1, 1, 1, 1) }]);
-		await OutlineModel.create(model);
+		await OutlineModel.create(model, CancellationToken.None);
 		assert.equal(count, 2);
 
 		reg.dispose();
@@ -58,13 +59,15 @@ suite('OutlineModel', function () {
 		});
 
 		assert.equal(isCancelled, false);
-		let p1 = OutlineModel.create(model);
-		let p2 = OutlineModel.create(model);
+		let s1 = new CancellationTokenSource();
+		OutlineModel.create(model, s1.token);
+		let s2 = new CancellationTokenSource();
+		OutlineModel.create(model, s2.token);
 
-		p1.cancel();
+		s1.cancel();
 		assert.equal(isCancelled, false);
 
-		p2.cancel();
+		s2.cancel();
 		assert.equal(isCancelled, true);
 
 		reg.dispose();
diff --git a/src/vs/editor/contrib/find/findWidget.ts b/src/vs/editor/contrib/find/findWidget.ts
index d4e544d2569..86cac532d3f 100644
--- a/src/vs/editor/contrib/find/findWidget.ts
+++ b/src/vs/editor/contrib/find/findWidget.ts
@@ -312,10 +312,10 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
 
 	private _updateHistory() {
 		if (this._state.searchString) {
-			this._findInput.inputBox.addToHistory(this._state.searchString);
+			this._findInput.inputBox.addToHistory();
 		}
 		if (this._state.replaceString) {
-			this._replaceInputBox.addToHistory(this._state.replaceString);
+			this._replaceInputBox.addToHistory();
 		}
 	}
 
diff --git a/src/vs/editor/contrib/find/simpleFindWidget.ts b/src/vs/editor/contrib/find/simpleFindWidget.ts
index 4df4247d74c..adb0cd679c8 100644
--- a/src/vs/editor/contrib/find/simpleFindWidget.ts
+++ b/src/vs/editor/contrib/find/simpleFindWidget.ts
@@ -133,6 +133,10 @@ export abstract class SimpleFindWidget extends Widget {
 		return this._findInput.getValue();
 	}
 
+	public get focusTracker(): dom.IFocusTracker {
+		return this._findInputFocusTracker;
+	}
+
 	public updateTheme(theme: ITheme): void {
 		const inputStyles = {
 			inputActiveOptionBorder: theme.getColor(inputActiveOptionBorder),
@@ -197,9 +201,7 @@ export abstract class SimpleFindWidget extends Widget {
 	}
 
 	protected _updateHistory() {
-		if (this.inputValue) {
-			this._findInput.inputBox.addToHistory(this._findInput.getValue());
-		}
+		this._findInput.inputBox.addToHistory();
 	}
 }
 
diff --git a/src/vs/editor/contrib/folding/folding.ts b/src/vs/editor/contrib/folding/folding.ts
index 68151b424c8..389901f50ff 100644
--- a/src/vs/editor/contrib/folding/folding.ts
+++ b/src/vs/editor/contrib/folding/folding.ts
@@ -9,7 +9,7 @@ import 'vs/css!./folding';
 import * as nls from 'vs/nls';
 import * as types from 'vs/base/common/types';
 import { escapeRegExpCharacters } from 'vs/base/common/strings';
-import { RunOnceScheduler, Delayer, asWinJsPromise } from 'vs/base/common/async';
+import { RunOnceScheduler, Delayer, CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
 import { KeyCode, KeyMod, KeyChord } from 'vs/base/common/keyCodes';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -67,7 +67,7 @@ export class FoldingController implements IEditorContribution {
 	private hiddenRangeModel: HiddenRangeModel;
 
 	private rangeProvider: RangeProvider;
-	private foldingRegionPromise: TPromise<FoldingRegions>;
+	private foldingRegionPromise: CancelablePromise<FoldingRegions>;
 
 	private foldingStateMemento: FoldingStateMemento;
 
@@ -261,8 +261,8 @@ export class FoldingController implements IEditorContribution {
 				if (!this.foldingModel) { // null if editor has been disposed, or folding turned off
 					return null;
 				}
-				let foldingRegionPromise = this.foldingRegionPromise = asWinJsPromise<FoldingRegions>(token => this.getRangeProvider(this.foldingModel.textModel).compute(token));
-				return foldingRegionPromise.then(foldingRanges => {
+				let foldingRegionPromise = this.foldingRegionPromise = createCancelablePromise(token => this.getRangeProvider(this.foldingModel.textModel).compute(token));
+				return TPromise.wrap(foldingRegionPromise.then(foldingRanges => {
 					if (foldingRanges && foldingRegionPromise === this.foldingRegionPromise) { // new request or cancelled in the meantime?
 						// some cursors might have moved into hidden regions, make sure they are in expanded regions
 						let selections = this.editor.getSelections();
@@ -270,7 +270,7 @@ export class FoldingController implements IEditorContribution {
 						this.foldingModel.update(foldingRanges, selectionLineNumbers);
 					}
 					return this.foldingModel;
-				});
+				}));
 			});
 		}
 	}
diff --git a/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts b/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts
index 348b9833544..8c15d98772c 100644
--- a/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts
+++ b/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts
@@ -26,6 +26,7 @@ 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';
+import { createCancelablePromise } from 'vs/base/common/async';
 
 export class DefinitionActionConfig {
 
@@ -150,7 +151,7 @@ export class DefinitionAction extends EditorAction {
 			resource: uri,
 			options: {
 				selection: Range.collapseToStart(range),
-				revealIfVisible: true,
+				revealIfOpened: true,
 				revealInCenterIfOutsideViewport: true
 			}
 		}, editor, sideBySide);
@@ -159,7 +160,7 @@ export class DefinitionAction extends EditorAction {
 	private _openInPeek(editorService: ICodeEditorService, target: ICodeEditor, model: ReferencesModel) {
 		let controller = ReferencesController.get(target);
 		if (controller) {
-			controller.toggleWidget(target.getSelection(), TPromise.as(model), {
+			controller.toggleWidget(target.getSelection(), createCancelablePromise(_ => Promise.resolve(model)), {
 				getMetaTitle: (model) => {
 					return this._getMetaTitle(model);
 				},
diff --git a/src/vs/editor/contrib/hover/getHover.ts b/src/vs/editor/contrib/hover/getHover.ts
index a6bf28af9c8..466f04cab88 100644
--- a/src/vs/editor/contrib/hover/getHover.ts
+++ b/src/vs/editor/contrib/hover/getHover.ts
@@ -7,22 +7,19 @@
 
 import { coalesce } from 'vs/base/common/arrays';
 import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { ITextModel } from 'vs/editor/common/model';
 import { registerDefaultLanguageCommand } from 'vs/editor/browser/editorExtensions';
 import { Hover, HoverProviderRegistry } from 'vs/editor/common/modes';
-import { asWinJsPromise } from 'vs/base/common/async';
 import { Position } from 'vs/editor/common/core/position';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
-export function getHover(model: ITextModel, position: Position): TPromise<Hover[]> {
+export function getHover(model: ITextModel, position: Position, token: CancellationToken = CancellationToken.None): Promise<Hover[]> {
 
 	const supports = HoverProviderRegistry.ordered(model);
 	const values: Hover[] = [];
 
 	const promises = supports.map((support, idx) => {
-		return asWinJsPromise((token) => {
-			return support.provideHover(model, position, token);
-		}).then((result) => {
+		return Promise.resolve(support.provideHover(model, position, token)).then((result) => {
 			if (result) {
 				let hasRange = (typeof result.range !== 'undefined');
 				let hasHtmlContent = typeof result.contents !== 'undefined' && result.contents && result.contents.length > 0;
@@ -35,7 +32,7 @@ export function getHover(model: ITextModel, position: Position): TPromise<Hover[
 		});
 	});
 
-	return TPromise.join(promises).then(() => coalesce(values));
+	return Promise.all(promises).then(() => coalesce(values));
 }
 
 registerDefaultLanguageCommand('_executeHoverProvider', getHover);
diff --git a/src/vs/editor/contrib/hover/hover.ts b/src/vs/editor/contrib/hover/hover.ts
index ddbc96953b3..45f39711585 100644
--- a/src/vs/editor/contrib/hover/hover.ts
+++ b/src/vs/editor/contrib/hover/hover.ts
@@ -13,7 +13,8 @@ import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { Range } from 'vs/editor/common/core/range';
-import * as editorCommon from 'vs/editor/common/editorCommon';
+import { IEditorContribution, IScrollEvent } from 'vs/editor/common/editorCommon';
+import { IConfigurationChangedEvent } from 'vs/editor/common/config/editorOptions';
 import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction } from 'vs/editor/browser/editorExtensions';
 import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
 import { ModesContentHoverWidget } from './modesContentHover';
@@ -26,12 +27,12 @@ import { MarkdownRenderer } from 'vs/editor/contrib/markdown/markdownRenderer';
 import { IEmptyContentData } from 'vs/editor/browser/controller/mouseTarget';
 import { HoverStartMode } from 'vs/editor/contrib/hover/hoverOperation';
 
-export class ModesHoverController implements editorCommon.IEditorContribution {
+export class ModesHoverController implements IEditorContribution {
 
 	private static readonly ID = 'editor.contrib.hover';
 
-	private _editor: ICodeEditor;
 	private _toUnhook: IDisposable[];
+	private _didChangeConfigurationHandler: IDisposable;
 
 	private _contentWidget: ModesContentHoverWidget;
 	private _glyphWidget: ModesGlyphHoverWidget;
@@ -52,35 +53,57 @@ export class ModesHoverController implements editorCommon.IEditorContribution {
 
 	private _isMouseDown: boolean;
 	private _hoverClicked: boolean;
+	private _isHoverEnabled: boolean;
+	private _isHoverSticky: boolean;
 
 	static get(editor: ICodeEditor): ModesHoverController {
 		return editor.getContribution<ModesHoverController>(ModesHoverController.ID);
 	}
 
-	constructor(editor: ICodeEditor,
+	constructor(private readonly _editor: ICodeEditor,
 		@IOpenerService private readonly _openerService: IOpenerService,
 		@IModeService private readonly _modeService: IModeService,
 		@IThemeService private readonly _themeService: IThemeService
 	) {
-		this._editor = editor;
-
 		this._toUnhook = [];
-		this._isMouseDown = false;
 
-		if (editor.getConfiguration().contribInfo.hover) {
+		this._isMouseDown = false;
+		this._hoverClicked = false;
+
+		this._hookEvents();
+
+		this._didChangeConfigurationHandler = this._editor.onDidChangeConfiguration((e: IConfigurationChangedEvent) => {
+			if (e.contribInfo) {
+				this._hideWidgets();
+				this._unhookEvents();
+				this._hookEvents();
+			}
+		});
+	}
+
+	private _hookEvents(): void {
+		const hideWidgetsEventHandler = () => this._hideWidgets();
+
+		const hoverOpts = this._editor.getConfiguration().contribInfo.hover;
+		this._isHoverEnabled = hoverOpts.enabled;
+		this._isHoverSticky = hoverOpts.sticky;
+		if (this._isHoverEnabled) {
 			this._toUnhook.push(this._editor.onMouseDown((e: IEditorMouseEvent) => this._onEditorMouseDown(e)));
 			this._toUnhook.push(this._editor.onMouseUp((e: IEditorMouseEvent) => this._onEditorMouseUp(e)));
 			this._toUnhook.push(this._editor.onMouseMove((e: IEditorMouseEvent) => this._onEditorMouseMove(e)));
-			this._toUnhook.push(this._editor.onMouseLeave((e: IEditorMouseEvent) => this._hideWidgets()));
 			this._toUnhook.push(this._editor.onKeyDown((e: IKeyboardEvent) => this._onKeyDown(e)));
-			this._toUnhook.push(this._editor.onDidChangeModel(() => this._hideWidgets()));
 			this._toUnhook.push(this._editor.onDidChangeModelDecorations(() => this._onModelDecorationsChanged()));
-			this._toUnhook.push(this._editor.onDidScrollChange((e) => {
-				if (e.scrollTopChanged || e.scrollLeftChanged) {
-					this._hideWidgets();
-				}
-			}));
+		} else {
+			this._toUnhook.push(this._editor.onMouseMove(hideWidgetsEventHandler));
 		}
+
+		this._toUnhook.push(this._editor.onMouseLeave(hideWidgetsEventHandler));
+		this._toUnhook.push(this._editor.onDidChangeModel(hideWidgetsEventHandler));
+		this._toUnhook.push(this._editor.onDidScrollChange((e: IScrollEvent) => this._onEditorScrollChanged(e)));
+	}
+
+	private _unhookEvents(): void {
+		this._toUnhook = dispose(this._toUnhook);
 	}
 
 	private _onModelDecorationsChanged(): void {
@@ -88,6 +111,12 @@ export class ModesHoverController implements editorCommon.IEditorContribution {
 		this.glyphWidget.onModelDecorationsChanged();
 	}
 
+	private _onEditorScrollChanged(e: IScrollEvent): void {
+		if (e.scrollTopChanged || e.scrollLeftChanged) {
+			this._hideWidgets();
+		}
+	}
+
 	private _onEditorMouseDown(mouseEvent: IEditorMouseEvent): void {
 		this._isMouseDown = true;
 
@@ -116,6 +145,7 @@ export class ModesHoverController implements editorCommon.IEditorContribution {
 	}
 
 	private _onEditorMouseMove(mouseEvent: IEditorMouseEvent): void {
+		// const this._editor.getConfiguration().contribInfo.hover.sticky;
 		let targetType = mouseEvent.target.type;
 		const hasStopKey = (platform.isMacintosh ? mouseEvent.event.metaKey : mouseEvent.event.ctrlKey);
 
@@ -123,12 +153,12 @@ export class ModesHoverController implements editorCommon.IEditorContribution {
 			return;
 		}
 
-		if (targetType === MouseTargetType.CONTENT_WIDGET && mouseEvent.target.detail === ModesContentHoverWidget.ID && !hasStopKey) {
+		if (this._isHoverSticky && targetType === MouseTargetType.CONTENT_WIDGET && mouseEvent.target.detail === ModesContentHoverWidget.ID && !hasStopKey) {
 			// mouse moved on top of content hover widget
 			return;
 		}
 
-		if (targetType === MouseTargetType.OVERLAY_WIDGET && mouseEvent.target.detail === ModesGlyphHoverWidget.ID && !hasStopKey) {
+		if (this._isHoverSticky && targetType === MouseTargetType.OVERLAY_WIDGET && mouseEvent.target.detail === ModesGlyphHoverWidget.ID && !hasStopKey) {
 			// mouse moved on top of overlay hover widget
 			return;
 		}
@@ -142,12 +172,18 @@ export class ModesHoverController implements editorCommon.IEditorContribution {
 			}
 		}
 
-		if (this._editor.getConfiguration().contribInfo.hover && targetType === MouseTargetType.CONTENT_TEXT) {
+		if (targetType === MouseTargetType.CONTENT_TEXT) {
 			this.glyphWidget.hide();
-			this.contentWidget.startShowingAt(mouseEvent.target.range, HoverStartMode.Delayed, false);
+
+			if (this._isHoverEnabled) {
+				this.contentWidget.startShowingAt(mouseEvent.target.range, HoverStartMode.Delayed, false);
+			}
 		} else if (targetType === MouseTargetType.GUTTER_GLYPH_MARGIN) {
 			this.contentWidget.hide();
-			this.glyphWidget.startShowingAt(mouseEvent.target.position.lineNumber);
+
+			if (this._isHoverEnabled) {
+				this.glyphWidget.startShowingAt(mouseEvent.target.position.lineNumber);
+			}
 		} else {
 			this._hideWidgets();
 		}
@@ -184,7 +220,9 @@ export class ModesHoverController implements editorCommon.IEditorContribution {
 	}
 
 	public dispose(): void {
-		this._toUnhook = dispose(this._toUnhook);
+		this._unhookEvents();
+		this._didChangeConfigurationHandler.dispose();
+
 		if (this._glyphWidget) {
 			this._glyphWidget.dispose();
 			this._glyphWidget = null;
diff --git a/src/vs/editor/contrib/hover/hoverOperation.ts b/src/vs/editor/contrib/hover/hoverOperation.ts
index fa6b0e949d1..16699608cd6 100644
--- a/src/vs/editor/contrib/hover/hoverOperation.ts
+++ b/src/vs/editor/contrib/hover/hoverOperation.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { RunOnceScheduler } from 'vs/base/common/async';
+import { RunOnceScheduler, CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
 import { onUnexpectedError } from 'vs/base/common/errors';
-import { TPromise } from 'vs/base/common/winjs.base';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export interface IHoverComputer<Result> {
 
 	/**
 	 * This is called after half the hover time
 	 */
-	computeAsync?: () => TPromise<Result>;
+	computeAsync?: (token: CancellationToken) => Promise<Result>;
 
 	/**
 	 * This is called after all the hover time
@@ -57,7 +57,7 @@ export class HoverOperation<Result> {
 	private _firstWaitScheduler: RunOnceScheduler;
 	private _secondWaitScheduler: RunOnceScheduler;
 	private _loadingMessageScheduler: RunOnceScheduler;
-	private _asyncComputationPromise: TPromise<void>;
+	private _asyncComputationPromise: CancelablePromise<void>;
 	private _asyncComputationPromiseDone: boolean;
 
 	private _completeCallback: (r: Result) => void;
@@ -103,10 +103,13 @@ export class HoverOperation<Result> {
 
 		if (this._computer.computeAsync) {
 			this._asyncComputationPromiseDone = false;
-			this._asyncComputationPromise = this._computer.computeAsync().then((asyncResult: Result) => {
-				this._asyncComputationPromiseDone = true;
-				this._withAsyncResult(asyncResult);
-			}, (e) => this._onError(e));
+			this._asyncComputationPromise = createCancelablePromise(token => {
+				return this._computer.computeAsync(token).then((asyncResult: Result) => {
+					this._asyncComputationPromiseDone = true;
+					this._withAsyncResult(asyncResult);
+				}, (e) => this._onError(e));
+			});
+
 		} else {
 			this._asyncComputationPromiseDone = true;
 		}
diff --git a/src/vs/editor/contrib/hover/modesContentHover.ts b/src/vs/editor/contrib/hover/modesContentHover.ts
index af946d803c9..26db8c908f0 100644
--- a/src/vs/editor/contrib/hover/modesContentHover.ts
+++ b/src/vs/editor/contrib/hover/modesContentHover.ts
@@ -6,7 +6,6 @@
 
 import * as nls from 'vs/nls';
 import * as dom from 'vs/base/browser/dom';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { IRange, Range } from 'vs/editor/common/core/range';
 import { Position } from 'vs/editor/common/core/position';
 import { HoverProviderRegistry, Hover, IColor, DocumentColorProvider } from 'vs/editor/common/modes';
@@ -21,9 +20,10 @@ import { ColorPickerModel } from 'vs/editor/contrib/colorPicker/colorPickerModel
 import { ColorPickerWidget } from 'vs/editor/contrib/colorPicker/colorPickerWidget';
 import { ColorDetector } from 'vs/editor/contrib/colorPicker/colorDetector';
 import { Color, RGBA } from 'vs/base/common/color';
-import { IDisposable, empty as EmptyDisposable, dispose, combinedDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, Disposable, combinedDisposable } from 'vs/base/common/lifecycle';
 import { getColorPresentations } from 'vs/editor/contrib/colorPicker/color';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { CancellationToken } from 'vs/base/common/cancellation';
 const $ = dom.$;
 
 class ColorHover {
@@ -57,17 +57,17 @@ class ModesContentComputer implements IHoverComputer<HoverPart[]> {
 		this._result = [];
 	}
 
-	computeAsync(): TPromise<HoverPart[]> {
+	computeAsync(token: CancellationToken): Promise<HoverPart[]> {
 		const model = this._editor.getModel();
 
 		if (!HoverProviderRegistry.has(model)) {
-			return TPromise.as(null);
+			return Promise.resolve(null);
 		}
 
 		return getHover(model, new Position(
 			this._range.startLineNumber,
 			this._range.startColumn
-		));
+		), token);
 	}
 
 	computeSync(): HoverPart[] {
@@ -167,8 +167,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 	private _shouldFocus: boolean;
 	private _colorPicker: ColorPickerWidget;
 
-	private renderDisposable: IDisposable = EmptyDisposable;
-	private toDispose: IDisposable[] = [];
+	private renderDisposable: IDisposable = Disposable.None;
 
 	constructor(
 		editor: ICodeEditor,
@@ -182,7 +181,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 		this._isChangingDecorations = false;
 
 		this._markdownRenderer = markdownRenderer;
-		markdownRenderer.onDidRenderCodeBlock(this.onContentsChange, this, this.toDispose);
+		this._register(markdownRenderer.onDidRenderCodeBlock(this.onContentsChange, this));
 
 		this._hoverOperation = new HoverOperation(
 			this._computer,
@@ -191,24 +190,23 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 			result => this._withResult(result, false)
 		);
 
-		this.toDispose.push(dom.addStandardDisposableListener(this.getDomNode(), dom.EventType.FOCUS, () => {
+		this._register(dom.addStandardDisposableListener(this.getDomNode(), dom.EventType.FOCUS, () => {
 			if (this._colorPicker) {
 				dom.addClass(this.getDomNode(), 'colorpicker-hover');
 			}
 		}));
-		this.toDispose.push(dom.addStandardDisposableListener(this.getDomNode(), dom.EventType.BLUR, () => {
+		this._register(dom.addStandardDisposableListener(this.getDomNode(), dom.EventType.BLUR, () => {
 			dom.removeClass(this.getDomNode(), 'colorpicker-hover');
 		}));
-		this.toDispose.push(editor.onDidChangeConfiguration((e) => {
+		this._register(editor.onDidChangeConfiguration((e) => {
 			this._hoverOperation.setHoverTime(this._editor.getConfiguration().contribInfo.hover.delay);
 		}));
 	}
 
 	dispose(): void {
 		this.renderDisposable.dispose();
-		this.renderDisposable = EmptyDisposable;
+		this.renderDisposable = Disposable.None;
 		this._hoverOperation.cancel();
-		this.toDispose = dispose(this.toDispose);
 		super.dispose();
 	}
 
@@ -276,7 +274,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 		this._highlightDecorations = this._editor.deltaDecorations(this._highlightDecorations, []);
 		this._isChangingDecorations = false;
 		this.renderDisposable.dispose();
-		this.renderDisposable = EmptyDisposable;
+		this.renderDisposable = Disposable.None;
 		this._colorPicker = null;
 	}
 
@@ -341,7 +339,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 				const model = new ColorPickerModel(color, [], 0);
 				const widget = new ColorPickerWidget(fragment, model, this._editor.getConfiguration().pixelRatio, this._themeService);
 
-				getColorPresentations(editorModel, colorInfo, msg.provider).then(colorPresentations => {
+				getColorPresentations(editorModel, colorInfo, msg.provider, CancellationToken.None).then(colorPresentations => {
 					model.colorPresentations = colorPresentations;
 					const originalText = this._editor.getModel().getValueInRange(msg.range);
 					model.guessColorPresentation(color, originalText);
@@ -383,7 +381,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 								blue: color.rgba.b / 255,
 								alpha: color.rgba.a
 							}
-						}, msg.provider).then((colorPresentations) => {
+						}, msg.provider, CancellationToken.None).then((colorPresentations) => {
 							model.colorPresentations = colorPresentations;
 						});
 					};
diff --git a/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts b/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
index 4d7b492685d..3127c005bfe 100644
--- a/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
+++ b/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
@@ -20,6 +20,8 @@ import { registerThemingParticipant } from 'vs/platform/theme/common/themeServic
 import { editorBracketMatchBorder } from 'vs/editor/common/view/editorColorRegistry';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { CancelablePromise, createCancelablePromise, timeout } from 'vs/base/common/async';
+import { onUnexpectedError } from 'vs/base/common/errors';
 
 class InPlaceReplaceController implements IEditorContribution {
 
@@ -33,11 +35,11 @@ class InPlaceReplaceController implements IEditorContribution {
 		className: 'valueSetReplacement'
 	});
 
-	private editor: ICodeEditor;
-	private currentRequest: TPromise<IInplaceReplaceSupportResult>;
-	private decorationRemover: TPromise<void>;
-	private decorationIds: string[];
-	private editorWorkerService: IEditorWorkerService;
+	private readonly editor: ICodeEditor;
+	private readonly editorWorkerService: IEditorWorkerService;
+	private decorationIds: string[] = [];
+	private currentRequest: CancelablePromise<IInplaceReplaceSupportResult>;
+	private decorationRemover: CancelablePromise<void>;
 
 	constructor(
 		editor: ICodeEditor,
@@ -45,9 +47,6 @@ class InPlaceReplaceController implements IEditorContribution {
 	) {
 		this.editor = editor;
 		this.editorWorkerService = editorWorkerService;
-		this.currentRequest = TPromise.as(<IInplaceReplaceSupportResult>null);
-		this.decorationRemover = TPromise.as(<void>null);
-		this.decorationIds = [];
 	}
 
 	public dispose(): void {
@@ -57,10 +56,12 @@ class InPlaceReplaceController implements IEditorContribution {
 		return InPlaceReplaceController.ID;
 	}
 
-	public run(source: string, up: boolean): TPromise<void> {
+	public run(source: string, up: boolean): Thenable<void> {
 
 		// cancel any pending request
-		this.currentRequest.cancel();
+		if (this.currentRequest) {
+			this.currentRequest.cancel();
+		}
 
 		let selection = this.editor.getSelection();
 		const model = this.editor.getModel();
@@ -74,18 +75,12 @@ class InPlaceReplaceController implements IEditorContribution {
 		const state = new EditorState(this.editor, CodeEditorStateFlag.Value | CodeEditorStateFlag.Position);
 
 		if (!this.editorWorkerService.canNavigateValueSet(modelURI)) {
-			this.currentRequest = TPromise.as(null);
-		} else {
-			this.currentRequest = this.editorWorkerService.navigateValueSet(modelURI, selection, up);
-			this.currentRequest = this.currentRequest.then((basicResult) => {
-				if (basicResult && basicResult.range && basicResult.value) {
-					return basicResult;
-				}
-				return null;
-			});
+			return undefined;
 		}
 
-		return this.currentRequest.then((result: IInplaceReplaceSupportResult) => {
+		this.currentRequest = createCancelablePromise(token => this.editorWorkerService.navigateValueSet(modelURI, selection, up));
+
+		return this.currentRequest.then(result => {
 
 			if (!result || !result.range || !result.value) {
 				// No proper result
@@ -127,12 +122,13 @@ class InPlaceReplaceController implements IEditorContribution {
 			}]);
 
 			// remove decoration after delay
-			this.decorationRemover.cancel();
-			this.decorationRemover = TPromise.timeout(350);
-			this.decorationRemover.then(() => {
-				this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
-			});
-		});
+			if (this.decorationRemover) {
+				this.decorationRemover.cancel();
+			}
+			this.decorationRemover = timeout(350);
+			this.decorationRemover.then(() => this.decorationIds = this.editor.deltaDecorations(this.decorationIds, [])).catch(onUnexpectedError);
+
+		}).catch(onUnexpectedError);
 	}
 }
 
@@ -156,7 +152,7 @@ class InPlaceReplaceUp extends EditorAction {
 		if (!controller) {
 			return undefined;
 		}
-		return controller.run(this.id, true);
+		return TPromise.wrap(controller.run(this.id, true));
 	}
 }
 
@@ -180,7 +176,7 @@ class InPlaceReplaceDown extends EditorAction {
 		if (!controller) {
 			return undefined;
 		}
-		return controller.run(this.id, false);
+		return TPromise.wrap(controller.run(this.id, false));
 	}
 }
 
diff --git a/src/vs/editor/contrib/links/getLinks.ts b/src/vs/editor/contrib/links/getLinks.ts
index bbeda1aedd4..fb5f845e883 100644
--- a/src/vs/editor/contrib/links/getLinks.ts
+++ b/src/vs/editor/contrib/links/getLinks.ts
@@ -14,6 +14,7 @@ import { ILink, LinkProvider, LinkProviderRegistry } from 'vs/editor/common/mode
 import { asWinJsPromise } from 'vs/base/common/async';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IModelService } from 'vs/editor/common/services/modelService';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export class Link implements ILink {
 
@@ -65,13 +66,13 @@ export class Link implements ILink {
 	}
 }
 
-export function getLinks(model: ITextModel): TPromise<Link[]> {
+export function getLinks(model: ITextModel, token: CancellationToken): Promise<Link[]> {
 
 	let links: Link[] = [];
 
 	// ask all providers for links in parallel
 	const promises = LinkProviderRegistry.ordered(model).reverse().map(provider => {
-		return asWinJsPromise(token => provider.provideLinks(model, token)).then(result => {
+		return Promise.resolve(provider.provideLinks(model, token)).then(result => {
 			if (Array.isArray(result)) {
 				const newLinks = result.map(link => new Link(link, provider));
 				links = union(links, newLinks);
@@ -79,7 +80,7 @@ export function getLinks(model: ITextModel): TPromise<Link[]> {
 		}, onUnexpectedExternalError);
 	});
 
-	return TPromise.join(promises).then(() => {
+	return Promise.all(promises).then(() => {
 		return links;
 	});
 }
@@ -137,5 +138,5 @@ CommandsRegistry.registerCommand('_executeLinkProvider', (accessor, ...args) =>
 		return undefined;
 	}
 
-	return getLinks(model);
+	return getLinks(model, CancellationToken.None);
 });
diff --git a/src/vs/editor/contrib/links/links.ts b/src/vs/editor/contrib/links/links.ts
index cea850c2a20..87fe09b073e 100644
--- a/src/vs/editor/contrib/links/links.ts
+++ b/src/vs/editor/contrib/links/links.ts
@@ -9,7 +9,6 @@ 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 { TPromise } from 'vs/base/common/winjs.base';
 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';
@@ -25,6 +24,7 @@ import { ClickLinkGesture, ClickLinkMouseEvent, ClickLinkKeyboardEvent } from 'v
 import { MarkdownString } from 'vs/base/common/htmlContent';
 import { TrackedRangeStickiness, IModelDeltaDecoration, IModelDecorationsChangeAccessor } from 'vs/editor/common/model';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import * as async from 'vs/base/common/async';
 
 const HOVER_MESSAGE_GENERAL_META = new MarkdownString().appendText(
 	platform.isMacintosh
@@ -149,8 +149,8 @@ class LinkDetector implements editorCommon.IEditorContribution {
 	private editor: ICodeEditor;
 	private enabled: boolean;
 	private listenersToRemove: IDisposable[];
-	private timeoutPromise: TPromise<void>;
-	private computePromise: TPromise<void>;
+	private timeoutPromise: async.CancelablePromise<void>;
+	private computePromise: async.CancelablePromise<Link[]>;
 	private activeLinkDecorationId: string;
 	private openerService: IOpenerService;
 	private notificationService: INotificationService;
@@ -226,7 +226,7 @@ class LinkDetector implements editorCommon.IEditorContribution {
 
 	private onChange(): void {
 		if (!this.timeoutPromise) {
-			this.timeoutPromise = TPromise.timeout(LinkDetector.RECOMPUTE_TIME);
+			this.timeoutPromise = async.timeout(LinkDetector.RECOMPUTE_TIME);
 			this.timeoutPromise.then(() => {
 				this.timeoutPromise = null;
 				this.beginCompute();
@@ -234,7 +234,7 @@ class LinkDetector implements editorCommon.IEditorContribution {
 		}
 	}
 
-	private beginCompute(): void {
+	private async beginCompute(): Promise<void> {
 		if (!this.editor.getModel() || !this.enabled) {
 			return;
 		}
@@ -243,10 +243,15 @@ class LinkDetector implements editorCommon.IEditorContribution {
 			return;
 		}
 
-		this.computePromise = getLinks(this.editor.getModel()).then(links => {
+		this.computePromise = async.createCancelablePromise(token => getLinks(this.editor.getModel(), token));
+		try {
+			const links = await this.computePromise;
 			this.updateDecorations(links);
+		} catch (err) {
+			onUnexpectedError(err);
+		} finally {
 			this.computePromise = null;
-		});
+		}
 	}
 
 	private updateDecorations(links: Link[]): void {
diff --git a/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts b/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts
index c0390869a9f..3d695a84c97 100644
--- a/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts
+++ b/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts
@@ -13,7 +13,7 @@ import * as dom from 'vs/base/browser/dom';
 import * as aria from 'vs/base/browser/ui/aria/aria';
 import { SignatureHelp, SignatureInformation, SignatureHelpProviderRegistry } from 'vs/editor/common/modes';
 import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
-import { RunOnceScheduler } from 'vs/base/common/async';
+import { RunOnceScheduler, createCancelablePromise, CancelablePromise } from 'vs/base/common/async';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Event, Emitter, chain } from 'vs/base/common/event';
 import { domEvent, stop } from 'vs/base/browser/event';
@@ -50,7 +50,7 @@ export class ParameterHintsModel extends Disposable {
 	private triggerCharactersListeners: IDisposable[];
 	private active: boolean;
 	private throttledDelayer: RunOnceScheduler;
-	private provideSignatureHelpRequest?: TPromise<boolean, any>;
+	private provideSignatureHelpRequest?: CancelablePromise<SignatureHelp>;
 
 	constructor(editor: ICodeEditor) {
 		super();
@@ -103,21 +103,21 @@ export class ParameterHintsModel extends Disposable {
 			this.provideSignatureHelpRequest.cancel();
 		}
 
-		this.provideSignatureHelpRequest = provideSignatureHelp(this.editor.getModel(), this.editor.getPosition())
-			.then(null, onUnexpectedError)
-			.then(result => {
-				if (!result || !result.signatures || result.signatures.length === 0) {
-					this.cancel();
-					this._onCancel.fire(void 0);
-					return false;
-				}
+		this.provideSignatureHelpRequest = createCancelablePromise(token => provideSignatureHelp(this.editor.getModel(), this.editor.getPosition(), token));
 
-				this.active = true;
+		this.provideSignatureHelpRequest.then(result => {
+			if (!result || !result.signatures || result.signatures.length === 0) {
+				this.cancel();
+				this._onCancel.fire(void 0);
+				return false;
+			}
 
-				const event: IHintEvent = { hints: result };
-				this._onHint.fire(event);
-				return true;
-			});
+			this.active = true;
+			const event: IHintEvent = { hints: result };
+			this._onHint.fire(event);
+			return true;
+
+		}).catch(onUnexpectedError);
 	}
 
 	isTriggered(): boolean {
diff --git a/src/vs/editor/contrib/parameterHints/provideSignatureHelp.ts b/src/vs/editor/contrib/parameterHints/provideSignatureHelp.ts
index f12e2c2eccb..6a6f30d27d5 100644
--- a/src/vs/editor/contrib/parameterHints/provideSignatureHelp.ts
+++ b/src/vs/editor/contrib/parameterHints/provideSignatureHelp.ts
@@ -3,27 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { asWinJsPromise, first } from 'vs/base/common/async';
+import { first2 } from 'vs/base/common/async';
 import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { registerDefaultLanguageCommand } from 'vs/editor/browser/editorExtensions';
 import { Position } from 'vs/editor/common/core/position';
 import { ITextModel } from 'vs/editor/common/model';
 import { SignatureHelp, SignatureHelpProviderRegistry } from 'vs/editor/common/modes';
 import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export const Context = {
 	Visible: new RawContextKey<boolean>('parameterHintsVisible', false),
 	MultipleSignatures: new RawContextKey<boolean>('parameterHintsMultipleSignatures', false),
 };
 
-export function provideSignatureHelp(model: ITextModel, position: Position): TPromise<SignatureHelp> {
+export function provideSignatureHelp(model: ITextModel, position: Position, token: CancellationToken = CancellationToken.None): Promise<SignatureHelp> {
 
 	const supports = SignatureHelpProviderRegistry.ordered(model);
 
-	return first(supports.map(support => () => {
-		return asWinJsPromise(token => support.provideSignatureHelp(model, position, token))
-			.then(undefined, onUnexpectedExternalError);
+	return first2(supports.map(support => () => {
+		return Promise.resolve(support.provideSignatureHelp(model, position, token)).catch(onUnexpectedExternalError);
 	}));
 }
 
diff --git a/src/vs/editor/contrib/referenceSearch/referenceSearch.ts b/src/vs/editor/contrib/referenceSearch/referenceSearch.ts
index 1f68bd41f23..cb21013f62b 100644
--- a/src/vs/editor/contrib/referenceSearch/referenceSearch.ts
+++ b/src/vs/editor/contrib/referenceSearch/referenceSearch.ts
@@ -17,7 +17,7 @@ import { Range } from 'vs/editor/common/core/range';
 import { PeekContext, getOuterEditor } from './peekViewWidget';
 import { ReferencesController, RequestOptions, ctxReferenceSearchVisible } from './referencesController';
 import { ReferencesModel, OneReference } from './referencesModel';
-import { asWinJsPromise } from 'vs/base/common/async';
+import { asWinJsPromise, createCancelablePromise } from 'vs/base/common/async';
 import { onUnexpectedExternalError } from 'vs/base/common/errors';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
@@ -28,6 +28,7 @@ import { ctxReferenceWidgetSearchTreeFocused } from 'vs/editor/contrib/reference
 import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands';
 import URI from 'vs/base/common/uri';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export const defaultReferenceSearchOptions: RequestOptions = {
 	getMetaTitle(model) {
@@ -85,7 +86,7 @@ export class ReferenceAction extends EditorAction {
 		}
 		let range = editor.getSelection();
 		let model = editor.getModel();
-		let references = provideReferences(model, range.getStartPosition()).then(references => new ReferencesModel(references));
+		let references = createCancelablePromise(token => provideReferences(model, range.getStartPosition(), token).then(references => new ReferencesModel(references)));
 		controller.toggleWidget(range, references, defaultReferenceSearchOptions);
 	}
 }
@@ -113,7 +114,7 @@ let findReferencesCommand: ICommandHandler = (accessor: ServicesAccessor, resour
 			return undefined;
 		}
 
-		let references = provideReferences(control.getModel(), Position.lift(position)).then(references => new ReferencesModel(references));
+		let references = createCancelablePromise(token => provideReferences(control.getModel(), Position.lift(position), token).then(references => new ReferencesModel(references)));
 		let range = new Range(position.lineNumber, position.column, position.lineNumber, position.column);
 		return TPromise.as(controller.toggleWidget(range, references, defaultReferenceSearchOptions));
 	});
@@ -137,7 +138,7 @@ let showReferencesCommand: ICommandHandler = (accessor: ServicesAccessor, resour
 
 		return TPromise.as(controller.toggleWidget(
 			new Range(position.lineNumber, position.column, position.lineNumber, position.column),
-			TPromise.as(new ReferencesModel(references)),
+			createCancelablePromise(_ => Promise.reject(new ReferencesModel(references))),
 			defaultReferenceSearchOptions)).then(() => true);
 	});
 };
@@ -266,7 +267,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	handler: openReferenceToSide
 });
 
-export function provideReferences(model: ITextModel, position: Position): TPromise<Location[]> {
+export function provideReferences(model: ITextModel, position: Position, token: CancellationToken): Promise<Location[]> {
 
 	// collect references from all providers
 	const promises = ReferenceProviderRegistry.ordered(model).map(provider => {
@@ -282,7 +283,7 @@ export function provideReferences(model: ITextModel, position: Position): TPromi
 		});
 	});
 
-	return TPromise.join(promises).then(references => {
+	return Promise.all(promises).then(references => {
 		let result: Location[] = [];
 		for (let ref of references) {
 			if (ref) {
diff --git a/src/vs/editor/contrib/referenceSearch/referencesController.ts b/src/vs/editor/contrib/referenceSearch/referencesController.ts
index 4f0182c8d6c..92dcaddafe9 100644
--- a/src/vs/editor/contrib/referenceSearch/referencesController.ts
+++ b/src/vs/editor/contrib/referenceSearch/referencesController.ts
@@ -25,6 +25,7 @@ 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';
+import { CancelablePromise } from 'vs/base/common/async';
 
 export const ctxReferenceSearchVisible = new RawContextKey<boolean>('referenceSearchVisible', false);
 
@@ -73,14 +74,16 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
 	}
 
 	public dispose(): void {
-		if (this._widget) {
-			this._widget.dispose();
-			this._widget = null;
-		}
+		this._referenceSearchVisible.reset();
+		dispose(this._disposables);
+		dispose(this._widget);
+		dispose(this._model);
+		this._widget = null;
+		this._model = null;
 		this._editor = null;
 	}
 
-	public toggleWidget(range: Range, modelPromise: TPromise<ReferencesModel>, options: RequestOptions): void {
+	public toggleWidget(range: Range, modelPromise: CancelablePromise<ReferencesModel>, options: RequestOptions): void {
 
 		// close current widget and return early is position didn't change
 		let widgetPosition: Position;
@@ -189,16 +192,12 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
 	}
 
 	public closeWidget(): void {
-		if (this._widget) {
-			this._widget.dispose();
-			this._widget = null;
-		}
+		dispose(this._widget);
+		this._widget = null;
 		this._referenceSearchVisible.reset();
 		this._disposables = dispose(this._disposables);
-		if (this._model) {
-			this._model.dispose();
-			this._model = null;
-		}
+		dispose(this._model);
+		this._model = null;
 		this._editor.focus();
 		this._requestIdPool += 1; // Cancel pending requests
 	}
diff --git a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
index f5d446bdd97..e4f12351690 100644
--- a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
+++ b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
@@ -705,7 +705,7 @@ export class ReferenceWidget extends PeekViewWidget {
 		this._preview.layout();
 	}
 
-	public setSelection(selection: OneReference): TPromise<any> {
+	public setSelection(selection: OneReference): Promise<any> {
 		return this._revealReference(selection, true).then(() => {
 
 			// show in tree
@@ -776,7 +776,7 @@ export class ReferenceWidget extends PeekViewWidget {
 		return undefined;
 	}
 
-	private async _revealReference(reference: OneReference, revealParent: boolean): TPromise<void> {
+	private async _revealReference(reference: OneReference, revealParent: boolean): Promise<void> {
 
 		// Update widget header
 		if (reference.uri.scheme !== Schemas.inMemory) {
diff --git a/src/vs/editor/contrib/rename/rename.ts b/src/vs/editor/contrib/rename/rename.ts
index a3939df7767..7ef4daba9a4 100644
--- a/src/vs/editor/contrib/rename/rename.ts
+++ b/src/vs/editor/contrib/rename/rename.ts
@@ -46,7 +46,7 @@ class RenameSkeleton {
 		return this._provider.length > 0;
 	}
 
-	async resolveRenameLocation(): TPromise<RenameLocation> {
+	async resolveRenameLocation(): Promise<RenameLocation> {
 
 		let [provider] = this._provider;
 		let res: RenameLocation;
@@ -68,7 +68,7 @@ class RenameSkeleton {
 		return res;
 	}
 
-	async provideRenameEdits(newName: string, i: number = 0, rejects: string[] = [], position: Position = this.position): TPromise<WorkspaceEdit> {
+	async provideRenameEdits(newName: string, i: number = 0, rejects: string[] = [], position: Position = this.position): Promise<WorkspaceEdit> {
 
 		if (i >= this._provider.length) {
 			return {
@@ -88,7 +88,7 @@ class RenameSkeleton {
 	}
 }
 
-export async function rename(model: ITextModel, position: Position, newName: string): TPromise<WorkspaceEdit> {
+export async function rename(model: ITextModel, position: Position, newName: string): Promise<WorkspaceEdit> {
 	return new RenameSkeleton(model, position).provideRenameEdits(newName);
 }
 
@@ -127,7 +127,7 @@ class RenameController implements IEditorContribution {
 		return RenameController.ID;
 	}
 
-	public async run(): TPromise<void> {
+	public async run(): Promise<void> {
 
 		const position = this.editor.getPosition();
 		const skeleton = new RenameSkeleton(this.editor.getModel(), position);
@@ -172,7 +172,7 @@ class RenameController implements IEditorContribution {
 
 			const state = new EditorState(this.editor, CodeEditorStateFlag.Position | CodeEditorStateFlag.Value | CodeEditorStateFlag.Selection | CodeEditorStateFlag.Scroll);
 
-			const renameOperation = skeleton.provideRenameEdits(newNameOrFocusFlag, 0, [], Range.lift(loc.range).getStartPosition()).then(result => {
+			const renameOperation = TPromise.wrap(skeleton.provideRenameEdits(newNameOrFocusFlag, 0, [], Range.lift(loc.range).getStartPosition()).then(result => {
 				if (result.rejectReason) {
 					if (state.validate(this.editor)) {
 						MessageController.get(this.editor).showMessage(result.rejectReason, this.editor.getPosition());
@@ -195,7 +195,7 @@ class RenameController implements IEditorContribution {
 			}, err => {
 				this._notificationService.error(nls.localize('rename.failed', "Rename failed to execute."));
 				return TPromise.wrapError(err);
-			});
+			}));
 
 			this._progressService.showWhile(renameOperation, 250);
 			return renameOperation;
@@ -256,7 +256,7 @@ export class RenameAction extends EditorAction {
 	run(accessor: ServicesAccessor, editor: ICodeEditor): TPromise<void> {
 		let controller = RenameController.get(editor);
 		if (controller) {
-			return controller.run();
+			return TPromise.wrap(controller.run());
 		}
 		return undefined;
 	}
diff --git a/src/vs/editor/contrib/snippet/snippet.md b/src/vs/editor/contrib/snippet/snippet.md
index 6b29d44c16e..ce571c614af 100644
--- a/src/vs/editor/contrib/snippet/snippet.md
+++ b/src/vs/editor/contrib/snippet/snippet.md
@@ -85,9 +85,7 @@ tabstop     ::= '$' int
                 | '${' int '}'
                 | '${' int  transform '}'
 placeholder ::= '${' int ':' any '}'
-                | '${' int ':' any transform '}'
 choice      ::= '${' int '|' text (',' text)* '|}'
-                | '${' int '|' text (',' text)* '|' transform '}'
 variable    ::= '$' var | '${' var }'
                 | '${' var ':' any '}'
                 | '${' var transform '}'
@@ -103,5 +101,3 @@ var         ::= [_a-zA-Z] [_a-zA-Z0-9]*
 int         ::= [0-9]+
 text        ::= .*
 ```
-
-Transformations for placeholders and choices are an extension to the TextMate snippet grammar and only support by Visual Studio Code.
\ No newline at end of file
diff --git a/src/vs/editor/contrib/snippet/snippetController2.ts b/src/vs/editor/contrib/snippet/snippetController2.ts
index 83abd441a26..3022a612e99 100644
--- a/src/vs/editor/contrib/snippet/snippetController2.ts
+++ b/src/vs/editor/contrib/snippet/snippetController2.ts
@@ -205,6 +205,10 @@ export class SnippetController2 implements IEditorContribution {
 		this._updateState();
 	}
 
+	isInSnippet(): boolean {
+		return this._inSnippet.get();
+	}
+
 	getSessionEnclosingRange(): Range {
 		if (this._session) {
 			return this._session.getEnclosingRange();
diff --git a/src/vs/editor/contrib/snippet/snippetParser.ts b/src/vs/editor/contrib/snippet/snippetParser.ts
index 35e163ea4ff..bf034b00bb3 100644
--- a/src/vs/editor/contrib/snippet/snippetParser.ts
+++ b/src/vs/editor/contrib/snippet/snippetParser.ts
@@ -643,6 +643,9 @@ export class SnippetParser {
 		let start = this._token;
 		while (this._token.type !== type) {
 			this._token = this._scanner.next();
+			if (this._token.type === TokenType.EOF) {
+				return false;
+			}
 		}
 		let value = this._scanner.value.substring(start.pos, this._token.pos);
 		this._token = this._scanner.next();
@@ -715,17 +718,6 @@ export class SnippetParser {
 					return true;
 				}
 
-				//../<regex>/<format>/<options>} -> transform
-				if (this._accept(TokenType.Forwardslash)) {
-					if (this._parseTransform(placeholder)) {
-						parent.appendChild(placeholder);
-						return true;
-					}
-
-					this._backTo(token);
-					return false;
-				}
-
 				if (this._parse(placeholder)) {
 					continue;
 				}
@@ -754,13 +746,6 @@ export class SnippetParser {
 							parent.appendChild(placeholder);
 							return true;
 						}
-						if (this._accept(TokenType.Forwardslash)) {
-							// ...|/<regex>/<format>/<options>} -> transform
-							if (this._parseTransform(placeholder)) {
-								parent.appendChild(placeholder);
-								return true;
-							}
-						}
 					}
 				}
 
diff --git a/src/vs/editor/contrib/snippet/snippetSession.ts b/src/vs/editor/contrib/snippet/snippetSession.ts
index 1c183f104c5..ba550ec1d24 100644
--- a/src/vs/editor/contrib/snippet/snippetSession.ts
+++ b/src/vs/editor/contrib/snippet/snippetSession.ts
@@ -98,10 +98,12 @@ export class OneSnippet {
 					const range = this._editor.getModel().getDecorationRange(id);
 					const currentValue = this._editor.getModel().getValueInRange(range);
 
-					operations.push({ range: range, text: placeholder.transform.resolve(currentValue) });
+					operations.push(EditOperation.replaceMove(range, placeholder.transform.resolve(currentValue)));
 				}
 			}
-			this._editor.getModel().applyEdits(operations);
+			if (operations.length > 0) {
+				this._editor.executeEdits('snippet.placeholderTransform', operations);
+			}
 		}
 
 		if (fwd === true && this._placeholderGroupsIdx < this._placeholderGroups.length - 1) {
@@ -182,6 +184,14 @@ export class OneSnippet {
 
 				const id = this._placeholderDecorations.get(placeholder);
 				const range = this._editor.getModel().getDecorationRange(id);
+				if (!range) {
+					// one of the placeholder lost its decoration and
+					// therefore we bail out and pretend the placeholder
+					// (with its mirrors) doesn't exist anymore.
+					result.delete(placeholder.index);
+					break;
+				}
+
 				ranges.push(range);
 			}
 		}
diff --git a/src/vs/editor/contrib/snippet/test/snippetParser.test.ts b/src/vs/editor/contrib/snippet/test/snippetParser.test.ts
index b3ab4b6debe..301c9dd1b81 100644
--- a/src/vs/editor/contrib/snippet/test/snippetParser.test.ts
+++ b/src/vs/editor/contrib/snippet/test/snippetParser.test.ts
@@ -254,21 +254,6 @@ suite('SnippetParser', () => {
 		assertTextAndMarker('${1/regex/format/options', '${1/regex/format/options', Text);
 	});
 
-	test('Parser, placeholder with defaults and transformation', () => {
-		assertTextAndMarker('${1:value/foo/bar/}', 'value', Placeholder);
-		assertTextAndMarker('${1:bar${2:foo}bar/foo/bar/}', 'barfoobar', Placeholder);
-
-		// incomplete
-		assertTextAndMarker('${1:bar${2:foobar}/foo/bar/', '${1:barfoobar/foo/bar/', Text, Placeholder, Text);
-	});
-
-	test('Parser, placeholder with choice and transformation', () => {
-		assertTextAndMarker('${1|one,two,three|/foo/bar/}', 'one', Placeholder);
-		assertTextAndMarker('${1|one|/foo/bar/}', 'one', Placeholder);
-		assertTextAndMarker('${1|one,two,three,|/foo/bar/}', '${1|one,two,three,|/foo/bar/}', Text);
-		assertTextAndMarker('${1|one,/foo/bar/', '${1|one,/foo/bar/', Text);
-	});
-
 	test('No way to escape forward slash in snippet regex #36715', function () {
 		assertMarker('${TM_DIRECTORY/src\\//$1/}', Variable);
 	});
@@ -408,32 +393,37 @@ suite('SnippetParser', () => {
 	});
 
 	test('Parser, transform example', () => {
-		let marker = new SnippetParser().parse('${1:name} : ${2:type}${3: :=/\\s:=(.*)/${1:+ :=}${1}/};\n$0');
-		let childs = marker.children;
+		let { children } = new SnippetParser().parse('${1:name} : ${2:type}${3/\\s:=(.*)/${1:+ :=}${1}/};\n$0');
 
-		assert.ok(childs[0] instanceof Placeholder);
-		assert.equal(childs[0].children.length, 1);
-		assert.equal(childs[0].children[0].toString(), 'name');
-		assert.equal((<Placeholder>childs[0]).transform, undefined);
-		assert.ok(childs[1] instanceof Text);
-		assert.equal(childs[1].toString(), ' : ');
-		assert.ok(childs[2] instanceof Placeholder);
-		assert.equal(childs[2].children.length, 1);
-		assert.equal(childs[2].children[0].toString(), 'type');
-		assert.ok(childs[3] instanceof Placeholder);
-		assert.equal(childs[3].children.length, 1);
-		assert.equal(childs[3].children[0].toString(), ' :=');
-		assert.notEqual((<Placeholder>childs[3]).transform, undefined);
-		let t = (<Placeholder>childs[3]).transform;
-		assert.equal(t.regexp, '/\\s:=(.*)/');
-		assert.equal(t.children.length, 2);
-		assert.ok(t.children[0] instanceof FormatString);
-		assert.equal((<FormatString>t.children[0]).index, 1);
-		assert.equal((<FormatString>t.children[0]).ifValue, ' :=');
-		assert.ok(t.children[1] instanceof FormatString);
-		assert.equal((<FormatString>t.children[1]).index, 1);
-		assert.ok(childs[4] instanceof Text);
-		assert.equal(childs[4].toString(), ';\n');
+		//${1:name}
+		assert.ok(children[0] instanceof Placeholder);
+		assert.equal(children[0].children.length, 1);
+		assert.equal(children[0].children[0].toString(), 'name');
+		assert.equal((<Placeholder>children[0]).transform, undefined);
+
+		// :
+		assert.ok(children[1] instanceof Text);
+		assert.equal(children[1].toString(), ' : ');
+
+		//${2:type}
+		assert.ok(children[2] instanceof Placeholder);
+		assert.equal(children[2].children.length, 1);
+		assert.equal(children[2].children[0].toString(), 'type');
+
+		//${3/\\s:=(.*)/${1:+ :=}${1}/}
+		assert.ok(children[3] instanceof Placeholder);
+		assert.equal(children[3].children.length, 0);
+		assert.notEqual((<Placeholder>children[3]).transform, undefined);
+		let transform = (<Placeholder>children[3]).transform;
+		assert.equal(transform.regexp, '/\\s:=(.*)/');
+		assert.equal(transform.children.length, 2);
+		assert.ok(transform.children[0] instanceof FormatString);
+		assert.equal((<FormatString>transform.children[0]).index, 1);
+		assert.equal((<FormatString>transform.children[0]).ifValue, ' :=');
+		assert.ok(transform.children[1] instanceof FormatString);
+		assert.equal((<FormatString>transform.children[1]).index, 1);
+		assert.ok(children[4] instanceof Text);
+		assert.equal(children[4].toString(), ';\n');
 
 	});
 
@@ -454,20 +444,6 @@ suite('SnippetParser', () => {
 
 	test('Parser, default placeholder values and one transform', () => {
 
-		assertMarker('errorContext: `${1:err/err/ok/}`, error: $1', Text, Placeholder, Text, Placeholder);
-
-		const [, p1, , p2] = new SnippetParser().parse('errorContext: `${1:err/err/ok/}`, error:$1').children;
-
-		assert.equal((<Placeholder>p1).index, '1');
-		assert.equal((<Placeholder>p1).children.length, '1');
-		assert.equal((<Text>(<Placeholder>p1).children[0]), 'err');
-		assert.notEqual((<Placeholder>p1).transform, undefined);
-
-		assert.equal((<Placeholder>p2).index, '1');
-		assert.equal((<Placeholder>p2).children.length, '1');
-		assert.equal((<Text>(<Placeholder>p2).children[0]), 'err');
-		assert.equal((<Placeholder>p2).transform, undefined);
-
 		assertMarker('errorContext: `${1:err}`, error: ${1/err/ok/}', Text, Placeholder, Text, Placeholder);
 
 		const [, p3, , p4] = new SnippetParser().parse('errorContext: `${1:err}`, error:${1/err/ok/}').children;
@@ -727,4 +703,13 @@ suite('SnippetParser', () => {
 		transform.regexp = new RegExp('foo', 'gi');
 		assert.equal(transform.toTextmateString(), '/foo/bar/ig');
 	});
+
+	test('Snippet parser freeze #53144', function () {
+		let snippet = new SnippetParser().parse('${1/(void$)|(.+)/${1:?-\treturn nil;}/}');
+		assertMarker(snippet, Placeholder);
+	});
+
+	test('snippets variable not resolved in JSON proposal #52931', function () {
+		assertTextAndMarker('FOO${1:/bin/bash}', 'FOO/bin/bash', Text, Placeholder);
+	});
 });
diff --git a/src/vs/editor/contrib/snippet/test/snippetSession.test.ts b/src/vs/editor/contrib/snippet/test/snippetSession.test.ts
index 95eaf41c1e8..2787ad8e2a1 100644
--- a/src/vs/editor/contrib/snippet/test/snippetSession.test.ts
+++ b/src/vs/editor/contrib/snippet/test/snippetSession.test.ts
@@ -472,7 +472,7 @@ suite('SnippetSession', function () {
 	test('snippets, transform example', function () {
 		editor.getModel().setValue('');
 		editor.setSelection(new Selection(1, 1, 1, 1));
-		const session = new SnippetSession(editor, '${1:name} : ${2:type}${3: :=/\\s:=(.*)/${1:+ :=}${1}/};\n$0');
+		const session = new SnippetSession(editor, '${1:name} : ${2:type}${3/\\s:=(.*)/${1:+ :=}${1}/};\n$0');
 		session.insert();
 
 		assertSelections(editor, new Selection(1, 1, 1, 5));
@@ -483,7 +483,7 @@ suite('SnippetSession', function () {
 		editor.trigger('test', 'type', { text: 'std_logic' });
 		session.next();
 
-		assertSelections(editor, new Selection(1, 16, 1, 19));
+		assertSelections(editor, new Selection(1, 16, 1, 16));
 		session.next();
 
 		assert.equal(model.getValue(), 'clk : std_logic;\n');
@@ -534,7 +534,7 @@ suite('SnippetSession', function () {
 	test('snippets, transform example hit if', function () {
 		editor.getModel().setValue('');
 		editor.setSelection(new Selection(1, 1, 1, 1));
-		const session = new SnippetSession(editor, '${1:name} : ${2:type}${3: :=/\\s:=(.*)/${1:+ :=}${1}/};\n$0');
+		const session = new SnippetSession(editor, '${1:name} : ${2:type}${3/\\s:=(.*)/${1:+ :=}${1}/};\n$0');
 		session.insert();
 
 		assertSelections(editor, new Selection(1, 1, 1, 5));
@@ -545,7 +545,7 @@ suite('SnippetSession', function () {
 		editor.trigger('test', 'type', { text: 'std_logic' });
 		session.next();
 
-		assertSelections(editor, new Selection(1, 16, 1, 19));
+		assertSelections(editor, new Selection(1, 16, 1, 16));
 		editor.trigger('test', 'type', { text: ' := \'1\'' });
 		session.next();
 
diff --git a/src/vs/editor/contrib/suggest/completionModel.ts b/src/vs/editor/contrib/suggest/completionModel.ts
index 255750fe219..06208d010d0 100644
--- a/src/vs/editor/contrib/suggest/completionModel.ts
+++ b/src/vs/editor/contrib/suggest/completionModel.ts
@@ -8,7 +8,8 @@
 import { fuzzyScore, fuzzyScoreGracefulAggressive, anyScore } from 'vs/base/common/filters';
 import { isDisposable } from 'vs/base/common/lifecycle';
 import { ISuggestResult, ISuggestSupport } from 'vs/editor/common/modes';
-import { ISuggestionItem, SnippetConfig } from './suggest';
+import { ISuggestionItem } from './suggest';
+import { InternalSuggestOptions, EDITOR_DEFAULTS } from 'vs/editor/common/config/editorOptions';
 
 export interface ICompletionItem extends ISuggestionItem {
 	matches?: number[];
@@ -46,8 +47,9 @@ const enum Refilter {
 
 export class CompletionModel {
 
-	private readonly _column: number;
 	private readonly _items: ICompletionItem[];
+	private readonly _column: number;
+	private readonly _options: InternalSuggestOptions;
 	private readonly _snippetCompareFn = CompletionModel._compareCompletionItems;
 
 	private _lineContext: LineContext;
@@ -56,15 +58,16 @@ export class CompletionModel {
 	private _isIncomplete: Set<ISuggestSupport>;
 	private _stats: ICompletionStats;
 
-	constructor(items: ISuggestionItem[], column: number, lineContext: LineContext, snippetConfig?: SnippetConfig) {
+	constructor(items: ISuggestionItem[], column: number, lineContext: LineContext, options: InternalSuggestOptions = EDITOR_DEFAULTS.contribInfo.suggest) {
 		this._items = items;
 		this._column = column;
+		this._options = options;
 		this._refilterKind = Refilter.All;
 		this._lineContext = lineContext;
 
-		if (snippetConfig === 'top') {
+		if (options.snippets === 'top') {
 			this._snippetCompareFn = CompletionModel._compareCompletionItemsSnippetsUp;
-		} else if (snippetConfig === 'bottom') {
+		} else if (options.snippets === 'bottom') {
 			this._snippetCompareFn = CompletionModel._compareCompletionItemsSnippetsDown;
 		}
 	}
@@ -146,8 +149,9 @@ export class CompletionModel {
 		const target: typeof source = [];
 
 		// picks a score function based on the number of
-		// items that we have to score/filter
-		const scoreFn = source.length > 2000 ? fuzzyScore : fuzzyScoreGracefulAggressive;
+		// items that we have to score/filter and based on the
+		// user-configuration
+		const scoreFn = (!this._options.filterGraceful || source.length > 2000) ? fuzzyScore : fuzzyScoreGracefulAggressive;
 
 		for (let i = 0; i < source.length; i++) {
 
diff --git a/src/vs/editor/contrib/suggest/suggest.ts b/src/vs/editor/contrib/suggest/suggest.ts
index 566e1b12963..9bfe478497b 100644
--- a/src/vs/editor/contrib/suggest/suggest.ts
+++ b/src/vs/editor/contrib/suggest/suggest.ts
@@ -3,12 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { asWinJsPromise, first } from 'vs/base/common/async';
+import { first2 } from 'vs/base/common/async';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 import { compareIgnoreCase } from 'vs/base/common/strings';
 import { assign } from 'vs/base/common/objects';
 import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { ITextModel } from 'vs/editor/common/model';
 import { registerDefaultLanguageCommand } from 'vs/editor/browser/editorExtensions';
@@ -16,6 +15,7 @@ import { ISuggestResult, ISuggestSupport, ISuggestion, SuggestRegistry, SuggestC
 import { Position, IPosition } from 'vs/editor/common/core/position';
 import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export const Context = {
 	Visible: new RawContextKey<boolean>('suggestWidgetVisible', false),
@@ -30,7 +30,7 @@ export interface ISuggestionItem {
 	suggestion: ISuggestion;
 	container: ISuggestResult;
 	support: ISuggestSupport;
-	resolve(): TPromise<void>;
+	resolve(token: CancellationToken): Thenable<void>;
 }
 
 export type SnippetConfig = 'top' | 'bottom' | 'inline' | 'none';
@@ -47,7 +47,14 @@ export function setSnippetSuggestSupport(support: ISuggestSupport): ISuggestSupp
 	return old;
 }
 
-export function provideSuggestionItems(model: ITextModel, position: Position, snippetConfig: SnippetConfig = 'bottom', onlyFrom?: ISuggestSupport[], context?: SuggestContext): TPromise<ISuggestionItem[]> {
+export function provideSuggestionItems(
+	model: ITextModel,
+	position: Position,
+	snippetConfig: SnippetConfig = 'bottom',
+	onlyFrom?: ISuggestSupport[],
+	context?: SuggestContext,
+	token: CancellationToken = CancellationToken.None
+): Promise<ISuggestionItem[]> {
 
 	const allSuggestions: ISuggestionItem[] = [];
 	const acceptSuggestion = createSuggesionFilter(snippetConfig);
@@ -69,13 +76,13 @@ export function provideSuggestionItems(model: ITextModel, position: Position, sn
 	let hasResult = false;
 	const factory = supports.map(supports => () => {
 		// for each support in the group ask for suggestions
-		return TPromise.join(supports.map(support => {
+		return Promise.all(supports.map(support => {
 
 			if (!isFalsyOrEmpty(onlyFrom) && onlyFrom.indexOf(support) < 0) {
 				return undefined;
 			}
 
-			return asWinJsPromise(token => support.provideCompletionItems(model, position, suggestConext, token)).then(container => {
+			return Promise.resolve(support.provideCompletionItems(model, position, suggestConext, token)).then(container => {
 
 				const len = allSuggestions.length;
 
@@ -104,7 +111,7 @@ export function provideSuggestionItems(model: ITextModel, position: Position, sn
 		}));
 	});
 
-	const result = first(factory, () => hasResult).then(() => allSuggestions.sort(getSuggestionComparator(snippetConfig)));
+	const result = first2(factory, () => hasResult).then(() => allSuggestions.sort(getSuggestionComparator(snippetConfig)));
 
 	// result.then(items => {
 	// 	console.log(model.getWordUntilPosition(position), items.map(item => `${item.suggestion.label}, type=${item.suggestion.type}, incomplete?${item.container.incomplete}, overwriteBefore=${item.suggestion.overwriteBefore}`));
@@ -125,13 +132,13 @@ function fixOverwriteBeforeAfter(suggestion: ISuggestion, container: ISuggestRes
 	}
 }
 
-function createSuggestionResolver(provider: ISuggestSupport, suggestion: ISuggestion, model: ITextModel, position: Position): () => TPromise<void> {
-	return () => {
+function createSuggestionResolver(provider: ISuggestSupport, suggestion: ISuggestion, model: ITextModel, position: Position): (token: CancellationToken) => Promise<void> {
+	return (token) => {
 		if (typeof provider.resolveCompletionItem === 'function') {
-			return asWinJsPromise(token => provider.resolveCompletionItem(model, position, suggestion, token))
-				.then(value => { assign(suggestion, value); });
+			return Promise.resolve(provider.resolveCompletionItem(model, position, suggestion, token)).then(value => { assign(suggestion, value); });
+		} else {
+			return Promise.resolve(void 0);
 		}
-		return TPromise.as(void 0);
 	};
 }
 
@@ -213,13 +220,13 @@ registerDefaultLanguageCommand('_executeCompletionItemProvider', (model, positio
 	return provideSuggestionItems(model, position).then(items => {
 		for (const item of items) {
 			if (resolving.length < maxItemsToResolve) {
-				resolving.push(item.resolve());
+				resolving.push(item.resolve(CancellationToken.None));
 			}
 			result.incomplete = result.incomplete || item.container.incomplete;
 			result.suggestions.push(item.suggestion);
 		}
 	}).then(() => {
-		return TPromise.join(resolving);
+		return Promise.all(resolving);
 	}).then(() => {
 		return result;
 	});
diff --git a/src/vs/editor/contrib/suggest/suggestController.ts b/src/vs/editor/contrib/suggest/suggestController.ts
index e073751d3f3..f92c3459f73 100644
--- a/src/vs/editor/contrib/suggest/suggestController.ts
+++ b/src/vs/editor/contrib/suggest/suggestController.ts
@@ -355,7 +355,7 @@ registerEditorCommand(new SuggestCommand({
 	handler: x => x.acceptSelectedSuggestion(),
 	kbOpts: {
 		weight: weight,
-		kbExpr: ContextKeyExpr.and(EditorContextKeys.textInputFocus, SnippetController2.InSnippetMode.toNegated()),
+		kbExpr: EditorContextKeys.textInputFocus,
 		primary: KeyCode.Tab
 	}
 }));
diff --git a/src/vs/editor/contrib/suggest/suggestModel.ts b/src/vs/editor/contrib/suggest/suggestModel.ts
index 0032b4fdc52..4a427b85dfe 100644
--- a/src/vs/editor/contrib/suggest/suggestModel.ts
+++ b/src/vs/editor/contrib/suggest/suggestModel.ts
@@ -5,12 +5,11 @@
 'use strict';
 
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
-import { TimeoutTimer } from 'vs/base/common/async';
+import { TimeoutTimer, CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { values } from 'vs/base/common/map';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { CursorChangeReason, ICursorSelectionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
 import { Position } from 'vs/editor/common/core/position';
@@ -19,6 +18,7 @@ import { ITextModel, IWordAtPosition } from 'vs/editor/common/model';
 import { ISuggestSupport, StandardTokenType, SuggestContext, SuggestRegistry, SuggestTriggerKind } from 'vs/editor/common/modes';
 import { CompletionModel } from './completionModel';
 import { ISuggestionItem, getSuggestionComparator, provideSuggestionItems, getSnippetSuggestSupport } from './suggest';
+import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2';
 
 export interface ICancelEvent {
 	readonly retrigger: boolean;
@@ -89,11 +89,11 @@ export class SuggestModel implements IDisposable {
 	private _toDispose: IDisposable[] = [];
 	private _quickSuggestDelay: number;
 	private _triggerCharacterListener: IDisposable;
-	private _triggerAutoSuggestPromise: TPromise<void>;
-	private _triggerRefilter = new TimeoutTimer();
+	private readonly _triggerQuickSuggest = new TimeoutTimer();
+	private readonly _triggerRefilter = new TimeoutTimer();
 	private _state: State;
 
-	private _requestPromise: TPromise<void>;
+	private _requestPromise: CancelablePromise<ISuggestionItem[]>;
 	private _context: LineContext;
 	private _currentSelection: Selection;
 
@@ -109,7 +109,6 @@ export class SuggestModel implements IDisposable {
 	constructor(editor: ICodeEditor) {
 		this._editor = editor;
 		this._state = State.Idle;
-		this._triggerAutoSuggestPromise = null;
 		this._requestPromise = null;
 		this._completionModel = null;
 		this._context = null;
@@ -144,7 +143,7 @@ export class SuggestModel implements IDisposable {
 	}
 
 	dispose(): void {
-		dispose([this._onDidCancel, this._onDidSuggest, this._onDidTrigger, this._triggerCharacterListener, this._triggerRefilter]);
+		dispose([this._onDidCancel, this._onDidSuggest, this._onDidTrigger, this._triggerCharacterListener, this._triggerQuickSuggest, this._triggerRefilter]);
 		this._toDispose = dispose(this._toDispose);
 		dispose(this._completionModel);
 		this.cancel();
@@ -209,9 +208,9 @@ export class SuggestModel implements IDisposable {
 
 		this._triggerRefilter.cancel();
 
-		if (this._triggerAutoSuggestPromise) {
-			this._triggerAutoSuggestPromise.cancel();
-			this._triggerAutoSuggestPromise = null;
+		if (this._triggerQuickSuggest) {
+			this._triggerQuickSuggest.cancel();
+
 		}
 
 		if (this._requestPromise) {
@@ -265,48 +264,58 @@ export class SuggestModel implements IDisposable {
 
 		if (this._state === State.Idle) {
 
-			// trigger 24x7 IntelliSense when idle, enabled, when cursor
-			// moved RIGHT, and when at a good position
-			if (this._editor.getConfiguration().contribInfo.quickSuggestions !== false
-				&& (prevSelection.containsRange(this._currentSelection)
-					|| prevSelection.getEndPosition().isBeforeOrEqual(this._currentSelection.getPosition()))
-			) {
-				this.cancel();
-
-				this._triggerAutoSuggestPromise = TPromise.timeout(this._quickSuggestDelay);
-				this._triggerAutoSuggestPromise.then(() => {
-					if (LineContext.shouldAutoTrigger(this._editor)) {
-						const model = this._editor.getModel();
-						const pos = this._editor.getPosition();
-
-						if (!model) {
-							return;
-						}
-						// validate enabled now
-						const { quickSuggestions } = this._editor.getConfiguration().contribInfo;
-						if (quickSuggestions === false) {
-							return;
-						} else if (quickSuggestions === true) {
-							// all good
-						} else {
-							// Check the type of the token that triggered this
-							model.tokenizeIfCheap(pos.lineNumber);
-							const lineTokens = model.getLineTokens(pos.lineNumber);
-							const tokenType = lineTokens.getStandardTokenType(lineTokens.findTokenIndexAtOffset(Math.max(pos.column - 1 - 1, 0)));
-							const inValidScope = quickSuggestions.other && tokenType === StandardTokenType.Other
-								|| quickSuggestions.comments && tokenType === StandardTokenType.Comment
-								|| quickSuggestions.strings && tokenType === StandardTokenType.String;
-
-							if (!inValidScope) {
-								return;
-							}
-						}
-
-						this.trigger({ auto: true });
-					}
-					this._triggerAutoSuggestPromise = null;
-				});
+			if (this._editor.getConfiguration().contribInfo.quickSuggestions === false) {
+				// not enabled
+				return;
 			}
+
+			if (!prevSelection.containsRange(this._currentSelection) && !prevSelection.getEndPosition().isBeforeOrEqual(this._currentSelection.getPosition())) {
+				// cursor didn't move RIGHT
+				return;
+			}
+
+			if (this._editor.getConfiguration().contribInfo.suggest.snippetsPreventQuickSuggestions && SnippetController2.get(this._editor).isInSnippet()) {
+				// no quick suggestion when in snippet mode
+				return;
+			}
+
+			this.cancel();
+
+			this._triggerQuickSuggest.cancelAndSet(() => {
+				if (!LineContext.shouldAutoTrigger(this._editor)) {
+					return;
+				}
+
+				const model = this._editor.getModel();
+				const pos = this._editor.getPosition();
+				if (!model) {
+					return;
+				}
+				// validate enabled now
+				const { quickSuggestions } = this._editor.getConfiguration().contribInfo;
+				if (quickSuggestions === false) {
+					return;
+				} else if (quickSuggestions === true) {
+					// all good
+				} else {
+					// Check the type of the token that triggered this
+					model.tokenizeIfCheap(pos.lineNumber);
+					const lineTokens = model.getLineTokens(pos.lineNumber);
+					const tokenType = lineTokens.getStandardTokenType(lineTokens.findTokenIndexAtOffset(Math.max(pos.column - 1 - 1, 0)));
+					const inValidScope = quickSuggestions.other && tokenType === StandardTokenType.Other
+						|| quickSuggestions.comments && tokenType === StandardTokenType.Comment
+						|| quickSuggestions.strings && tokenType === StandardTokenType.String;
+
+					if (!inValidScope) {
+						return;
+					}
+				}
+
+				// we made it till here -> trigger now
+				this.trigger({ auto: true });
+
+			}, this._quickSuggestDelay);
+
 		}
 	}
 
@@ -356,11 +365,16 @@ export class SuggestModel implements IDisposable {
 			suggestCtx = { triggerKind: SuggestTriggerKind.Invoke };
 		}
 
-		this._requestPromise = provideSuggestionItems(model, this._editor.getPosition(),
-			this._editor.getConfiguration().contribInfo.snippetSuggestions,
+		this._requestPromise = createCancelablePromise(token => provideSuggestionItems(
+			model,
+			this._editor.getPosition(),
+			this._editor.getConfiguration().contribInfo.suggest.snippets,
 			onlyFrom,
-			suggestCtx
-		).then(items => {
+			suggestCtx,
+			token
+		));
+
+		this._requestPromise.then(items => {
 
 			this._requestPromise = null;
 			if (this._state === State.Idle) {
@@ -372,7 +386,7 @@ export class SuggestModel implements IDisposable {
 			}
 
 			if (!isFalsyOrEmpty(existingItems)) {
-				const cmpFn = getSuggestionComparator(this._editor.getConfiguration().contribInfo.snippetSuggestions);
+				const cmpFn = getSuggestionComparator(this._editor.getConfiguration().contribInfo.suggest.snippets);
 				items = items.concat(existingItems).sort(cmpFn);
 			}
 
@@ -381,10 +395,12 @@ export class SuggestModel implements IDisposable {
 			this._completionModel = new CompletionModel(items, this._context.column, {
 				leadingLineContent: ctx.leadingLineContent,
 				characterCountDelta: this._context ? ctx.column - this._context.column : 0
-			}, this._editor.getConfiguration().contribInfo.snippetSuggestions);
+			},
+				this._editor.getConfiguration().contribInfo.suggest
+			);
 			this._onNewContext(ctx);
 
-		}).then(null, onUnexpectedError);
+		}).catch(onUnexpectedError);
 	}
 
 	private _onNewContext(ctx: LineContext): void {
diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts
index 4d45c78a181..6e72075c97e 100644
--- a/src/vs/editor/contrib/suggest/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/suggestWidget.ts
@@ -10,8 +10,7 @@ import * as nls from 'vs/nls';
 import { createMatches } from 'vs/base/common/filters';
 import * as strings from 'vs/base/common/strings';
 import { Event, Emitter, chain } from 'vs/base/common/event';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { isPromiseCanceledError, onUnexpectedError } from 'vs/base/common/errors';
+import { onUnexpectedError } from 'vs/base/common/errors';
 import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
 import { addClass, append, $, hide, removeClass, show, toggleClass, getDomNodePagePosition, hasClass } from 'vs/base/browser/dom';
 import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
@@ -33,6 +32,8 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
 import { MarkdownRenderer } from 'vs/editor/contrib/markdown/markdownRenderer';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { TimeoutTimer, CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 const sticky = false; // for development purposes
 const expandSuggestionDocsByDefault = false;
@@ -361,7 +362,7 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 	private state: State;
 	private isAuto: boolean;
 	private loadingTimeout: number;
-	private currentSuggestionDetails: TPromise<void>;
+	private currentSuggestionDetails: CancelablePromise<void>;
 	private focusedItem: ICompletionItem;
 	private ignoreFocusEvents = false;
 	private completionModel: CompletionModel;
@@ -377,8 +378,8 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 	private suggestWidgetMultipleSuggestions: IContextKey<boolean>;
 	private suggestionSupportsAutoAccept: IContextKey<boolean>;
 
-	private editorBlurTimeout: TPromise<void>;
-	private showTimeout: TPromise<void>;
+	private readonly editorBlurTimeout = new TimeoutTimer();
+	private readonly showTimeout = new TimeoutTimer();
 	private toDispose: IDisposable[];
 
 	private onDidSelectEmitter = new Emitter<ISelectedSuggestion>();
@@ -482,11 +483,11 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 			return;
 		}
 
-		this.editorBlurTimeout = TPromise.timeout(150).then(() => {
+		this.editorBlurTimeout.cancelAndSet(() => {
 			if (!this.editor.hasTextFocus()) {
 				this.setState(State.Hidden);
 			}
-		});
+		}, 150);
 	}
 
 	private onEditorLayoutChange(): void {
@@ -502,7 +503,7 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 
 		const item = e.elements[0];
 		const index = e.indexes[0];
-		item.resolve().then(() => {
+		item.resolve(CancellationToken.None).then(() => {
 			this.onDidSelectEmitter.fire({ item, index, model: this.completionModel });
 			alert(nls.localize('suggestionAriaAccepted', "{0}, accepted", item.suggestion.label));
 			this.editor.focus();
@@ -586,22 +587,21 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 
 		this.list.reveal(index);
 
-		this.currentSuggestionDetails = item.resolve()
-			.then(() => {
-				// item can have extra information, so re-render
-				this.ignoreFocusEvents = true;
-				this.list.splice(index, 1, [item]);
-				this.list.setFocus([index]);
-				this.ignoreFocusEvents = false;
+		this.currentSuggestionDetails = createCancelablePromise(token => item.resolve(token));
 
-				if (this.expandDocsSettingFromStorage()) {
-					this.showDetails();
-				} else {
-					removeClass(this.element, 'docs-side');
-				}
-			})
-			.then(null, err => !isPromiseCanceledError(err) && onUnexpectedError(err))
-			.then(() => this.currentSuggestionDetails = null);
+		this.currentSuggestionDetails.then(() => {
+			// item can have extra information, so re-render
+			this.ignoreFocusEvents = true;
+			this.list.splice(index, 1, [item]);
+			this.list.setFocus([index]);
+			this.ignoreFocusEvents = false;
+
+			if (this.expandDocsSettingFromStorage()) {
+				this.showDetails();
+			} else {
+				removeClass(this.element, 'docs-side');
+			}
+		}).catch(onUnexpectedError).then(() => this.currentSuggestionDetails = null);
 
 		// emit an event
 		this.onDidFocusEmitter.fire({ item, index, model: this.completionModel });
@@ -925,10 +925,10 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 
 		this.suggestWidgetVisible.set(true);
 
-		this.showTimeout = TPromise.timeout(100).then(() => {
+		this.showTimeout.cancelAndSet(() => {
 			addClass(this.element, 'visible');
 			this.onDidShowEmitter.fire(this);
-		});
+		}, 100);
 	}
 
 	private hide(): void {
@@ -1082,15 +1082,8 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 			this.loadingTimeout = null;
 		}
 
-		if (this.editorBlurTimeout) {
-			this.editorBlurTimeout.cancel();
-			this.editorBlurTimeout = null;
-		}
-
-		if (this.showTimeout) {
-			this.showTimeout.cancel();
-			this.showTimeout = null;
-		}
+		this.editorBlurTimeout.dispose();
+		this.showTimeout.dispose();
 	}
 }
 
diff --git a/src/vs/editor/contrib/suggest/test/completionModel.test.ts b/src/vs/editor/contrib/suggest/test/completionModel.test.ts
index 87631a1720a..bcb1a675914 100644
--- a/src/vs/editor/contrib/suggest/test/completionModel.test.ts
+++ b/src/vs/editor/contrib/suggest/test/completionModel.test.ts
@@ -167,7 +167,7 @@ suite('CompletionModel', function () {
 		], 1, {
 				leadingLineContent: 's',
 				characterCountDelta: 0
-			}, 'top');
+			}, { snippets: 'top', snippetsPreventQuickSuggestions: true, filterGraceful: true });
 
 		assert.equal(model.items.length, 2);
 		const [a, b] = model.items;
@@ -186,7 +186,7 @@ suite('CompletionModel', function () {
 		], 1, {
 				leadingLineContent: 's',
 				characterCountDelta: 0
-			}, 'bottom');
+			}, { snippets: 'bottom', snippetsPreventQuickSuggestions: true, filterGraceful: true });
 
 		assert.equal(model.items.length, 2);
 		const [a, b] = model.items;
@@ -204,7 +204,7 @@ suite('CompletionModel', function () {
 		], 1, {
 				leadingLineContent: 's',
 				characterCountDelta: 0
-			}, 'inline');
+			}, { snippets: 'inline', snippetsPreventQuickSuggestions: true, filterGraceful: true });
 
 		assert.equal(model.items.length, 2);
 		const [a, b] = model.items;
@@ -267,7 +267,7 @@ suite('CompletionModel', function () {
 		], 1, {
 				leadingLineContent: '',
 				characterCountDelta: 0
-			}, 'inline');
+			});
 
 		assert.equal(model.items.length, 5);
 
@@ -294,7 +294,7 @@ suite('CompletionModel', function () {
 		], 1, {
 				leadingLineContent: '',
 				characterCountDelta: 0
-			}, 'inline');
+			});
 
 		// query gets longer, narrow down the narrow-down'ed-set from before
 		model.lineContext = { leadingLineContent: 'rlut', characterCountDelta: 4 };
@@ -316,7 +316,7 @@ suite('CompletionModel', function () {
 		], 1, {
 				leadingLineContent: '',
 				characterCountDelta: 0
-			}, 'inline');
+			});
 
 		model.lineContext = { leadingLineContent: 'form', characterCountDelta: 4 };
 		assert.equal(model.items.length, 5);
diff --git a/src/vs/editor/contrib/suggest/test/suggestModel.test.ts b/src/vs/editor/contrib/suggest/test/suggestModel.test.ts
index 69a6c6870e0..d5a5daeae4b 100644
--- a/src/vs/editor/contrib/suggest/test/suggestModel.test.ts
+++ b/src/vs/editor/contrib/suggest/test/suggestModel.test.ts
@@ -30,13 +30,15 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
 
 function createMockEditor(model: TextModel): TestCodeEditor {
-	return createTestCodeEditor({
+	let editor = createTestCodeEditor({
 		model: model,
 		serviceCollection: new ServiceCollection(
 			[ITelemetryService, NullTelemetryService],
 			[IStorageService, NullStorageService]
-		)
+		),
 	});
+	editor.registerAndInstantiateContribution(SnippetController2);
+	return editor;
 }
 
 suite('SuggestModel - Context', function () {
diff --git a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
index b54ddc7f25a..1b7b9016979 100644
--- a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
+++ b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
@@ -5,9 +5,8 @@
 
 import * as nls from 'vs/nls';
 
-import { asWinJsPromise, first } from 'vs/base/common/async';
+import { first2, createCancelablePromise, CancelablePromise } from 'vs/base/common/async';
 import { onUnexpectedExternalError } from 'vs/base/common/errors';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { Range } from 'vs/editor/common/core/range';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { registerEditorContribution, EditorAction, IActionOptions, registerEditorAction, registerDefaultLanguageCommand } from 'vs/editor/browser/editorExtensions';
@@ -25,6 +24,7 @@ import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { firstIndex, isFalsyOrEmpty } from 'vs/base/common/arrays';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ITextModel, TrackedRangeStickiness, OverviewRulerLane, IModelDeltaDecoration } from 'vs/editor/common/model';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 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);
@@ -36,15 +36,15 @@ export const overviewRulerWordHighlightStrongForeground = registerColor('editorO
 
 export const ctxHasWordHighlights = new RawContextKey<boolean>('hasWordHighlights', false);
 
-export function getOccurrencesAtPosition(model: ITextModel, position: Position): TPromise<DocumentHighlight[]> {
+export function getOccurrencesAtPosition(model: ITextModel, position: Position, token: CancellationToken = CancellationToken.None): Promise<DocumentHighlight[]> {
 
 	const orderedByScore = DocumentHighlightProviderRegistry.ordered(model);
 
 	// in order of score ask the occurrences provider
 	// until someone response with a good result
 	// (good = none empty array)
-	return first(orderedByScore.map(provider => () => {
-		return asWinJsPromise(token => provider.provideDocumentHighlights(model, position, token))
+	return first2(orderedByScore.map(provider => () => {
+		return Promise.resolve(provider.provideDocumentHighlights(model, position, token))
 			.then(undefined, onUnexpectedExternalError);
 	}), result => !isFalsyOrEmpty(result));
 }
@@ -61,7 +61,7 @@ class WordHighlighter {
 	private toUnhook: IDisposable[];
 
 	private workerRequestTokenId: number = 0;
-	private workerRequest: TPromise<DocumentHighlight[]> = null;
+	private workerRequest: CancelablePromise<DocumentHighlight[]> = null;
 	private workerRequestCompleted: boolean = false;
 	private workerRequestValue: DocumentHighlight[] = [];
 
@@ -291,7 +291,7 @@ class WordHighlighter {
 			let myRequestId = ++this.workerRequestTokenId;
 			this.workerRequestCompleted = false;
 
-			this.workerRequest = getOccurrencesAtPosition(this.model, this.editor.getPosition());
+			this.workerRequest = createCancelablePromise(token => getOccurrencesAtPosition(this.model, this.editor.getPosition(), token));
 
 			this.workerRequest.then(data => {
 				if (myRequestId === this.workerRequestTokenId) {
@@ -299,7 +299,7 @@ class WordHighlighter {
 					this.workerRequestValue = data || [];
 					this._beginRenderDecorations();
 				}
-			}).done();
+			});
 		}
 
 		this._lastWordRange = currentWordRange;
diff --git a/src/vs/editor/standalone/browser/colorizer.ts b/src/vs/editor/standalone/browser/colorizer.ts
index 298a4d7a0d5..1f5595800c8 100644
--- a/src/vs/editor/standalone/browser/colorizer.ts
+++ b/src/vs/editor/standalone/browser/colorizer.ts
@@ -42,7 +42,7 @@ export class Colorizer {
 		let render = (str: string) => {
 			domNode.innerHTML = str;
 		};
-		return this.colorize(modeService, text, mimeType, options).then(render, (err) => console.error(err), render);
+		return this.colorize(modeService, text, mimeType, options).then(render, (err) => console.error(err));
 	}
 
 	private static _tokenizationSupportChangedPromise(language: string): TPromise<void> {
@@ -54,7 +54,7 @@ export class Colorizer {
 			}
 		};
 
-		return new TPromise<void>((c, e, p) => {
+		return new TPromise<void>((c, e) => {
 			listener = TokenizationRegistry.onDidChange((e) => {
 				if (e.changedLanguages.indexOf(language) >= 0) {
 					stopListening();
diff --git a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
index 22b23704de2..3a1fabd9093 100644
--- a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { empty as emptyDisposable, IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -206,7 +206,7 @@ export class StandaloneCodeEditor extends CodeEditorWidget implements IStandalon
 		}
 		if (!this._standaloneKeybindingService) {
 			console.warn('Cannot add keybinding because the editor is configured with an unrecognized KeybindingService');
-			return emptyDisposable;
+			return Disposable.None;
 		}
 
 		// Read descriptor options
diff --git a/src/vs/editor/standalone/common/monarch/monarchTypes.ts b/src/vs/editor/standalone/common/monarch/monarchTypes.ts
index 55a14165507..672ec13c75b 100644
--- a/src/vs/editor/standalone/common/monarch/monarchTypes.ts
+++ b/src/vs/editor/standalone/common/monarch/monarchTypes.ts
@@ -37,15 +37,17 @@ export interface IMonarchLanguage {
 	/**
 	 * attach this to every token class (by default '.' + name)
 	 */
-	tokenPostfix: string;
+	tokenPostfix?: string;
 }
 
+export type IShortMonarchLanguageRule1 = [RegExp, string | IMonarchLanguageAction];
+export type IShortMonarchLanguageRule2 = [RegExp, string | IMonarchLanguageAction, string];
 /**
  * A rule is either a regular expression and an action
  * 		shorthands: [reg,act] == { regex: reg, action: act}
  *		and       : [reg,act,nxt] == { regex: reg, action: act{ next: nxt }}
  */
-export interface IMonarchLanguageRule {
+export interface IExpandedMonarchLanguageRule {
 	/**
 	 * match tokens
 	 */
@@ -60,6 +62,7 @@ export interface IMonarchLanguageRule {
 	 */
 	include?: string;
 }
+export type IMonarchLanguageRule = IShortMonarchLanguageRule1 | IShortMonarchLanguageRule2 | IExpandedMonarchLanguageRule;
 
 /**
  * An action is either an array of actions...
diff --git a/src/vs/editor/test/common/config/commonEditorConfig.test.ts b/src/vs/editor/test/common/config/commonEditorConfig.test.ts
index 92f7a852d58..c2d68367dcc 100644
--- a/src/vs/editor/test/common/config/commonEditorConfig.test.ts
+++ b/src/vs/editor/test/common/config/commonEditorConfig.test.ts
@@ -9,6 +9,7 @@ import { EditorZoom } from 'vs/editor/common/config/editorZoom';
 import { TestConfiguration } from 'vs/editor/test/common/mocks/testConfiguration';
 import { IEnvConfiguration } from 'vs/editor/common/config/commonEditorConfig';
 import { AccessibilitySupport } from 'vs/base/common/platform';
+import { IEditorHoverOptions } from 'vs/editor/common/config/editorOptions';
 
 suite('Common Editor Config', () => {
 	test('Zoom Level', () => {
@@ -176,4 +177,17 @@ suite('Common Editor Config', () => {
 		});
 		assertWrapping(config, true, 1);
 	});
+
+	test('issue #53152: Cannot assign to read only property \'enabled\' of object', () => {
+		let hoverOptions: IEditorHoverOptions = {};
+		Object.defineProperty(hoverOptions, 'enabled', {
+			writable: false,
+			value: true
+		});
+		let config = new TestConfiguration({ hover: hoverOptions });
+
+		assert.equal(config.editor.contribInfo.hover.enabled, true);
+		config.updateOptions({ hover: { enabled: false } });
+		assert.equal(config.editor.contribInfo.hover.enabled, false);
+	});
 });
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index 2db548df611..d176c102959 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -83,7 +83,6 @@ declare namespace monaco {
 
 		public static join<T1, T2>(promises: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<[T1, T2]>;
 		public static join<T>(promises: (T | PromiseLike<T>)[]): Promise<T[]>;
-		public static join<T>(promises: { [n: string]: T | PromiseLike<T> }): Promise<{ [n: string]: T }>;
 
 		public static any<T>(promises: (T | PromiseLike<T>)[]): Promise<{ key: string; value: Promise<T>; }>;
 
@@ -2502,6 +2501,22 @@ declare namespace monaco.editor {
 		 * Defaults to 300.
 		 */
 		delay?: number;
+		/**
+		 * Is the hover sticky such that it can be clicked and its contents selected?
+		 * Defaults to true.
+		 */
+		sticky?: boolean;
+	}
+
+	export interface ISuggestOptions {
+		/**
+		 * Enable graceful matching. Defaults to true.
+		 */
+		filterGraceful?: boolean;
+		/**
+		 * Prevent quick suggestions when a snippet is active. Defaults to true.
+		 */
+		snippetsPreventQuickSuggestions?: boolean;
 	}
 
 	/**
@@ -2724,7 +2739,7 @@ declare namespace monaco.editor {
 		/**
 		 * Configure the editor's hover.
 		 */
-		hover?: boolean | IEditorHoverOptions;
+		hover?: IEditorHoverOptions;
 		/**
 		 * Enable detecting links and making them clickable.
 		 * Defaults to true.
@@ -2759,6 +2774,10 @@ declare namespace monaco.editor {
 		 * Defaults to 'auto'. It is best to leave this to 'auto'.
 		 */
 		accessibilitySupport?: 'auto' | 'off' | 'on';
+		/**
+		 * Suggest options.
+		 */
+		suggest?: ISuggestOptions;
 		/**
 		 * Enable quick suggestions (shadow suggestions)
 		 * Defaults to true.
@@ -3102,6 +3121,13 @@ declare namespace monaco.editor {
 	export interface InternalEditorHoverOptions {
 		readonly enabled: boolean;
 		readonly delay: number;
+		readonly sticky: boolean;
+	}
+
+	export interface InternalSuggestOptions {
+		readonly filterGraceful: boolean;
+		readonly snippets: 'top' | 'bottom' | 'inline' | 'none';
+		readonly snippetsPreventQuickSuggestions: boolean;
 	}
 
 	export interface EditorWrappingInfo {
@@ -3175,11 +3201,11 @@ declare namespace monaco.editor {
 		readonly suggestOnTriggerCharacters: boolean;
 		readonly acceptSuggestionOnEnter: 'on' | 'smart' | 'off';
 		readonly acceptSuggestionOnCommitCharacter: boolean;
-		readonly snippetSuggestions: 'top' | 'bottom' | 'inline' | 'none';
 		readonly wordBasedSuggestions: boolean;
 		readonly suggestSelection: 'first' | 'recentlyUsed' | 'recentlyUsedByPrefix';
 		readonly suggestFontSize: number;
 		readonly suggestLineHeight: number;
+		readonly suggest: InternalSuggestOptions;
 		readonly selectionHighlight: boolean;
 		readonly occurrencesHighlight: boolean;
 		readonly codeLens: boolean;
@@ -5185,6 +5211,7 @@ declare namespace monaco.languages {
 		options: {
 			overwrite?: boolean;
 			ignoreIfExists?: boolean;
+			recursive?: boolean;
 		};
 	}
 
@@ -5337,15 +5364,19 @@ declare namespace monaco.languages {
 		/**
 		 * attach this to every token class (by default '.' + name)
 		 */
-		tokenPostfix: string;
+		tokenPostfix?: string;
 	}
 
+	export type IShortMonarchLanguageRule1 = [RegExp, string | IMonarchLanguageAction];
+
+	export type IShortMonarchLanguageRule2 = [RegExp, string | IMonarchLanguageAction, string];
+
 	/**
 	 * A rule is either a regular expression and an action
 	 * 		shorthands: [reg,act] == { regex: reg, action: act}
 	 *		and       : [reg,act,nxt] == { regex: reg, action: act{ next: nxt }}
 	 */
-	export interface IMonarchLanguageRule {
+	export interface IExpandedMonarchLanguageRule {
 		/**
 		 * match tokens
 		 */
@@ -5360,6 +5391,8 @@ declare namespace monaco.languages {
 		include?: string;
 	}
 
+	export type IMonarchLanguageRule = IShortMonarchLanguageRule1 | IShortMonarchLanguageRule2 | IExpandedMonarchLanguageRule;
+
 	/**
 	 * An action is either an array of actions...
 	 * ... or a case statement with guards...
diff --git a/src/vs/platform/actions/browser/menuItemActionItem.ts b/src/vs/platform/actions/browser/menuItemActionItem.ts
index 1c7baf46a77..a8ff208c0a6 100644
--- a/src/vs/platform/actions/browser/menuItemActionItem.ts
+++ b/src/vs/platform/actions/browser/menuItemActionItem.ts
@@ -7,7 +7,7 @@
 
 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 { IMenu, MenuItemAction, IMenuActionOptions, ICommandAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
 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';
@@ -91,11 +91,11 @@ export function fillInActionBarActions(menu: IMenu, options: IMenuActionOptions,
 	fillInActions(groups, target, false, isPrimaryGroup);
 }
 
-function fillInActions(groups: [string, MenuItemAction[]][], target: IAction[] | { primary: IAction[]; secondary: IAction[]; }, getAlternativeActions, isPrimaryGroup: (group: string) => boolean = group => group === 'navigation'): void {
+function fillInActions(groups: [string, (MenuItemAction | SubmenuItemAction)[]][], target: IAction[] | { primary: IAction[]; secondary: IAction[]; }, getAlternativeActions, isPrimaryGroup: (group: string) => boolean = group => group === 'navigation'): void {
 	for (let tuple of groups) {
 		let [group, actions] = tuple;
 		if (getAlternativeActions) {
-			actions = actions.map(a => !!a.alt ? a.alt : a);
+			actions = actions.map(a => (a instanceof MenuItemAction) && !!a.alt ? a.alt : a);
 		}
 
 		if (isPrimaryGroup(group)) {
diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index 6e58a2d23df..c4b1e0f958c 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -43,6 +43,22 @@ export interface IMenuItem {
 	order?: number;
 }
 
+export interface ISubmenuItem {
+	title: string | ILocalizedString;
+	submenu: MenuId;
+	when?: ContextKeyExpr;
+	group?: 'navigation' | string;
+	order?: number;
+}
+
+export function isIMenuItem(item: IMenuItem | ISubmenuItem): item is IMenuItem {
+	return (item as IMenuItem).command !== undefined;
+}
+
+export function isISubmenuItem(item: IMenuItem | ISubmenuItem): item is ISubmenuItem {
+	return (item as ISubmenuItem).submenu !== undefined;
+}
+
 export class MenuId {
 
 	private static ID = 1;
@@ -81,6 +97,7 @@ export class MenuId {
 	static readonly MenubarWindowMenu = new MenuId();
 	static readonly MenubarPreferencesMenu = new MenuId();
 	static readonly MenubarHelpMenu = new MenuId();
+	static readonly MenubarTerminalMenu = new MenuId();
 
 	readonly id: string = String(MenuId.ID++);
 }
@@ -92,7 +109,7 @@ export interface IMenuActionOptions {
 
 export interface IMenu extends IDisposable {
 	onDidChange: Event<IMenu>;
-	getActions(options?: IMenuActionOptions): [string, MenuItemAction[]][];
+	getActions(options?: IMenuActionOptions): [string, (MenuItemAction | SubmenuItemAction)[]][];
 }
 
 export const IMenuService = createDecorator<IMenuService>('menuService');
@@ -107,15 +124,15 @@ export interface IMenuService {
 export interface IMenuRegistry {
 	addCommand(userCommand: ICommandAction): boolean;
 	getCommand(id: string): ICommandAction;
-	appendMenuItem(menu: MenuId, item: IMenuItem): IDisposable;
-	getMenuItems(loc: MenuId): IMenuItem[];
+	appendMenuItem(menu: MenuId, item: IMenuItem | ISubmenuItem): IDisposable;
+	getMenuItems(loc: MenuId): (IMenuItem | ISubmenuItem)[];
 }
 
 export const MenuRegistry: IMenuRegistry = new class implements IMenuRegistry {
 
 	private _commands: { [id: string]: ICommandAction } = Object.create(null);
 
-	private _menuItems: { [loc: string]: IMenuItem[] } = Object.create(null);
+	private _menuItems: { [loc: string]: (IMenuItem | ISubmenuItem)[] } = Object.create(null);
 
 	addCommand(command: ICommandAction): boolean {
 		const old = this._commands[command.id];
@@ -127,7 +144,7 @@ export const MenuRegistry: IMenuRegistry = new class implements IMenuRegistry {
 		return this._commands[id];
 	}
 
-	appendMenuItem({ id }: MenuId, item: IMenuItem): IDisposable {
+	appendMenuItem({ id }: MenuId, item: IMenuItem | ISubmenuItem): IDisposable {
 		let array = this._menuItems[id];
 		if (!array) {
 			this._menuItems[id] = array = [item];
@@ -144,7 +161,7 @@ export const MenuRegistry: IMenuRegistry = new class implements IMenuRegistry {
 		};
 	}
 
-	getMenuItems({ id }: MenuId): IMenuItem[] {
+	getMenuItems({ id }: MenuId): (IMenuItem | ISubmenuItem)[] {
 		const result = this._menuItems[id] || [];
 
 		if (id === MenuId.CommandPalette.id) {
@@ -155,9 +172,12 @@ export const MenuRegistry: IMenuRegistry = new class implements IMenuRegistry {
 		return result;
 	}
 
-	private _appendImplicitItems(result: IMenuItem[]) {
+	private _appendImplicitItems(result: (IMenuItem | ISubmenuItem)[]) {
 		const set = new Set<string>();
-		for (const { command, alt } of result) {
+
+		const temp = result.filter(item => { return isIMenuItem(item); }) as IMenuItem[];
+
+		for (const { command, alt } of temp) {
 			set.add(command.id);
 			if (alt) {
 				set.add(alt.id);
@@ -186,6 +206,16 @@ export class ExecuteCommandAction extends Action {
 	}
 }
 
+export class SubmenuItemAction extends Action {
+	// private _options: IMenuActionOptions;
+
+	readonly item: ISubmenuItem;
+	constructor(item: ISubmenuItem) {
+		typeof item.title === 'string' ? super('', item.title, 'submenu') : super('', item.title.value, 'submenu');
+		this.item = item;
+	}
+}
+
 export class MenuItemAction extends ExecuteCommandAction {
 
 	private _options: IMenuActionOptions;
diff --git a/src/vs/platform/actions/common/menu.ts b/src/vs/platform/actions/common/menu.ts
index e3ad0820736..3d89d746fe4 100644
--- a/src/vs/platform/actions/common/menu.ts
+++ b/src/vs/platform/actions/common/menu.ts
@@ -9,10 +9,10 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { MenuId, MenuRegistry, MenuItemAction, IMenu, IMenuItem, IMenuActionOptions } from 'vs/platform/actions/common/actions';
+import { MenuId, MenuRegistry, MenuItemAction, IMenu, IMenuItem, IMenuActionOptions, ISubmenuItem, SubmenuItemAction, isIMenuItem } from 'vs/platform/actions/common/actions';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 
-type MenuItemGroup = [string, IMenuItem[]];
+type MenuItemGroup = [string, (IMenuItem | ISubmenuItem)[]];
 
 export class Menu implements IMenu {
 
@@ -66,14 +66,14 @@ export class Menu implements IMenu {
 		return this._onDidChange.event;
 	}
 
-	getActions(options: IMenuActionOptions): [string, MenuItemAction[]][] {
-		const result: [string, MenuItemAction[]][] = [];
+	getActions(options: IMenuActionOptions): [string, (MenuItemAction | SubmenuItemAction)[]][] {
+		const result: [string, (MenuItemAction | SubmenuItemAction)[]][] = [];
 		for (let group of this._menuGroups) {
 			const [id, items] = group;
-			const activeActions: MenuItemAction[] = [];
+			const activeActions: (MenuItemAction | SubmenuItemAction)[] = [];
 			for (const item of items) {
 				if (this._contextKeyService.contextMatchesRules(item.when)) {
-					const action = new MenuItemAction(item.command, item.alt, options, this._contextKeyService, this._commandService);
+					const action = isIMenuItem(item) ? new MenuItemAction(item.command, item.alt, options, this._contextKeyService, this._commandService) : new SubmenuItemAction(item);
 					action.order = item.order; //TODO@Ben order is menu item property, not an action property
 					activeActions.push(action);
 				}
diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts
index 30d8205f48d..ef37ffe80d5 100644
--- a/src/vs/platform/configuration/common/configurationRegistry.ts
+++ b/src/vs/platform/configuration/common/configurationRegistry.ts
@@ -34,6 +34,12 @@ export interface IConfigurationRegistry {
 	 */
 	notifyConfigurationSchemaUpdated(configuration: IConfigurationNode): void;
 
+	/**
+	 * Event that fires whenver a configuration has been
+	 * registered.
+	 */
+	onDidSchemaChange: Event<void>;
+
 	/**
 	 * Event that fires whenver a configuration has been
 	 * registered.
@@ -84,6 +90,7 @@ export interface IConfigurationNode {
 	allOf?: IConfigurationNode[];
 	overridable?: boolean;
 	scope?: ConfigurationScope;
+	contributedByExtension?: boolean;
 }
 
 export interface IDefaultConfigurationExtension {
@@ -109,6 +116,9 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 	private overrideIdentifiers: string[] = [];
 	private overridePropertyPattern: string;
 
+	private readonly _onDidSchemaChange: Emitter<void> = new Emitter<void>();
+	readonly onDidSchemaChange: Event<void> = this._onDidSchemaChange.event;
+
 	private readonly _onDidRegisterConfiguration: Emitter<string[]> = new Emitter<string[]>();
 	readonly onDidRegisterConfiguration: Event<string[]> = this._onDidRegisterConfiguration.event;
 
@@ -175,7 +185,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 	}
 
 	private validateAndRegisterProperties(configuration: IConfigurationNode, validate: boolean = true, scope: ConfigurationScope = ConfigurationScope.WINDOW, overridable: boolean = false): string[] {
-		scope = configuration.scope !== void 0 && configuration.scope !== null ? configuration.scope : scope;
+		scope = types.isUndefinedOrNull(configuration.scope) ? scope : configuration.scope;
 		overridable = configuration.overridable || overridable;
 		let propertyKeys = [];
 		let properties = configuration.properties;
@@ -197,8 +207,11 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 				if (overridable) {
 					property.overridable = true;
 				}
-				if (property.scope === void 0) {
-					property.scope = scope;
+
+				if (OVERRIDE_PROPERTY_PATTERN.test(key)) {
+					property.scope = void 0; // No scope for overridable properties `[${identifier}]`
+				} else {
+					property.scope = types.isUndefinedOrNull(property.scope) ? scope : property.scope;
 				}
 
 				// Add to properties maps
@@ -239,7 +252,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 		function register(configuration: IConfigurationNode) {
 			let properties = configuration.properties;
 			if (properties) {
-				for (let key in properties) {
+				for (const key in properties) {
 					allSettings.properties[key] = properties[key];
 					switch (properties[key].scope) {
 						case ConfigurationScope.APPLICATION:
@@ -260,6 +273,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 			}
 		}
 		register(configuration);
+		this._onDidSchemaChange.fire();
 	}
 
 	private updateSchemaForOverrideSettingsConfiguration(configuration: IConfigurationNode): void {
@@ -291,6 +305,8 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 		applicationSettings.patternProperties[this.overridePropertyPattern] = patternProperties;
 		windowSettings.patternProperties[this.overridePropertyPattern] = patternProperties;
 		resourceSettings.patternProperties[this.overridePropertyPattern] = patternProperties;
+
+		this._onDidSchemaChange.fire();
 	}
 
 	private update(configuration: IConfigurationNode): void {
diff --git a/src/vs/platform/contextview/browser/contextMenuHandler.ts b/src/vs/platform/contextview/browser/contextMenuHandler.ts
index 04db866a8e8..f0b8c1270c8 100644
--- a/src/vs/platform/contextview/browser/contextMenuHandler.ts
+++ b/src/vs/platform/contextview/browser/contextMenuHandler.ts
@@ -105,7 +105,8 @@ export class ContextMenuHandler {
 					let menu = new Menu(container, actions, {
 						actionItemProvider: delegate.getActionItem,
 						context: delegate.getActionsContext ? delegate.getActionsContext() : null,
-						actionRunner: this.actionRunner
+						actionRunner: this.actionRunner,
+						getKeyBinding: delegate.getKeyBinding
 					});
 
 					let listener1 = menu.onDidCancel(() => {
diff --git a/src/vs/platform/dialogs/common/dialogIpc.ts b/src/vs/platform/dialogs/common/dialogIpc.ts
index 7d260b4e8f8..0a73419d531 100644
--- a/src/vs/platform/dialogs/common/dialogIpc.ts
+++ b/src/vs/platform/dialogs/common/dialogIpc.ts
@@ -9,6 +9,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { IDialogService, IConfirmation, IConfirmationResult } from 'vs/platform/dialogs/common/dialogs';
 import Severity from 'vs/base/common/severity';
+import { Event } from 'vs/base/common/event';
 
 export interface IDialogChannel extends IChannel {
 	call(command: 'show'): TPromise<number>;
@@ -18,7 +19,10 @@ export interface IDialogChannel extends IChannel {
 
 export class DialogChannel implements IDialogChannel {
 
-	constructor(@IDialogService private dialogService: IDialogService) {
+	constructor(@IDialogService private dialogService: IDialogService) { }
+
+	listen<T>(event: string): Event<T> {
+		throw new Error('No event found');
 	}
 
 	call(command: string, args?: any[]): TPromise<any> {
diff --git a/src/vs/platform/dialogs/node/dialogService.ts b/src/vs/platform/dialogs/node/dialogService.ts
index b1896b82a8f..4304af55184 100644
--- a/src/vs/platform/dialogs/node/dialogService.ts
+++ b/src/vs/platform/dialogs/node/dialogService.ts
@@ -8,6 +8,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { IDialogService, IConfirmation, IConfirmationResult } from 'vs/platform/dialogs/common/dialogs';
 import Severity from 'vs/base/common/severity';
 import { localize } from 'vs/nls';
+import { canceled } from 'vs/base/common/errors';
 
 export class CommandLineDialogService implements IDialogService {
 
@@ -31,7 +32,7 @@ export class CommandLineDialogService implements IDialogService {
 			});
 			rl.once('SIGINT', () => {
 				rl.close();
-				promise.cancel();
+				e(canceled());
 			});
 		});
 		return promise;
@@ -64,4 +65,4 @@ export class CommandLineDialogService implements IDialogService {
 			} as IConfirmationResult;
 		});
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/platform/driver/common/driver.ts b/src/vs/platform/driver/common/driver.ts
index a069d1c087d..82e907f2e25 100644
--- a/src/vs/platform/driver/common/driver.ts
+++ b/src/vs/platform/driver/common/driver.ts
@@ -8,6 +8,7 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IChannel } from 'vs/base/parts/ipc/common/ipc';
+import { Event } from 'vs/base/common/event';
 
 export const ID = 'driverService';
 export const IDriver = createDecorator<IDriver>(ID);
@@ -65,6 +66,10 @@ export class DriverChannel implements IDriverChannel {
 
 	constructor(private driver: IDriver) { }
 
+	listen<T>(event: string): Event<T> {
+		throw new Error('No event found');
+	}
+
 	call(command: string, arg?: any): TPromise<any> {
 		switch (command) {
 			case 'getWindowIds': return this.driver.getWindowIds();
@@ -164,6 +169,10 @@ export class WindowDriverRegistryChannel implements IWindowDriverRegistryChannel
 
 	constructor(private registry: IWindowDriverRegistry) { }
 
+	listen<T>(event: string): Event<T> {
+		throw new Error('No event found');
+	}
+
 	call(command: string, arg?: any): TPromise<any> {
 		switch (command) {
 			case 'registerWindowDriver': return this.registry.registerWindowDriver(arg);
@@ -218,6 +227,10 @@ export class WindowDriverChannel implements IWindowDriverChannel {
 
 	constructor(private driver: IWindowDriver) { }
 
+	listen<T>(event: string): Event<T> {
+		throw new Error('No event found');
+	}
+
 	call(command: string, arg?: any): TPromise<any> {
 		switch (command) {
 			case 'click': return this.driver.click(arg[0], arg[1], arg[2]);
diff --git a/src/vs/platform/driver/electron-browser/driver.ts b/src/vs/platform/driver/electron-browser/driver.ts
index 6c723a99181..4dbaaff6c95 100644
--- a/src/vs/platform/driver/electron-browser/driver.ts
+++ b/src/vs/platform/driver/electron-browser/driver.ts
@@ -50,7 +50,7 @@ class WindowDriver implements IWindowDriver {
 		@IWindowService private windowService: IWindowService
 	) { }
 
-	async click(selector: string, xoffset?: number, yoffset?: number): TPromise<void> {
+	click(selector: string, xoffset?: number, yoffset?: number): TPromise<void> {
 		return this._click(selector, 1, xoffset, yoffset);
 	}
 
@@ -58,11 +58,11 @@ class WindowDriver implements IWindowDriver {
 		return this._click(selector, 2);
 	}
 
-	private async _getElementXY(selector: string, xoffset?: number, yoffset?: number): TPromise<{ x: number; y: number; }> {
+	private _getElementXY(selector: string, xoffset?: number, yoffset?: number): TPromise<{ x: number; y: number; }> {
 		const element = document.querySelector(selector);
 
 		if (!element) {
-			throw new Error('Element not found');
+			return TPromise.wrapError(new Error('Element not found'));
 		}
 
 		const { left, top } = getTopLeftOffset(element as HTMLElement);
@@ -80,25 +80,27 @@ class WindowDriver implements IWindowDriver {
 		x = Math.round(x);
 		y = Math.round(y);
 
-		return { x, y };
+		return TPromise.as({ x, y });
 	}
 
-	private async _click(selector: string, clickCount: number, xoffset?: number, yoffset?: number): TPromise<void> {
-		const { x, y } = await this._getElementXY(selector, xoffset, yoffset);
-		const webContents = electron.remote.getCurrentWebContents();
+	private _click(selector: string, clickCount: number, xoffset?: number, yoffset?: number): TPromise<void> {
+		return this._getElementXY(selector, xoffset, yoffset).then(({ x, y }) => {
 
-		webContents.sendInputEvent({ type: 'mouseDown', x, y, button: 'left', clickCount } as any);
-		await TPromise.timeout(10);
-		webContents.sendInputEvent({ type: 'mouseUp', x, y, button: 'left', clickCount } as any);
+			const webContents = electron.remote.getCurrentWebContents();
+			webContents.sendInputEvent({ type: 'mouseDown', x, y, button: 'left', clickCount } as any);
 
-		await TPromise.timeout(100);
+			return TPromise.timeout(10).then(() => {
+				webContents.sendInputEvent({ type: 'mouseUp', x, y, button: 'left', clickCount } as any);
+				return TPromise.timeout(100);
+			});
+		});
 	}
 
-	async setValue(selector: string, text: string): TPromise<void> {
+	setValue(selector: string, text: string): TPromise<void> {
 		const element = document.querySelector(selector);
 
 		if (!element) {
-			throw new Error('Element not found');
+			return TPromise.wrapError(new Error('Element not found'));
 		}
 
 		const inputElement = element as HTMLInputElement;
@@ -106,13 +108,15 @@ class WindowDriver implements IWindowDriver {
 
 		const event = new Event('input', { bubbles: true, cancelable: true });
 		inputElement.dispatchEvent(event);
+
+		return TPromise.as(null);
 	}
 
-	async getTitle(): TPromise<string> {
-		return document.title;
+	getTitle(): TPromise<string> {
+		return TPromise.as(document.title);
 	}
 
-	async isActiveElement(selector: string): TPromise<boolean> {
+	isActiveElement(selector: string): TPromise<boolean> {
 		const element = document.querySelector(selector);
 
 		if (element !== document.activeElement) {
@@ -128,13 +132,13 @@ class WindowDriver implements IWindowDriver {
 				el = el.parentElement;
 			}
 
-			throw new Error(`Active element not found. Current active element is '${chain.join(' > ')}'`);
+			return TPromise.wrapError(new Error(`Active element not found. Current active element is '${chain.join(' > ')}'`));
 		}
 
-		return true;
+		return TPromise.as(true);
 	}
 
-	async getElements(selector: string, recursive: boolean): TPromise<IElement[]> {
+	getElements(selector: string, recursive: boolean): TPromise<IElement[]> {
 		const query = document.querySelectorAll(selector);
 		const result: IElement[] = [];
 
@@ -143,14 +147,14 @@ class WindowDriver implements IWindowDriver {
 			result.push(serializeElement(element, recursive));
 		}
 
-		return result;
+		return TPromise.as(result);
 	}
 
-	async typeInEditor(selector: string, text: string): TPromise<void> {
+	typeInEditor(selector: string, text: string): TPromise<void> {
 		const element = document.querySelector(selector);
 
 		if (!element) {
-			throw new Error('Editor not found: ' + selector);
+			return TPromise.wrapError(new Error('Editor not found: ' + selector));
 		}
 
 		const textarea = element as HTMLTextAreaElement;
@@ -164,19 +168,21 @@ class WindowDriver implements IWindowDriver {
 
 		const event = new Event('input', { 'bubbles': true, 'cancelable': true });
 		textarea.dispatchEvent(event);
+
+		return TPromise.as(null);
 	}
 
-	async getTerminalBuffer(selector: string): TPromise<string[]> {
+	getTerminalBuffer(selector: string): TPromise<string[]> {
 		const element = document.querySelector(selector);
 
 		if (!element) {
-			throw new Error('Terminal not found: ' + selector);
+			return TPromise.wrapError(new Error('Terminal not found: ' + selector));
 		}
 
 		const xterm: Terminal = (element as any).xterm;
 
 		if (!xterm) {
-			throw new Error('Xterm not found: ' + selector);
+			return TPromise.wrapError(new Error('Xterm not found: ' + selector));
 		}
 
 		const lines: string[] = [];
@@ -185,27 +191,29 @@ class WindowDriver implements IWindowDriver {
 			lines.push(xterm._core.buffer.translateBufferLineToString(i, true));
 		}
 
-		return lines;
+		return TPromise.as(lines);
 	}
 
-	async writeInTerminal(selector: string, text: string): TPromise<void> {
+	writeInTerminal(selector: string, text: string): TPromise<void> {
 		const element = document.querySelector(selector);
 
 		if (!element) {
-			throw new Error('Element not found');
+			return TPromise.wrapError(new Error('Element not found'));
 		}
 
 		const xterm: Terminal = (element as any).xterm;
 
 		if (!xterm) {
-			throw new Error('Xterm not found');
+			return TPromise.wrapError(new Error('Xterm not found'));
 		}
 
 		xterm._core.send(text);
+
+		return TPromise.as(null);
 	}
 
-	async openDevTools(): TPromise<void> {
-		await this.windowService.openDevTools({ mode: 'detach' });
+	openDevTools(): TPromise<void> {
+		return this.windowService.openDevTools({ mode: 'detach' });
 	}
 }
 
@@ -213,7 +221,7 @@ export async function registerWindowDriver(
 	client: IPCClient,
 	windowId: number,
 	instantiationService: IInstantiationService
-): TPromise<IDisposable> {
+): Promise<IDisposable> {
 	const windowDriver = instantiationService.createInstance(WindowDriver);
 	const windowDriverChannel = new WindowDriverChannel(windowDriver);
 	client.registerChannel('windowDriver', windowDriverChannel);
@@ -224,9 +232,9 @@ export async function registerWindowDriver(
 	const options = await windowDriverRegistry.registerWindowDriver(windowId);
 
 	if (options.verbose) {
-		// windowDriver.openDevTools();
+		windowDriver.openDevTools();
 	}
 
 	const disposable = toDisposable(() => windowDriverRegistry.reloadWindowDriver(windowId));
 	return combinedDisposable([disposable, client]);
-}
\ No newline at end of file
+}
diff --git a/src/vs/platform/driver/electron-main/driver.ts b/src/vs/platform/driver/electron-main/driver.ts
index 46efb22aed5..ba2b3c673a2 100644
--- a/src/vs/platform/driver/electron-main/driver.ts
+++ b/src/vs/platform/driver/electron-main/driver.ts
@@ -21,13 +21,17 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 // TODO@joao: bad layering!
 import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
 import { ScanCodeBinding } from 'vs/workbench/services/keybinding/common/scanCode';
-import { NativeImage } from 'electron';
+import { toWinJsPromise } from 'vs/base/common/async';
 
 class WindowRouter implements IClientRouter {
 
 	constructor(private windowId: number) { }
 
-	route(command: string, arg: any): string {
+	routeCall(): string {
+		return `window:${this.windowId}`;
+	}
+
+	routeEvent(): string {
 		return `window:${this.windowId}`;
 	}
 }
@@ -50,57 +54,57 @@ export class Driver implements IDriver, IWindowDriverRegistry {
 		@IWindowsMainService private windowsService: IWindowsMainService
 	) { }
 
-	async registerWindowDriver(windowId: number): TPromise<IDriverOptions> {
+	registerWindowDriver(windowId: number): TPromise<IDriverOptions> {
 		this.registeredWindowIds.add(windowId);
 		this.reloadingWindowIds.delete(windowId);
 		this.onDidReloadingChange.fire();
-		return this.options;
+		return TPromise.as(this.options);
 	}
 
-	async reloadWindowDriver(windowId: number): TPromise<void> {
+	reloadWindowDriver(windowId: number): TPromise<void> {
 		this.reloadingWindowIds.add(windowId);
+		return TPromise.as(null);
 	}
 
-	async getWindowIds(): TPromise<number[]> {
-		return this.windowsService.getWindows()
+	getWindowIds(): TPromise<number[]> {
+		return TPromise.as(this.windowsService.getWindows()
 			.map(w => w.id)
-			.filter(id => this.registeredWindowIds.has(id) && !this.reloadingWindowIds.has(id));
+			.filter(id => this.registeredWindowIds.has(id) && !this.reloadingWindowIds.has(id)));
 	}
 
-	async capturePage(windowId: number): TPromise<string> {
-		await this.whenUnfrozen(windowId);
-
-		const window = this.windowsService.getWindowById(windowId);
-		const webContents = window.win.webContents;
-		const image = await new Promise<NativeImage>(c => webContents.capturePage(c));
-		const buffer = image.toPNG();
-
-		return buffer.toString('base64');
+	capturePage(windowId: number): TPromise<string> {
+		return this.whenUnfrozen(windowId).then(() => {
+			const window = this.windowsService.getWindowById(windowId);
+			const webContents = window.win.webContents;
+			return new TPromise(c => webContents.capturePage(image => c(image.toPNG().toString('base64'))));
+		});
 	}
 
-	async reloadWindow(windowId: number): TPromise<void> {
-		await this.whenUnfrozen(windowId);
-
-		const window = this.windowsService.getWindowById(windowId);
-		this.reloadingWindowIds.add(windowId);
-		this.windowsService.reload(window);
+	reloadWindow(windowId: number): TPromise<void> {
+		return this.whenUnfrozen(windowId).then(() => {
+			const window = this.windowsService.getWindowById(windowId);
+			this.reloadingWindowIds.add(windowId);
+			this.windowsService.reload(window);
+		});
 	}
 
-	async dispatchKeybinding(windowId: number, keybinding: string): TPromise<void> {
-		await this.whenUnfrozen(windowId);
+	dispatchKeybinding(windowId: number, keybinding: string): TPromise<void> {
+		return this.whenUnfrozen(windowId).then(() => {
+			const [first, second] = KeybindingIO._readUserBinding(keybinding);
 
-		const [first, second] = KeybindingIO._readUserBinding(keybinding);
-
-		await this._dispatchKeybinding(windowId, first);
-
-		if (second) {
-			await this._dispatchKeybinding(windowId, second);
-		}
+			return this._dispatchKeybinding(windowId, first).then(() => {
+				if (second) {
+					return this._dispatchKeybinding(windowId, second);
+				} else {
+					return TPromise.as(null);
+				}
+			});
+		});
 	}
 
-	private async _dispatchKeybinding(windowId: number, keybinding: SimpleKeybinding | ScanCodeBinding): TPromise<void> {
+	private _dispatchKeybinding(windowId: number, keybinding: SimpleKeybinding | ScanCodeBinding): TPromise<void> {
 		if (keybinding instanceof ScanCodeBinding) {
-			throw new Error('ScanCodeBindings not supported');
+			return TPromise.wrapError(new Error('ScanCodeBindings not supported'));
 		}
 
 		const window = this.windowsService.getWindowById(windowId);
@@ -135,63 +139,76 @@ export class Driver implements IDriver, IWindowDriverRegistry {
 
 		webContents.sendInputEvent({ type: 'keyUp', keyCode, modifiers } as any);
 
-		await TPromise.timeout(100);
+		return TPromise.timeout(100);
 	}
 
-	async click(windowId: number, selector: string, xoffset?: number, yoffset?: number): TPromise<void> {
-		const windowDriver = await this.getWindowDriver(windowId);
-		return windowDriver.click(selector, xoffset, yoffset);
+	click(windowId: number, selector: string, xoffset?: number, yoffset?: number): TPromise<void> {
+		return this.getWindowDriver(windowId).then(windowDriver => {
+			return windowDriver.click(selector, xoffset, yoffset);
+		});
 	}
 
-	async doubleClick(windowId: number, selector: string): TPromise<void> {
-		const windowDriver = await this.getWindowDriver(windowId);
-		return windowDriver.doubleClick(selector);
+	doubleClick(windowId: number, selector: string): TPromise<void> {
+		return this.getWindowDriver(windowId).then(windowDriver => {
+			return windowDriver.doubleClick(selector);
+		});
 	}
 
-	async setValue(windowId: number, selector: string, text: string): TPromise<void> {
-		const windowDriver = await this.getWindowDriver(windowId);
-		return windowDriver.setValue(selector, text);
+	setValue(windowId: number, selector: string, text: string): TPromise<void> {
+		return this.getWindowDriver(windowId).then(windowDriver => {
+			return windowDriver.setValue(selector, text);
+		});
 	}
 
-	async getTitle(windowId: number): TPromise<string> {
-		const windowDriver = await this.getWindowDriver(windowId);
-		return windowDriver.getTitle();
+	getTitle(windowId: number): TPromise<string> {
+		return this.getWindowDriver(windowId).then(windowDriver => {
+			return windowDriver.getTitle();
+		});
 	}
 
-	async isActiveElement(windowId: number, selector: string): TPromise<boolean> {
-		const windowDriver = await this.getWindowDriver(windowId);
-		return windowDriver.isActiveElement(selector);
+	isActiveElement(windowId: number, selector: string): TPromise<boolean> {
+		return this.getWindowDriver(windowId).then(windowDriver => {
+			return windowDriver.isActiveElement(selector);
+		});
 	}
 
-	async getElements(windowId: number, selector: string, recursive: boolean): TPromise<IElement[]> {
-		const windowDriver = await this.getWindowDriver(windowId);
-		return windowDriver.getElements(selector, recursive);
+	getElements(windowId: number, selector: string, recursive: boolean): TPromise<IElement[]> {
+		return this.getWindowDriver(windowId).then(windowDriver => {
+			return windowDriver.getElements(selector, recursive);
+		});
 	}
 
-	async typeInEditor(windowId: number, selector: string, text: string): TPromise<void> {
-		const windowDriver = await this.getWindowDriver(windowId);
-		return windowDriver.typeInEditor(selector, text);
+	typeInEditor(windowId: number, selector: string, text: string): TPromise<void> {
+		return this.getWindowDriver(windowId).then(windowDriver => {
+			return windowDriver.typeInEditor(selector, text);
+		});
 	}
 
-	async getTerminalBuffer(windowId: number, selector: string): TPromise<string[]> {
-		const windowDriver = await this.getWindowDriver(windowId);
-		return windowDriver.getTerminalBuffer(selector);
+	getTerminalBuffer(windowId: number, selector: string): TPromise<string[]> {
+		return this.getWindowDriver(windowId).then(windowDriver => {
+			return windowDriver.getTerminalBuffer(selector);
+		});
 	}
 
-	async writeInTerminal(windowId: number, selector: string, text: string): TPromise<void> {
-		const windowDriver = await this.getWindowDriver(windowId);
-		return windowDriver.writeInTerminal(selector, text);
+	writeInTerminal(windowId: number, selector: string, text: string): TPromise<void> {
+		return this.getWindowDriver(windowId).then(windowDriver => {
+			return windowDriver.writeInTerminal(selector, text);
+		});
 	}
 
-	private async getWindowDriver(windowId: number): TPromise<IWindowDriver> {
-		await this.whenUnfrozen(windowId);
-
-		const router = new WindowRouter(windowId);
-		const windowDriverChannel = this.windowServer.getChannel<IWindowDriverChannel>('windowDriver', router);
-		return new WindowDriverChannelClient(windowDriverChannel);
+	private getWindowDriver(windowId: number): TPromise<IWindowDriver> {
+		return this.whenUnfrozen(windowId).then(() => {
+			const router = new WindowRouter(windowId);
+			const windowDriverChannel = this.windowServer.getChannel<IWindowDriverChannel>('windowDriver', router);
+			return new WindowDriverChannelClient(windowDriverChannel);
+		});
 	}
 
-	private async whenUnfrozen(windowId: number): TPromise<void> {
+	private whenUnfrozen(windowId: number): TPromise<void> {
+		return toWinJsPromise(this._whenUnfrozen(windowId));
+	}
+
+	private async _whenUnfrozen(windowId: number): Promise<void> {
 		while (this.reloadingWindowIds.has(windowId)) {
 			await toPromise(this.onDidReloadingChange.event);
 		}
@@ -203,7 +220,7 @@ export async function serve(
 	handle: string,
 	environmentService: IEnvironmentService,
 	instantiationService: IInstantiationService
-): TPromise<IDisposable> {
+): Promise<IDisposable> {
 	const verbose = environmentService.driverVerbose;
 	const driver = instantiationService.createInstance(Driver, windowServer, { verbose });
 
@@ -215,4 +232,4 @@ export async function serve(
 	server.registerChannel('driver', channel);
 
 	return combinedDisposable([server, windowServer]);
-}
\ No newline at end of file
+}
diff --git a/src/vs/platform/driver/node/driver.ts b/src/vs/platform/driver/node/driver.ts
index fb61d1d1fa6..1f5df95b0c7 100644
--- a/src/vs/platform/driver/node/driver.ts
+++ b/src/vs/platform/driver/node/driver.ts
@@ -5,11 +5,10 @@
 
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
 import { IDriver, DriverChannelClient } from 'vs/platform/driver/common/driver';
 import { connect as connectNet, Client } from 'vs/base/parts/ipc/node/ipc.net';
 
-export async function connect(handle: string): TPromise<{ client: Client, driver: IDriver }> {
+export async function connect(handle: string): Promise<{ client: Client, driver: IDriver }> {
 	const client = await connectNet(handle, 'driverClient');
 	const channel = client.getChannel('driver');
 	const driver = new DriverChannelClient(channel);
diff --git a/src/vs/platform/editor/common/editor.ts b/src/vs/platform/editor/common/editor.ts
index d35396a181a..1f110f99f40 100644
--- a/src/vs/platform/editor/common/editor.ts
+++ b/src/vs/platform/editor/common/editor.ts
@@ -66,11 +66,11 @@ export interface IEditorOptions {
 	readonly preserveFocus?: boolean;
 
 	/**
-	 * Tells the editor to replace the editor input in the editor even if it is identical to the one
-	 * already showing. By default, the editor will not replace the input if it is identical to the
+	 * Tells the editor to reload the editor input in the editor even if it is identical to the one
+	 * already showing. By default, the editor will not reload the input if it is identical to the
 	 * one showing.
 	 */
-	readonly forceOpen?: boolean;
+	readonly forceReload?: boolean;
 
 	/**
 	 * Will reveal the editor if it is already opened and visible in any of the opened editor groups. Note
diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts
index 06f80764726..99792a19f00 100644
--- a/src/vs/platform/environment/common/environment.ts
+++ b/src/vs/platform/environment/common/environment.ts
@@ -25,6 +25,7 @@ export interface ParsedArgs {
 	performance?: boolean;
 	'prof-startup'?: string;
 	'prof-startup-prefix'?: string;
+	'prof-append-timers'?: string;
 	verbose?: boolean;
 	log?: string;
 	logExtensionHostCommunication?: boolean;
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
index b02eaa79192..3a8b2891705 100644
--- a/src/vs/platform/environment/node/argv.ts
+++ b/src/vs/platform/environment/node/argv.ts
@@ -160,7 +160,7 @@ const extensionsHelp: { [name: string]: string; } = {
 	'--show-versions': localize('showVersions', "Show versions of installed extensions, when using --list-extension."),
 	'--install-extension (<extension-id> | <extension-vsix-path>)': localize('installExtension', "Installs an extension."),
 	'--uninstall-extension (<extension-id> | <extension-vsix-path>)': localize('uninstallExtension', "Uninstalls an extension."),
-	'--enable-proposed-api <extension-id>': localize('experimentalApis', "Enables proposed API features for an extension.")
+	'--enable-proposed-api (<extension-id>)': localize('experimentalApis', "Enables proposed API features for extensions. Can receive one or more extension IDs to enable individually.")
 };
 
 const troubleshootingHelp: { [name: string]: string; } = {
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index fe5cf912735..25e0dcdb540 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -378,11 +378,6 @@ export interface IExtensionEnablementService {
 	setEnablement(extension: ILocalExtension, state: EnablementState): TPromise<boolean>;
 }
 
-export interface IIgnoredRecommendations {
-	global: string[];
-	workspace: string[];
-}
-
 export interface IExtensionsConfigContent {
 	recommendations: string[];
 	unwantedRecommendations: string[];
@@ -415,9 +410,8 @@ export interface IExtensionTipsService {
 	getKeymapRecommendations(): IExtensionRecommendation[];
 	getAllRecommendations(): TPromise<IExtensionRecommendation[]>;
 	getKeywordsForExtension(extension: string): string[];
-	getRecommendationsForExtension(extension: string): string[];
-	getAllIgnoredRecommendations(): IIgnoredRecommendations;
-	ignoreExtensionRecommendation(extensionId: string): void;
+	toggleIgnoredRecommendation(extensionId: string, shouldIgnore: boolean): void;
+	getAllIgnoredRecommendations(): { global: string[], workspace: string[] };
 	onRecommendationChange: Event<RecommendationChangeNotification>;
 }
 
@@ -425,7 +419,8 @@ export enum ExtensionRecommendationReason {
 	Workspace,
 	File,
 	Executable,
-	DynamicWorkspace
+	DynamicWorkspace,
+	Experimental
 }
 
 export const ExtensionsLabel = localize('extensions', "Extensions");
diff --git a/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts b/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
index 882efb29b22..1de227bfe06 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
@@ -6,17 +6,17 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IChannel, eventToCall, eventFromCall } from 'vs/base/parts/ipc/common/ipc';
+import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { IExtensionManagementService, ILocalExtension, InstallExtensionEvent, DidInstallExtensionEvent, IGalleryExtension, LocalExtensionType, DidUninstallExtensionEvent, IExtensionIdentifier, IGalleryMetadata, IReportedExtension } from './extensionManagement';
 import { Event, buffer, mapEvent } from 'vs/base/common/event';
 import URI from 'vs/base/common/uri';
 import { IURITransformer } from 'vs/base/common/uriIpc';
 
 export interface IExtensionManagementChannel extends IChannel {
-	call(command: 'event:onInstallExtension'): TPromise<void>;
-	call(command: 'event:onDidInstallExtension'): TPromise<void>;
-	call(command: 'event:onUninstallExtension'): TPromise<void>;
-	call(command: 'event:onDidUninstallExtension'): TPromise<void>;
+	listen(event: 'onInstallExtension'): Event<InstallExtensionEvent>;
+	listen(event: 'onDidInstallExtension'): Event<DidInstallExtensionEvent>;
+	listen(event: 'onUninstallExtension'): Event<IExtensionIdentifier>;
+	listen(event: 'onDidUninstallExtension'): Event<DidUninstallExtensionEvent>;
 	call(command: 'install', args: [string]): TPromise<ILocalExtension>;
 	call(command: 'installFromGallery', args: [IGalleryExtension]): TPromise<ILocalExtension>;
 	call(command: 'uninstall', args: [ILocalExtension, boolean]): TPromise<void>;
@@ -40,12 +40,19 @@ export class ExtensionManagementChannel implements IExtensionManagementChannel {
 		this.onDidUninstallExtension = buffer(service.onDidUninstallExtension, true);
 	}
 
+	listen(event: string): Event<any> {
+		switch (event) {
+			case 'onInstallExtension': return this.onInstallExtension;
+			case 'onDidInstallExtension': return this.onDidInstallExtension;
+			case 'onUninstallExtension': return this.onUninstallExtension;
+			case 'onDidUninstallExtension': return this.onDidUninstallExtension;
+		}
+
+		throw new Error('Invalid listen');
+	}
+
 	call(command: string, args?: any): TPromise<any> {
 		switch (command) {
-			case 'event:onInstallExtension': return eventToCall(this.onInstallExtension);
-			case 'event:onDidInstallExtension': return eventToCall(this.onDidInstallExtension);
-			case 'event:onUninstallExtension': return eventToCall(this.onUninstallExtension);
-			case 'event:onDidUninstallExtension': return eventToCall(this.onDidUninstallExtension);
 			case 'install': return this.service.install(args[0]);
 			case 'installFromGallery': return this.service.installFromGallery(args[0]);
 			case 'uninstall': return this.service.uninstall(args[0], args[1]);
@@ -54,7 +61,8 @@ export class ExtensionManagementChannel implements IExtensionManagementChannel {
 			case 'updateMetadata': return this.service.updateMetadata(args[0], args[1]);
 			case 'getExtensionsReport': return this.service.getExtensionsReport();
 		}
-		return undefined;
+
+		throw new Error('Invalid call');
 	}
 }
 
@@ -64,17 +72,10 @@ export class ExtensionManagementChannelClient implements IExtensionManagementSer
 
 	constructor(private channel: IExtensionManagementChannel, private uriTransformer: IURITransformer) { }
 
-	private _onInstallExtension = eventFromCall<InstallExtensionEvent>(this.channel, 'event:onInstallExtension');
-	get onInstallExtension(): Event<InstallExtensionEvent> { return this._onInstallExtension; }
-
-	private _onDidInstallExtension = mapEvent(eventFromCall<DidInstallExtensionEvent>(this.channel, 'event:onDidInstallExtension'), i => ({ ...i, local: this._transform(i.local) }));
-	get onDidInstallExtension(): Event<DidInstallExtensionEvent> { return this._onDidInstallExtension; }
-
-	private _onUninstallExtension = eventFromCall<IExtensionIdentifier>(this.channel, 'event:onUninstallExtension');
-	get onUninstallExtension(): Event<IExtensionIdentifier> { return this._onUninstallExtension; }
-
-	private _onDidUninstallExtension = eventFromCall<DidUninstallExtensionEvent>(this.channel, 'event:onDidUninstallExtension');
-	get onDidUninstallExtension(): Event<DidUninstallExtensionEvent> { return this._onDidUninstallExtension; }
+	get onInstallExtension(): Event<InstallExtensionEvent> { return this.channel.listen('onInstallExtension'); }
+	get onDidInstallExtension(): Event<DidInstallExtensionEvent> { return mapEvent(this.channel.listen('onDidInstallExtension'), i => ({ ...i, local: this._transform(i.local) })); }
+	get onUninstallExtension(): Event<IExtensionIdentifier> { return this.channel.listen('onUninstallExtension'); }
+	get onDidUninstallExtension(): Event<DidUninstallExtensionEvent> { return this.channel.listen('onDidUninstallExtension'); }
 
 	install(zipPath: string): TPromise<ILocalExtension> {
 		return this.channel.call('install', [zipPath])
diff --git a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts
index cec901d0b77..87c15f9be41 100644
--- a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts
@@ -303,7 +303,7 @@ function toExtension(galleryExtension: IRawGalleryExtension, extensionsGalleryUr
 		publisher: galleryExtension.publisher.publisherName,
 		publisherDisplayName: galleryExtension.publisher.displayName,
 		description: galleryExtension.shortDescription || '',
-		installCount: getStatistic(galleryExtension.statistics, 'install'),
+		installCount: getStatistic(galleryExtension.statistics, 'install') + getStatistic(galleryExtension.statistics, 'updateCount'),
 		rating: getStatistic(galleryExtension.statistics, 'averagerating'),
 		ratingCount: getStatistic(galleryExtension.statistics, 'ratingcount'),
 		assets,
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 611209b6926..4cdee22f254 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -114,6 +114,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 	private lastReportTimestamp = 0;
 	private readonly installationStartTime: Map<string, number> = new Map<string, number>();
 	private readonly installingExtensions: Map<string, TPromise<ILocalExtension>> = new Map<string, TPromise<ILocalExtension>>();
+	private readonly uninstallingExtensions: Map<string, TPromise<void>> = new Map<string, TPromise<void>>();
 	private readonly manifestCache: ExtensionsManifestCache;
 	private readonly extensionLifecycle: ExtensionsLifecycle;
 
@@ -140,9 +141,15 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		this.extensionsPath = environmentService.extensionsPath;
 		this.uninstalledPath = path.join(this.extensionsPath, '.obsolete');
 		this.uninstalledFileLimiter = new Limiter(1);
-		this._register(toDisposable(() => this.installingExtensions.clear()));
 		this.manifestCache = this._register(new ExtensionsManifestCache(environmentService, this));
 		this.extensionLifecycle = this._register(new ExtensionsLifecycle(this.logService));
+
+		this._register(toDisposable(() => {
+			this.installingExtensions.forEach(promise => promise.cancel());
+			this.uninstallingExtensions.forEach(promise => promise.cancel());
+			this.installingExtensions.clear();
+			this.uninstallingExtensions.clear();
+		}));
 	}
 
 	install(zipPath: string): TPromise<ILocalExtension> {
@@ -208,7 +215,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 	}
 
 	private installFromZipPath(identifier: IExtensionIdentifier, zipPath: string, metadata: IGalleryMetadata, manifest: IExtensionManifest): TPromise<ILocalExtension> {
-		return this.getInstalled()
+		return this.toNonCancellablePromise(this.getInstalled()
 			.then(installed => {
 				const operation = this.getOperation({ id: getIdFromLocalExtensionId(identifier.id), uuid: identifier.uuid }, installed);
 				return this.installExtension({ zipPath, id: identifier.id, metadata })
@@ -230,12 +237,12 @@ export class ExtensionManagementService extends Disposable implements IExtension
 						local => { this._onDidInstallExtension.fire({ identifier, zipPath, local, operation }); return local; },
 						error => { this._onDidInstallExtension.fire({ identifier, zipPath, operation, error }); return TPromise.wrapError(error); }
 					);
-			});
+			}));
 	}
 
 	installFromGallery(extension: IGalleryExtension): TPromise<ILocalExtension> {
 		this.onInstallExtensions([extension]);
-		return this.getInstalled(LocalExtensionType.User)
+		return this.toNonCancellablePromise(this.getInstalled(LocalExtensionType.User)
 			.then(installed => this.collectExtensionsToInstall(extension)
 				.then(
 					extensionsToInstall => {
@@ -249,7 +256,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 									.then(() => locals.filter(l => areSameExtensions({ id: getGalleryExtensionIdFromLocal(l), uuid: l.identifier.uuid }, extension.identifier))[0]),
 								errors => this.onDidInstallExtensions(extensionsToInstall, [], operataions, errors));
 					},
-					error => this.onDidInstallExtensions([extension], [], [this.getOperation(extension.identifier, installed)], [error])));
+					error => this.onDidInstallExtensions([extension], [], [this.getOperation(extension.identifier, installed)], [error]))));
 	}
 
 	reinstallFromGallery(extension: ILocalExtension): TPromise<ILocalExtension> {
@@ -430,7 +437,8 @@ export class ExtensionManagementService extends Disposable implements IExtension
 	private extractAndInstall({ zipPath, id, metadata }: InstallableExtension): TPromise<ILocalExtension> {
 		const tempPath = path.join(this.extensionsPath, `.${id}`);
 		const extensionPath = path.join(this.extensionsPath, id);
-		return this.extractAndRename(id, zipPath, tempPath, extensionPath)
+		return pfs.rimraf(extensionPath)
+			.then(() => this.extractAndRename(id, zipPath, tempPath, extensionPath), e => TPromise.wrapError(new ExtensionManagementError(nls.localize('errorDeleting', "Unable to delete the existing folder '{0}' while installing the extension '{1}'. Please delete the folder manually and try again", extensionPath, id), INSTALL_ERROR_DELETING)))
 			.then(() => {
 				this.logService.info('Installation completed.', id);
 				return this.scanExtension(id, this.extensionsPath, LocalExtensionType.User);
@@ -487,13 +495,13 @@ export class ExtensionManagementService extends Disposable implements IExtension
 	}
 
 	uninstall(extension: ILocalExtension, force = false): TPromise<void> {
-		return this.getInstalled(LocalExtensionType.User)
+		return this.toNonCancellablePromise(this.getInstalled(LocalExtensionType.User)
 			.then(installed => {
 				const promises = installed
 					.filter(e => e.manifest.publisher === extension.manifest.publisher && e.manifest.name === extension.manifest.name)
 					.map(e => this.checkForDependenciesAndUninstall(e, installed, force));
 				return TPromise.join(promises).then(() => null, error => TPromise.wrapError(this.joinErrors(error)));
-			});
+			}));
 	}
 
 	updateMetadata(local: ILocalExtension, metadata: IGalleryMetadata): TPromise<ILocalExtension> {
@@ -667,12 +675,19 @@ export class ExtensionManagementService extends Disposable implements IExtension
 	}
 
 	private uninstallExtension(local: ILocalExtension): TPromise<void> {
-		// Set all versions of the extension as uninstalled
-		return this.scanUserExtensions(false)
-			.then(userExtensions => this.setUninstalled(...userExtensions.filter(u => areSameExtensions({ id: getGalleryExtensionIdFromLocal(u), uuid: u.identifier.uuid }, { id: getGalleryExtensionIdFromLocal(local), uuid: local.identifier.uuid }))));
+		const id = getGalleryExtensionIdFromLocal(local);
+		let promise = this.uninstallingExtensions.get(id);
+		if (!promise) {
+			// Set all versions of the extension as uninstalled
+			promise = this.scanUserExtensions(false)
+				.then(userExtensions => this.setUninstalled(...userExtensions.filter(u => areSameExtensions({ id: getGalleryExtensionIdFromLocal(u), uuid: u.identifier.uuid }, { id, uuid: local.identifier.uuid }))))
+				.then(() => { this.uninstallingExtensions.delete(id); });
+			this.uninstallingExtensions.set(id, promise);
+		}
+		return promise;
 	}
 
-	private async postUninstallExtension(extension: ILocalExtension, error?: Error): TPromise<void> {
+	private async postUninstallExtension(extension: ILocalExtension, error?: Error): Promise<void> {
 		if (error) {
 			this.logService.error('Failed to uninstall extension:', extension.identifier.id, error.message);
 		} else {
@@ -863,6 +878,10 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			});
 	}
 
+	private toNonCancellablePromise<T>(promise: TPromise<T>): TPromise<T> {
+		return new TPromise((c, e) => promise.then(result => c(result), error => e(error)), () => this.logService.debug('Request Cancelled'));
+	}
+
 	private reportTelemetry(eventName: string, extensionData: any, duration: number, error?: Error): void {
 		const errorcode = error ? error instanceof ExtensionManagementError ? error.code : ERROR_UNKNOWN : void 0;
 		/* __GDPR__
diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts
index 39ed62b06f6..72b73ed86d2 100644
--- a/src/vs/platform/files/common/files.ts
+++ b/src/vs/platform/files/common/files.ts
@@ -128,10 +128,11 @@ export interface IFileService {
 	createFolder(resource: URI): TPromise<IFileStat>;
 
 	/**
-	 * Deletes the provided file.  The optional useTrash parameter allows to
-	 * move the file to trash.
+	 * Deletes the provided file. The optional useTrash parameter allows to
+	 * move the file to trash. The optional recursive parameter allows to delete
+	 * non-empty folders recursively.
 	 */
-	del(resource: URI, useTrash?: boolean): TPromise<void>;
+	del(resource: URI, options?: { useTrash?: boolean, recursive?: boolean }): TPromise<void>;
 
 	/**
 	 * Allows to start a watcher that reports file change events on the provided resource.
@@ -158,6 +159,10 @@ export interface FileWriteOptions {
 	create: boolean;
 }
 
+export interface FileDeleteOptions {
+	recursive: boolean;
+}
+
 export enum FileType {
 	Unknown = 0,
 	File = 1,
@@ -196,7 +201,7 @@ export interface IFileSystemProvider {
 	stat(resource: URI): TPromise<IStat>;
 	mkdir(resource: URI): TPromise<void>;
 	readdir(resource: URI): TPromise<[string, FileType][]>;
-	delete(resource: URI): TPromise<void>;
+	delete(resource: URI, opts: FileDeleteOptions): TPromise<void>;
 
 	rename(from: URI, to: URI, opts: FileOverwriteOptions): TPromise<void>;
 	copy?(from: URI, to: URI, opts: FileOverwriteOptions): TPromise<void>;
@@ -228,15 +233,15 @@ export class FileOperationEvent {
 	constructor(private _resource: URI, private _operation: FileOperation, private _target?: IFileStat) {
 	}
 
-	public get resource(): URI {
+	get resource(): URI {
 		return this._resource;
 	}
 
-	public get target(): IFileStat {
+	get target(): IFileStat {
 		return this._target;
 	}
 
-	public get operation(): FileOperation {
+	get operation(): FileOperation {
 		return this._operation;
 	}
 }
@@ -274,7 +279,7 @@ export class FileChangesEvent {
 		this._changes = changes;
 	}
 
-	public get changes() {
+	get changes() {
 		return this._changes;
 	}
 
@@ -283,7 +288,7 @@ export class FileChangesEvent {
 	 * type DELETED, this method will also return true if a folder got deleted that is the parent of the
 	 * provided file path.
 	 */
-	public contains(resource: URI, type: FileChangeType): boolean {
+	contains(resource: URI, type: FileChangeType): boolean {
 		if (!resource) {
 			return false;
 		}
@@ -305,42 +310,42 @@ export class FileChangesEvent {
 	/**
 	 * Returns the changes that describe added files.
 	 */
-	public getAdded(): IFileChange[] {
+	getAdded(): IFileChange[] {
 		return this.getOfType(FileChangeType.ADDED);
 	}
 
 	/**
 	 * Returns if this event contains added files.
 	 */
-	public gotAdded(): boolean {
+	gotAdded(): boolean {
 		return this.hasType(FileChangeType.ADDED);
 	}
 
 	/**
 	 * Returns the changes that describe deleted files.
 	 */
-	public getDeleted(): IFileChange[] {
+	getDeleted(): IFileChange[] {
 		return this.getOfType(FileChangeType.DELETED);
 	}
 
 	/**
 	 * Returns if this event contains deleted files.
 	 */
-	public gotDeleted(): boolean {
+	gotDeleted(): boolean {
 		return this.hasType(FileChangeType.DELETED);
 	}
 
 	/**
 	 * Returns the changes that describe updated files.
 	 */
-	public getUpdated(): IFileChange[] {
+	getUpdated(): IFileChange[] {
 		return this.getOfType(FileChangeType.UPDATED);
 	}
 
 	/**
 	 * Returns if this event contains updated files.
 	 */
-	public gotUpdated(): boolean {
+	gotUpdated(): boolean {
 		return this.hasType(FileChangeType.UPDATED);
 	}
 
diff --git a/src/vs/platform/history/electron-main/historyMainService.ts b/src/vs/platform/history/electron-main/historyMainService.ts
index 556cae0126b..8b8dbc2fe10 100644
--- a/src/vs/platform/history/electron-main/historyMainService.ts
+++ b/src/vs/platform/history/electron-main/historyMainService.ts
@@ -57,7 +57,7 @@ export class HistoryMainService implements IHistoryMainService {
 		this.addRecentlyOpened([e.workspace], []);
 	}
 
-	public addRecentlyOpened(workspaces: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[], files: string[]): void {
+	addRecentlyOpened(workspaces: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[], files: string[]): void {
 		if ((workspaces && workspaces.length > 0) || (files && files.length > 0)) {
 			const mru = this.getRecentlyOpened();
 
@@ -100,7 +100,7 @@ export class HistoryMainService implements IHistoryMainService {
 		}
 	}
 
-	public removeFromRecentlyOpened(pathsToRemove: string[]): void {
+	removeFromRecentlyOpened(pathsToRemove: string[]): void {
 		const mru = this.getRecentlyOpened();
 		let update = false;
 
@@ -162,7 +162,7 @@ export class HistoryMainService implements IHistoryMainService {
 		}
 	}
 
-	public clearRecentlyOpened(): void {
+	clearRecentlyOpened(): void {
 		this.saveRecentlyOpened({ workspaces: [], files: [] });
 		app.clearRecentDocuments();
 
@@ -170,7 +170,7 @@ export class HistoryMainService implements IHistoryMainService {
 		this._onRecentlyOpenedChange.fire();
 	}
 
-	public getRecentlyOpened(currentWorkspace?: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier, currentFiles?: IPath[]): IRecentlyOpened {
+	getRecentlyOpened(currentWorkspace?: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier, currentFiles?: IPath[]): IRecentlyOpened {
 		let workspaces: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)[];
 		let files: string[];
 
@@ -216,7 +216,7 @@ export class HistoryMainService implements IHistoryMainService {
 		this.stateService.setItem(HistoryMainService.recentlyOpenedStorageKey, recent);
 	}
 
-	public updateWindowsJumpList(): void {
+	updateWindowsJumpList(): void {
 		if (!isWindows) {
 			return; // only on windows
 		}
diff --git a/src/vs/platform/integrity/node/integrityServiceImpl.ts b/src/vs/platform/integrity/node/integrityServiceImpl.ts
index 5a45065e013..0113966b1cc 100644
--- a/src/vs/platform/integrity/node/integrityServiceImpl.ts
+++ b/src/vs/platform/integrity/node/integrityServiceImpl.ts
@@ -133,7 +133,7 @@ export class IntegrityServiceImpl implements IIntegrityService {
 
 	private _resolve(filename: string, expected: string): TPromise<ChecksumPair> {
 		let fileUri = URI.parse(require.toUrl(filename));
-		return new TPromise<ChecksumPair>((c, e, p) => {
+		return new TPromise<ChecksumPair>((c, e) => {
 			fs.readFile(fileUri.fsPath, (err, buff) => {
 				if (err) {
 					return e(err);
diff --git a/src/vs/platform/issue/common/issueIpc.ts b/src/vs/platform/issue/common/issueIpc.ts
index d804c6579fe..d45c1d870ee 100644
--- a/src/vs/platform/issue/common/issueIpc.ts
+++ b/src/vs/platform/issue/common/issueIpc.ts
@@ -8,6 +8,7 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { IIssueService, IssueReporterData, ProcessExplorerData } from './issue';
+import { Event } from 'vs/base/common/event';
 
 export interface IIssueChannel extends IChannel {
 	call(command: 'openIssueReporter', arg: IssueReporterData): TPromise<void>;
@@ -19,6 +20,10 @@ export class IssueChannel implements IIssueChannel {
 
 	constructor(private service: IIssueService) { }
 
+	listen<T>(event: string): Event<T> {
+		throw new Error('No event found');
+	}
+
 	call(command: string, arg?: any): TPromise<any> {
 		switch (command) {
 			case 'openIssueReporter':
diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts
index 05a43fe1992..cebb4e61237 100644
--- a/src/vs/platform/issue/electron-main/issueService.ts
+++ b/src/vs/platform/issue/electron-main/issueService.ts
@@ -78,8 +78,10 @@ export class IssueService implements IIssueService {
 			this._issueWindow.on('close', () => this._issueWindow = null);
 
 			this._issueParentWindow.on('closed', () => {
-				this._issueWindow.close();
-				this._issueWindow = null;
+				if (this._issueWindow) {
+					this._issueWindow.close();
+					this._issueWindow = null;
+				}
 			});
 		}
 
@@ -139,8 +141,10 @@ export class IssueService implements IIssueService {
 			this._processExplorerWindow.on('close', () => this._processExplorerWindow = void 0);
 
 			parentWindow.on('close', () => {
-				this._processExplorerWindow.close();
-				this._processExplorerWindow = null;
+				if (this._processExplorerWindow) {
+					this._processExplorerWindow.close();
+					this._processExplorerWindow = null;
+				}
 			});
 		}
 
diff --git a/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts b/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts
index 4b6efd06abb..34c1b8e99a9 100644
--- a/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts
+++ b/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts
@@ -20,7 +20,7 @@ export class LifecycleService implements ILifecycleService {
 
 	private static readonly _lastShutdownReasonKey = 'lifecyle.lastShutdownReason';
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private readonly _onWillShutdown = new Emitter<ShutdownEvent>();
 	private readonly _onShutdown = new Emitter<ShutdownReason>();
@@ -95,11 +95,11 @@ export class LifecycleService implements ILifecycleService {
 		return handleVetos(vetos, err => this._notificationService.error(toErrorMessage(err)));
 	}
 
-	public get phase(): LifecyclePhase {
+	get phase(): LifecyclePhase {
 		return this._phase;
 	}
 
-	public set phase(value: LifecyclePhase) {
+	set phase(value: LifecyclePhase) {
 		if (value < this.phase) {
 			throw new Error('Lifecycle cannot go backwards');
 		}
@@ -119,7 +119,7 @@ export class LifecycleService implements ILifecycleService {
 		}
 	}
 
-	public when(phase: LifecyclePhase): Thenable<any> {
+	when(phase: LifecyclePhase): Thenable<any> {
 		if (phase <= this._phase) {
 			return Promise.resolve();
 		}
@@ -133,15 +133,15 @@ export class LifecycleService implements ILifecycleService {
 		return barrier.wait();
 	}
 
-	public get startupKind(): StartupKind {
+	get startupKind(): StartupKind {
 		return this._startupKind;
 	}
 
-	public get onWillShutdown(): Event<ShutdownEvent> {
+	get onWillShutdown(): Event<ShutdownEvent> {
 		return this._onWillShutdown.event;
 	}
 
-	public get onShutdown(): Event<ShutdownReason> {
+	get onShutdown(): Event<ShutdownReason> {
 		return this._onShutdown.event;
 	}
 }
diff --git a/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts b/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts
index a2388d8fa49..118edffa98f 100644
--- a/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts
+++ b/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts
@@ -129,15 +129,15 @@ export class LifecycleService implements ILifecycleService {
 		}
 	}
 
-	public get wasRestarted(): boolean {
+	get wasRestarted(): boolean {
 		return this._wasRestarted;
 	}
 
-	public get isQuitRequested(): boolean {
+	get isQuitRequested(): boolean {
 		return !!this.quitRequested;
 	}
 
-	public ready(): void {
+	ready(): void {
 		this.registerListeners();
 	}
 
@@ -178,7 +178,7 @@ export class LifecycleService implements ILifecycleService {
 		});
 	}
 
-	public registerWindow(window: ICodeWindow): void {
+	registerWindow(window: ICodeWindow): void {
 
 		// track window count
 		this.windowCounter++;
@@ -232,7 +232,7 @@ export class LifecycleService implements ILifecycleService {
 		});
 	}
 
-	public unload(window: ICodeWindow, reason: UnloadReason): TPromise<boolean /* veto */> {
+	unload(window: ICodeWindow, reason: UnloadReason): TPromise<boolean /* veto */> {
 
 		// Always allow to unload a window that is not yet ready
 		if (window.readyState !== ReadyState.READY) {
@@ -326,7 +326,7 @@ export class LifecycleService implements ILifecycleService {
 	 * A promise that completes to indicate if the quit request has been veto'd
 	 * by the user or not.
 	 */
-	public quit(fromUpdate?: boolean): TPromise<boolean /* veto */> {
+	quit(fromUpdate?: boolean): TPromise<boolean /* veto */> {
 		this.logService.trace('Lifecycle#quit()');
 
 		if (!this.pendingQuitPromise) {
@@ -362,13 +362,13 @@ export class LifecycleService implements ILifecycleService {
 		return this.pendingQuitPromise;
 	}
 
-	public kill(code?: number): void {
+	kill(code?: number): void {
 		this.logService.trace('Lifecycle#kill()');
 
 		app.exit(code);
 	}
 
-	public relaunch(options?: { addArgs?: string[], removeArgs?: string[] }): void {
+	relaunch(options?: { addArgs?: string[], removeArgs?: string[] }): void {
 		this.logService.trace('Lifecycle#relaunch()');
 
 		const args = process.argv.slice(1);
diff --git a/src/vs/platform/localizations/common/localizationsIpc.ts b/src/vs/platform/localizations/common/localizationsIpc.ts
index 51b6fb34147..2f06fb819ac 100644
--- a/src/vs/platform/localizations/common/localizationsIpc.ts
+++ b/src/vs/platform/localizations/common/localizationsIpc.ts
@@ -6,12 +6,14 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IChannel, eventToCall, eventFromCall } from 'vs/base/parts/ipc/common/ipc';
+import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { Event, buffer } from 'vs/base/common/event';
 import { ILocalizationsService, LanguageType } from 'vs/platform/localizations/common/localizations';
 
 export interface ILocalizationsChannel extends IChannel {
-	call(command: 'event:onDidLanguagesChange'): TPromise<void>;
+	listen(event: 'onDidLanguagesChange'): Event<void>;
+	listen<T>(event: string, arg?: any): Event<T>;
+
 	call(command: 'getLanguageIds'): TPromise<string[]>;
 	call(command: string, arg?: any): TPromise<any>;
 }
@@ -24,9 +26,16 @@ export class LocalizationsChannel implements ILocalizationsChannel {
 		this.onDidLanguagesChange = buffer(service.onDidLanguagesChange, true);
 	}
 
+	listen<T>(event: string): Event<any> {
+		switch (event) {
+			case 'onDidLanguagesChange': return this.onDidLanguagesChange;
+		}
+
+		throw new Error('No event found');
+	}
+
 	call(command: string, arg?: any): TPromise<any> {
 		switch (command) {
-			case 'event:onDidLanguagesChange': return eventToCall(this.onDidLanguagesChange);
 			case 'getLanguageIds': return this.service.getLanguageIds(arg);
 		}
 		return undefined;
@@ -39,8 +48,7 @@ export class LocalizationsChannelClient implements ILocalizationsService {
 
 	constructor(private channel: ILocalizationsChannel) { }
 
-	private _onDidLanguagesChange = eventFromCall<void>(this.channel, 'event:onDidLanguagesChange');
-	get onDidLanguagesChange(): Event<void> { return this._onDidLanguagesChange; }
+	get onDidLanguagesChange(): Event<void> { return this.channel.listen('onDidLanguagesChange'); }
 
 	getLanguageIds(type?: LanguageType): TPromise<string[]> {
 		return this.channel.call('getLanguageIds', type);
diff --git a/src/vs/platform/log/common/logIpc.ts b/src/vs/platform/log/common/logIpc.ts
index d39072ea674..24bccff9463 100644
--- a/src/vs/platform/log/common/logIpc.ts
+++ b/src/vs/platform/log/common/logIpc.ts
@@ -3,14 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IChannel, eventToCall, eventFromCall } from 'vs/base/parts/ipc/common/ipc';
+import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { LogLevel, ILogService, DelegatedLogService } from 'vs/platform/log/common/log';
 import { Event, buffer } from 'vs/base/common/event';
 
 export interface ILogLevelSetterChannel extends IChannel {
-	call(command: 'event:onDidChangeLogLevel'): TPromise<LogLevel>;
+	listen(event: 'onDidChangeLogLevel'): Event<LogLevel>;
+	listen<T>(event: string, arg?: any): Event<T>;
+
 	call(command: 'setLevel', logLevel: LogLevel): TPromise<void>;
+	call(command: string, arg?: any): TPromise<any>;
 }
 
 export class LogLevelSetterChannel implements ILogLevelSetterChannel {
@@ -21,9 +24,16 @@ export class LogLevelSetterChannel implements ILogLevelSetterChannel {
 		this.onDidChangeLogLevel = buffer(service.onDidChangeLogLevel, true);
 	}
 
+	listen<T>(event: string): Event<any> {
+		switch (event) {
+			case 'onDidChangeLogLevel': return this.onDidChangeLogLevel;
+		}
+
+		throw new Error('No event found');
+	}
+
 	call(command: string, arg?: any): TPromise<any> {
 		switch (command) {
-			case 'event:onDidChangeLogLevel': return eventToCall(this.onDidChangeLogLevel);
 			case 'setLevel': this.service.setLevel(arg); return TPromise.as(null);
 		}
 		return undefined;
@@ -34,8 +44,9 @@ export class LogLevelSetterChannelClient {
 
 	constructor(private channel: ILogLevelSetterChannel) { }
 
-	private _onDidChangeLogLevel = eventFromCall<LogLevel>(this.channel, 'event:onDidChangeLogLevel');
-	get onDidChangeLogLevel(): Event<LogLevel> { return this._onDidChangeLogLevel; }
+	get onDidChangeLogLevel(): Event<LogLevel> {
+		return this.channel.listen('onDidChangeLogLevel');
+	}
 
 	setLevel(level: LogLevel): TPromise<void> {
 		return this.channel.call('setLevel', level);
diff --git a/src/vs/platform/menubar/common/menubarIpc.ts b/src/vs/platform/menubar/common/menubarIpc.ts
index 52b2841d3e8..13699176ef5 100644
--- a/src/vs/platform/menubar/common/menubarIpc.ts
+++ b/src/vs/platform/menubar/common/menubarIpc.ts
@@ -7,6 +7,7 @@
 import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IMenubarService, IMenubarData } from 'vs/platform/menubar/common/menubar';
+import { Event } from 'vs/base/common/event';
 
 export interface IMenubarChannel extends IChannel {
 	call(command: 'updateMenubar', arg: [number, IMenubarData]): TPromise<void>;
@@ -17,6 +18,10 @@ export class MenubarChannel implements IMenubarChannel {
 
 	constructor(private service: IMenubarService) { }
 
+	listen<T>(event: string, arg?: any): Event<T> {
+		throw new Error('No events');
+	}
+
 	call(command: string, arg?: any): TPromise<any> {
 		switch (command) {
 			case 'updateMenubar': return this.service.updateMenubar(arg[0], arg[1]);
diff --git a/src/vs/platform/node/product.ts b/src/vs/platform/node/product.ts
index d97e871be34..b4ed6f55eab 100644
--- a/src/vs/platform/node/product.ts
+++ b/src/vs/platform/node/product.ts
@@ -22,6 +22,7 @@ export interface IProductConfiguration {
 	commit?: string;
 	settingsSearchBuildId?: number;
 	settingsSearchUrl?: string;
+	experimentsUrl?: string;
 	date: string;
 	extensionsGallery: {
 		serviceUrl: string;
diff --git a/src/vs/platform/notification/common/notification.ts b/src/vs/platform/notification/common/notification.ts
index 4b1315c077f..525d8f18a25 100644
--- a/src/vs/platform/notification/common/notification.ts
+++ b/src/vs/platform/notification/common/notification.ts
@@ -205,7 +205,7 @@ export class NoOpNotification implements INotificationHandle {
 
 	private readonly _onDidClose: Emitter<void> = new Emitter();
 
-	public get onDidClose(): Event<void> {
+	get onDidClose(): Event<void> {
 		return this._onDidClose.event;
 	}
 
diff --git a/src/vs/platform/progress/common/progress.ts b/src/vs/platform/progress/common/progress.ts
index a1fca9abef9..405170fa1e1 100644
--- a/src/vs/platform/progress/common/progress.ts
+++ b/src/vs/platform/progress/common/progress.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
@@ -24,7 +23,7 @@ export interface IProgressService {
 	 * Indicate progress for the duration of the provided promise. Progress will stop in
 	 * any case of promise completion, error or cancellation.
 	 */
-	showWhile(promise: TPromise<any>, delay?: number): TPromise<void>;
+	showWhile(promise: Thenable<any>, delay?: number): Thenable<void>;
 }
 
 export interface IProgressRunner {
@@ -126,4 +125,4 @@ export class LongRunningOperation {
 	dispose(): void {
 		this.currentOperationDisposables = dispose(this.currentOperationDisposables);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/platform/quickOpen/common/quickOpen.ts b/src/vs/platform/quickOpen/common/quickOpen.ts
index e5e1bffd9d4..6a9b847fc09 100644
--- a/src/vs/platform/quickOpen/common/quickOpen.ts
+++ b/src/vs/platform/quickOpen/common/quickOpen.ts
@@ -86,6 +86,14 @@ export interface IPickOptions {
 	contextKey?: string;
 }
 
+export interface IStringPickOptions extends IPickOptions {
+	onDidFocus?: (item: string) => void;
+}
+
+export interface ITypedPickOptions<T extends IPickOpenEntry> extends IPickOptions {
+	onDidFocus?: (entry: T) => void;
+}
+
 export interface IShowOptions {
 	quickNavigateConfiguration?: IQuickNavigateConfiguration;
 	inputSelection?: { start: number; end: number; };
@@ -114,10 +122,10 @@ export interface IQuickOpenService {
 	 * Passing in a promise will allow you to resolve the elements in the background while quick open will show a
 	 * progress bar spinning.
 	 */
-	pick(picks: TPromise<string[]>, options?: IPickOptions, token?: CancellationToken): TPromise<string>;
-	pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options?: IPickOptions, token?: CancellationToken): TPromise<T>;
-	pick(picks: string[], options?: IPickOptions, token?: CancellationToken): TPromise<string>;
-	pick<T extends IPickOpenEntry>(picks: T[], options?: IPickOptions, token?: CancellationToken): TPromise<T>;
+	pick(picks: TPromise<string[]>, options?: IStringPickOptions, token?: CancellationToken): TPromise<string>;
+	pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options?: ITypedPickOptions<T>, token?: CancellationToken): TPromise<T>;
+	pick(picks: string[], options?: IStringPickOptions, token?: CancellationToken): TPromise<string>;
+	pick<T extends IPickOpenEntry>(picks: T[], options?: ITypedPickOptions<T>, token?: CancellationToken): TPromise<T>;
 
 	/**
 	 * Allows to navigate from the outside in an opened picker.
diff --git a/src/vs/platform/quickinput/common/quickInput.ts b/src/vs/platform/quickinput/common/quickInput.ts
index 12a15db8b3c..0ec12af97a1 100644
--- a/src/vs/platform/quickinput/common/quickInput.ts
+++ b/src/vs/platform/quickinput/common/quickInput.ts
@@ -23,7 +23,7 @@ export interface IQuickNavigateConfiguration {
 	keybindings: ResolvedKeybinding[];
 }
 
-export interface IPickOptions {
+export interface IPickOptions<T extends IQuickPickItem> {
 
 	/**
 	 * an optional string to show as place holder in the input box to guide the user what she picks on
@@ -49,6 +49,8 @@ export interface IPickOptions {
 	 * an optional flag to make this picker multi-select
 	 */
 	canPickMany?: boolean;
+
+	onDidFocus?: (entry: T) => void;
 }
 
 export interface IInputOptions {
@@ -177,7 +179,7 @@ export interface IQuickInputService {
 	/**
 	 * Opens the quick input box for selecting items and returns a promise with the user selected item(s) if any.
 	 */
-	pick<T extends IQuickPickItem, O extends IPickOptions>(picks: TPromise<T[]>, options?: O, token?: CancellationToken): TPromise<O extends { canPickMany: true } ? T[] : T>;
+	pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: TPromise<T[]>, options?: O, token?: CancellationToken): TPromise<O extends { canPickMany: true } ? T[] : T>;
 
 	/**
 	 * Opens the quick input box for text input and returns a promise with the user typed value if any.
diff --git a/src/vs/platform/request/node/requestService.ts b/src/vs/platform/request/node/requestService.ts
index 0f57b4e35ba..84a66a3ca52 100644
--- a/src/vs/platform/request/node/requestService.ts
+++ b/src/vs/platform/request/node/requestService.ts
@@ -40,18 +40,21 @@ export class RequestService implements IRequestService {
 		this.authorization = config.http && config.http.proxyAuthorization;
 	}
 
-	async request(options: IRequestOptions, requestFn: IRequestFunction = request): TPromise<IRequestContext> {
+	request(options: IRequestOptions, requestFn: IRequestFunction = request): TPromise<IRequestContext> {
 		this.logService.trace('RequestService#request', options.url);
 
 		const { proxyUrl, strictSSL } = this;
+		const agentPromise = options.agent ? TPromise.wrap(options.agent) : TPromise.wrap(getProxyAgent(options.url, { proxyUrl, strictSSL }));
 
-		options.agent = options.agent || await getProxyAgent(options.url, { proxyUrl, strictSSL });
-		options.strictSSL = strictSSL;
+		return agentPromise.then(agent => {
+			options.agent = agent;
+			options.strictSSL = strictSSL;
 
-		if (this.authorization) {
-			options.headers = assign(options.headers || {}, { 'Proxy-Authorization': this.authorization });
-		}
+			if (this.authorization) {
+				options.headers = assign(options.headers || {}, { 'Proxy-Authorization': this.authorization });
+			}
 
-		return requestFn(options);
+			return requestFn(options);
+		});
 	}
 }
diff --git a/src/vs/platform/search/common/search.ts b/src/vs/platform/search/common/search.ts
index ded634a58a4..91ad26c83c2 100644
--- a/src/vs/platform/search/common/search.ts
+++ b/src/vs/platform/search/common/search.ts
@@ -27,7 +27,7 @@ export interface ISearchService {
 	search(query: ISearchQuery): PPromise<ISearchComplete, ISearchProgressItem>;
 	extendQuery(query: ISearchQuery): void;
 	clearCache(cacheKey: string): TPromise<void>;
-	registerSearchResultProvider(provider: ISearchResultProvider): IDisposable;
+	registerSearchResultProvider(scheme: string, provider: ISearchResultProvider): IDisposable;
 }
 
 export interface ISearchHistoryValues {
@@ -47,6 +47,7 @@ export interface ISearchHistoryService {
 
 export interface ISearchResultProvider {
 	search(query: ISearchQuery): PPromise<ISearchComplete, ISearchProgressItem>;
+	clearCache(cacheKey: string): TPromise<void>;
 }
 
 export interface IFolderQuery<U extends UriComponents=uri> {
diff --git a/src/vs/platform/state/node/stateService.ts b/src/vs/platform/state/node/stateService.ts
index 12e1682db58..77d9c406d30 100644
--- a/src/vs/platform/state/node/stateService.ts
+++ b/src/vs/platform/state/node/stateService.ts
@@ -25,7 +25,7 @@ export class FileStorage {
 		}
 	}
 
-	public getItem<T>(key: string, defaultValue?: T): T {
+	getItem<T>(key: string, defaultValue?: T): T {
 		this.ensureLoaded();
 
 		const res = this.database[key];
@@ -36,7 +36,7 @@ export class FileStorage {
 		return res;
 	}
 
-	public setItem(key: string, data: any): void {
+	setItem(key: string, data: any): void {
 		this.ensureLoaded();
 
 		// Remove an item when it is undefined or null
@@ -55,7 +55,7 @@ export class FileStorage {
 		this.saveSync();
 	}
 
-	public removeItem(key: string): void {
+	removeItem(key: string): void {
 		this.ensureLoaded();
 
 		// Only update if the key is actually present (not undefined)
@@ -96,15 +96,15 @@ export class StateService implements IStateService {
 		this.fileStorage = new FileStorage(path.join(environmentService.userDataPath, 'storage.json'), error => logService.error(error));
 	}
 
-	public getItem<T>(key: string, defaultValue?: T): T {
+	getItem<T>(key: string, defaultValue?: T): T {
 		return this.fileStorage.getItem(key, defaultValue);
 	}
 
-	public setItem(key: string, data: any): void {
+	setItem(key: string, data: any): void {
 		this.fileStorage.setItem(key, data);
 	}
 
-	public removeItem(key: string): void {
+	removeItem(key: string): void {
 		this.fileStorage.removeItem(key);
 	}
 }
diff --git a/src/vs/platform/storage/common/storageService.ts b/src/vs/platform/storage/common/storageService.ts
index a15769237a5..cd60f29cd2e 100644
--- a/src/vs/platform/storage/common/storageService.ts
+++ b/src/vs/platform/storage/common/storageService.ts
@@ -21,13 +21,13 @@ export interface IStorage {
 
 export class StorageService implements IStorageService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
-	public static readonly COMMON_PREFIX = 'storage://';
-	public static readonly GLOBAL_PREFIX = `${StorageService.COMMON_PREFIX}global/`;
-	public static readonly WORKSPACE_PREFIX = `${StorageService.COMMON_PREFIX}workspace/`;
-	public static readonly WORKSPACE_IDENTIFIER = 'workspaceidentifier';
-	public static readonly NO_WORKSPACE_IDENTIFIER = '__$noWorkspace__';
+	static readonly COMMON_PREFIX = 'storage://';
+	static readonly GLOBAL_PREFIX = `${StorageService.COMMON_PREFIX}global/`;
+	static readonly WORKSPACE_PREFIX = `${StorageService.COMMON_PREFIX}workspace/`;
+	static readonly WORKSPACE_IDENTIFIER = 'workspaceidentifier';
+	static readonly NO_WORKSPACE_IDENTIFIER = '__$noWorkspace__';
 
 	private _workspaceStorage: IStorage;
 	private _globalStorage: IStorage;
@@ -47,11 +47,11 @@ export class StorageService implements IStorageService {
 		this.setWorkspaceId(workspaceId, legacyWorkspaceId);
 	}
 
-	public get workspaceId(): string {
+	get workspaceId(): string {
 		return this._workspaceId;
 	}
 
-	public setWorkspaceId(workspaceId: string, legacyWorkspaceId?: number): void {
+	setWorkspaceId(workspaceId: string, legacyWorkspaceId?: number): void {
 		this._workspaceId = workspaceId;
 
 		// Calculate workspace storage key
@@ -64,11 +64,11 @@ export class StorageService implements IStorageService {
 		}
 	}
 
-	public get globalStorage(): IStorage {
+	get globalStorage(): IStorage {
 		return this._globalStorage;
 	}
 
-	public get workspaceStorage(): IStorage {
+	get workspaceStorage(): IStorage {
 		return this._workspaceStorage;
 	}
 
@@ -124,7 +124,7 @@ export class StorageService implements IStorageService {
 		}
 	}
 
-	public store(key: string, value: any, scope = StorageScope.GLOBAL): void {
+	store(key: string, value: any, scope = StorageScope.GLOBAL): void {
 		const storage = (scope === StorageScope.GLOBAL) ? this._globalStorage : this._workspaceStorage;
 
 		if (types.isUndefinedOrNull(value)) {
@@ -142,7 +142,7 @@ export class StorageService implements IStorageService {
 		}
 	}
 
-	public get(key: string, scope = StorageScope.GLOBAL, defaultValue?: any): string {
+	get(key: string, scope = StorageScope.GLOBAL, defaultValue?: any): string {
 		const storage = (scope === StorageScope.GLOBAL) ? this._globalStorage : this._workspaceStorage;
 
 		const value = storage.getItem(this.toStorageKey(key, scope));
@@ -153,7 +153,7 @@ export class StorageService implements IStorageService {
 		return value;
 	}
 
-	public getInteger(key: string, scope = StorageScope.GLOBAL, defaultValue?: number): number {
+	getInteger(key: string, scope = StorageScope.GLOBAL, defaultValue?: number): number {
 		const value = this.get(key, scope, defaultValue);
 
 		if (types.isUndefinedOrNull(value)) {
@@ -163,7 +163,7 @@ export class StorageService implements IStorageService {
 		return parseInt(value, 10);
 	}
 
-	public getBoolean(key: string, scope = StorageScope.GLOBAL, defaultValue?: boolean): boolean {
+	getBoolean(key: string, scope = StorageScope.GLOBAL, defaultValue?: boolean): boolean {
 		const value = this.get(key, scope, defaultValue);
 
 		if (types.isUndefinedOrNull(value)) {
@@ -177,7 +177,7 @@ export class StorageService implements IStorageService {
 		return value ? true : false;
 	}
 
-	public remove(key: string, scope = StorageScope.GLOBAL): void {
+	remove(key: string, scope = StorageScope.GLOBAL): void {
 		const storage = (scope === StorageScope.GLOBAL) ? this._globalStorage : this._workspaceStorage;
 		const storageKey = this.toStorageKey(key, scope);
 
@@ -201,11 +201,11 @@ export class InMemoryLocalStorage implements IStorage {
 		this.store = {};
 	}
 
-	public get length() {
+	get length() {
 		return Object.keys(this.store).length;
 	}
 
-	public key(index: number): string {
+	key(index: number): string {
 		const keys = Object.keys(this.store);
 		if (keys.length > index) {
 			return keys[index];
@@ -214,11 +214,11 @@ export class InMemoryLocalStorage implements IStorage {
 		return null;
 	}
 
-	public setItem(key: string, value: any): void {
+	setItem(key: string, value: any): void {
 		this.store[key] = value.toString();
 	}
 
-	public getItem(key: string): string {
+	getItem(key: string): string {
 		const item = this.store[key];
 		if (!types.isUndefinedOrNull(item)) {
 			return item;
@@ -227,7 +227,7 @@ export class InMemoryLocalStorage implements IStorage {
 		return null;
 	}
 
-	public removeItem(key: string): void {
+	removeItem(key: string): void {
 		delete this.store[key];
 	}
 }
diff --git a/src/vs/platform/telemetry/common/experiments.ts b/src/vs/platform/telemetry/common/experiments.ts
deleted file mode 100644
index 861a0a14621..00000000000
--- a/src/vs/platform/telemetry/common/experiments.ts
+++ /dev/null
@@ -1,92 +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 { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { deepClone } from 'vs/base/common/objects';
-
-/* __GDPR__FRAGMENT__
-	"IExperiments" : {
-	}
-*/
-export interface IExperiments {
-}
-
-export const IExperimentService = createDecorator<IExperimentService>('experimentService');
-
-export interface IExperimentService {
-
-	_serviceBrand: any;
-
-	getExperiments(): IExperiments;
-}
-
-export class ExperimentService implements IExperimentService {
-
-	_serviceBrand: any;
-
-	private experiments: IExperiments = {}; // Shortcut while there are no experiments.
-
-	constructor(
-		@IStorageService private storageService: IStorageService,
-		@IConfigurationService private configurationService: IConfigurationService,
-	) { }
-
-	getExperiments() {
-		if (!this.experiments) {
-			this.experiments = loadExperiments(this.storageService, this.configurationService);
-		}
-		return this.experiments;
-	}
-}
-
-function loadExperiments(storageService: IStorageService, configurationService: IConfigurationService): IExperiments {
-	const experiments = splitExperimentsRandomness(storageService);
-	return applyOverrides(experiments, configurationService);
-}
-
-function applyOverrides(experiments: IExperiments, configurationService: IConfigurationService): IExperiments {
-	const experimentsConfig = getExperimentsOverrides(configurationService);
-	Object.keys(experiments).forEach(key => {
-		if (key in experimentsConfig) {
-			experiments[key] = experimentsConfig[key];
-		}
-	});
-	return experiments;
-}
-
-function splitExperimentsRandomness(storageService: IStorageService): IExperiments {
-	const random1 = getExperimentsRandomness(storageService);
-	const [/* random2 */, /* ripgrepQuickSearch */] = splitRandom(random1);
-	// const [/* random3 */, /* deployToAzureQuickLink */] = splitRandom(random2);
-	// const [random4, /* mergeQuickLinks */] = splitRandom(random3);
-	// const [random5, /* enableWelcomePage */] = splitRandom(random4);
-	return {
-		// ripgrepQuickSearch,
-	};
-}
-
-function getExperimentsRandomness(storageService: IStorageService) {
-	const key = 'experiments.randomness';
-	let valueString = storageService.get(key);
-	if (!valueString) {
-		valueString = Math.random().toString();
-		storageService.store(key, valueString);
-	}
-
-	return parseFloat(valueString);
-}
-
-function splitRandom(random: number): [number, boolean] {
-	const scaled = random * 2;
-	const i = Math.floor(scaled);
-	return [scaled - i, i === 1];
-}
-
-function getExperimentsOverrides(configurationService: IConfigurationService): IExperiments {
-	return deepClone(configurationService.getValue<any>('experiments')) || {};
-}
diff --git a/src/vs/platform/telemetry/common/telemetryIpc.ts b/src/vs/platform/telemetry/common/telemetryIpc.ts
index df3b884b3ed..f08e0c0969c 100644
--- a/src/vs/platform/telemetry/common/telemetryIpc.ts
+++ b/src/vs/platform/telemetry/common/telemetryIpc.ts
@@ -8,6 +8,7 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { ITelemetryAppender } from 'vs/platform/telemetry/common/telemetryUtils';
+import { Event } from 'vs/base/common/event';
 
 export interface ITelemetryLog {
 	eventName: string;
@@ -23,6 +24,10 @@ export class TelemetryAppenderChannel implements ITelemetryAppenderChannel {
 
 	constructor(private appender: ITelemetryAppender) { }
 
+	listen<T>(event: string, arg?: any): Event<T> {
+		throw new Error('No events');
+	}
+
 	call(command: string, { eventName, data }: ITelemetryLog): TPromise<any> {
 		this.appender.log(eventName, data);
 		return TPromise.as(null);
diff --git a/src/vs/platform/update/common/update.ts b/src/vs/platform/update/common/update.ts
index fbaebf81a99..8a1b2dbbf7c 100644
--- a/src/vs/platform/update/common/update.ts
+++ b/src/vs/platform/update/common/update.ts
@@ -89,4 +89,6 @@ export interface IUpdateService {
 	downloadUpdate(): TPromise<void>;
 	applyUpdate(): TPromise<void>;
 	quitAndInstall(): TPromise<void>;
-}
\ No newline at end of file
+
+	isLatestVersion(): TPromise<boolean | undefined>;
+}
diff --git a/src/vs/platform/update/common/updateIpc.ts b/src/vs/platform/update/common/updateIpc.ts
index 2e26e13ed3d..aa2e8fd304e 100644
--- a/src/vs/platform/update/common/updateIpc.ts
+++ b/src/vs/platform/update/common/updateIpc.ts
@@ -6,17 +6,21 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IChannel, eventToCall, eventFromCall } from 'vs/base/parts/ipc/common/ipc';
+import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { Event, Emitter } from 'vs/base/common/event';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { IUpdateService, State } from './update';
 
 export interface IUpdateChannel extends IChannel {
+	listen(event: 'onStateChange'): Event<State>;
+	listen<T>(command: string, arg?: any): Event<T>;
+
 	call(command: 'checkForUpdates', arg: any): TPromise<void>;
 	call(command: 'downloadUpdate'): TPromise<void>;
 	call(command: 'applyUpdate'): TPromise<void>;
 	call(command: 'quitAndInstall'): TPromise<void>;
 	call(command: '_getInitialState'): TPromise<State>;
+	call(command: 'isLatestVersion'): TPromise<boolean>;
 	call(command: string, arg?: any): TPromise<any>;
 }
 
@@ -24,14 +28,22 @@ export class UpdateChannel implements IUpdateChannel {
 
 	constructor(private service: IUpdateService) { }
 
+	listen<T>(event: string, arg?: any): Event<any> {
+		switch (event) {
+			case 'onStateChange': return this.service.onStateChange;
+		}
+
+		throw new Error('No event found');
+	}
+
 	call(command: string, arg?: any): TPromise<any> {
 		switch (command) {
-			case 'event:onStateChange': return eventToCall(this.service.onStateChange);
 			case 'checkForUpdates': return this.service.checkForUpdates(arg);
 			case 'downloadUpdate': return this.service.downloadUpdate();
 			case 'applyUpdate': return this.service.applyUpdate();
 			case 'quitAndInstall': return this.service.quitAndInstall();
 			case '_getInitialState': return TPromise.as(this.service.state);
+			case 'isLatestVersion': return this.service.isLatestVersion();
 		}
 		return undefined;
 	}
@@ -41,8 +53,6 @@ export class UpdateChannelClient implements IUpdateService {
 
 	_serviceBrand: any;
 
-	private _onRemoteStateChange = eventFromCall<State>(this.channel, 'event:onStateChange');
-
 	private _onStateChange = new Emitter<State>();
 	get onStateChange(): Event<State> { return this._onStateChange.event; }
 
@@ -58,7 +68,8 @@ export class UpdateChannelClient implements IUpdateService {
 			this._onStateChange.fire(state);
 
 			// fire subsequent states as they come in from remote
-			this._onRemoteStateChange(state => this._onStateChange.fire(state));
+
+			this.channel.listen('onStateChange')(state => this._onStateChange.fire(state));
 		}, onUnexpectedError);
 	}
 
@@ -77,4 +88,8 @@ export class UpdateChannelClient implements IUpdateService {
 	quitAndInstall(): TPromise<void> {
 		return this.channel.call('quitAndInstall');
 	}
-}
\ No newline at end of file
+
+	isLatestVersion(): TPromise<boolean> {
+		return this.channel.call('isLatestVersion');
+	}
+}
diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
index 6734f82fa36..245df1d3053 100644
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -14,6 +14,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { IUpdateService, State, StateType, AvailableForDownload } from 'vs/platform/update/common/update';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ILogService } from 'vs/platform/log/common/log';
+import { IRequestService } from 'vs/platform/request/node/request';
 
 export function createUpdateURL(platform: string, quality: string): string {
 	return `${product.updateUrl}/api/update/${platform}/${quality}/${product.commit}`;
@@ -23,6 +24,8 @@ export abstract class AbstractUpdateService implements IUpdateService {
 
 	_serviceBrand: any;
 
+	protected readonly url: string | undefined;
+
 	private _state: State = State.Uninitialized;
 	private throttler: Throttler = new Throttler();
 
@@ -43,7 +46,8 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		@ILifecycleService private lifecycleService: ILifecycleService,
 		@IConfigurationService protected configurationService: IConfigurationService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
-		@ILogService protected logService: ILogService
+		@IRequestService protected requestService: IRequestService,
+		@ILogService protected logService: ILogService,
 	) {
 		if (this.environmentService.disableUpdates) {
 			this.logService.info('update#ctor - updates are disabled');
@@ -62,7 +66,8 @@ export abstract class AbstractUpdateService implements IUpdateService {
 			return;
 		}
 
-		if (!this.setUpdateFeedUrl(quality)) {
+		this.url = this.buildUpdateFeedUrl(quality);
+		if (!this.url) {
 			this.logService.info('update#ctor - updates are disabled');
 			return;
 		}
@@ -153,10 +158,25 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		return TPromise.as(null);
 	}
 
+	isLatestVersion(): TPromise<boolean | undefined> {
+		if (!this.url) {
+			return TPromise.as(undefined);
+		}
+		return this.requestService.request({ url: this.url }).then(context => {
+			// The update server replies with 204 (No Content) when no
+			// update is available - that's all we want to know.
+			if (context.res.statusCode === 204) {
+				return true;
+			} else {
+				return false;
+			}
+		});
+	}
+
 	protected doQuitAndInstall(): void {
 		// noop
 	}
 
-	protected abstract setUpdateFeedUrl(quality: string): boolean;
+	protected abstract buildUpdateFeedUrl(quality: string): string | undefined;
 	protected abstract doCheckForUpdates(context: any): void;
 }
diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
index a75576d9195..81b935cf758 100644
--- a/src/vs/platform/update/electron-main/updateService.darwin.ts
+++ b/src/vs/platform/update/electron-main/updateService.darwin.ts
@@ -16,6 +16,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ILogService } from 'vs/platform/log/common/log';
 import { AbstractUpdateService, createUpdateURL } from 'vs/platform/update/electron-main/abstractUpdateService';
+import { IRequestService } from 'vs/platform/request/node/request';
 
 export class DarwinUpdateService extends AbstractUpdateService {
 
@@ -33,9 +34,10 @@ export class DarwinUpdateService extends AbstractUpdateService {
 		@IConfigurationService configurationService: IConfigurationService,
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IEnvironmentService environmentService: IEnvironmentService,
+		@IRequestService requestService: IRequestService,
 		@ILogService logService: ILogService
 	) {
-		super(lifecycleService, configurationService, environmentService, logService);
+		super(lifecycleService, configurationService, environmentService, requestService, logService);
 		this.onRawError(this.onError, this, this.disposables);
 		this.onRawUpdateAvailable(this.onUpdateAvailable, this, this.disposables);
 		this.onRawUpdateDownloaded(this.onUpdateDownloaded, this, this.disposables);
@@ -47,16 +49,16 @@ export class DarwinUpdateService extends AbstractUpdateService {
 		this.setState(State.Idle);
 	}
 
-	protected setUpdateFeedUrl(quality: string): boolean {
+	protected buildUpdateFeedUrl(quality: string): string | undefined {
+		const url = createUpdateURL('darwin', quality);
 		try {
-			electron.autoUpdater.setFeedURL(createUpdateURL('darwin', quality));
+			electron.autoUpdater.setFeedURL(url);
 		} catch (e) {
 			// application is very likely not signed
 			this.logService.error('Failed to set update feed URL', e);
-			return false;
+			return undefined;
 		}
-
-		return true;
+		return url;
 	}
 
 	protected doCheckForUpdates(context: any): void {
diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts
index 12d660bb203..126e7d8ade2 100644
--- a/src/vs/platform/update/electron-main/updateService.linux.ts
+++ b/src/vs/platform/update/electron-main/updateService.linux.ts
@@ -22,22 +22,19 @@ export class LinuxUpdateService extends AbstractUpdateService {
 
 	_serviceBrand: any;
 
-	private url: string | undefined;
-
 	constructor(
 		@ILifecycleService lifecycleService: ILifecycleService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IEnvironmentService environmentService: IEnvironmentService,
-		@IRequestService private requestService: IRequestService,
+		@IRequestService requestService: IRequestService,
 		@ILogService logService: ILogService
 	) {
-		super(lifecycleService, configurationService, environmentService, logService);
+		super(lifecycleService, configurationService, environmentService, requestService, logService);
 	}
 
-	protected setUpdateFeedUrl(quality: string): boolean {
-		this.url = createUpdateURL(`linux-${process.arch}`, quality);
-		return true;
+	protected buildUpdateFeedUrl(quality: string): string {
+		return createUpdateURL(`linux-${process.arch}`, quality);
 	}
 
 	protected doCheckForUpdates(context: any): void {
@@ -84,8 +81,8 @@ export class LinuxUpdateService extends AbstractUpdateService {
 		} else {
 			shell.openExternal(state.update.url);
 		}
-		this.setState(State.Idle);
 
+		this.setState(State.Idle);
 		return TPromise.as(null);
 	}
 }
diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
index 6ac195ed9de..baf3a154061 100644
--- a/src/vs/platform/update/electron-main/updateService.win32.ts
+++ b/src/vs/platform/update/electron-main/updateService.win32.ts
@@ -14,7 +14,7 @@ import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycle
 import { IRequestService } from 'vs/platform/request/node/request';
 import product from 'vs/platform/node/product';
 import { TPromise, Promise } from 'vs/base/common/winjs.base';
-import { State, IUpdate, StateType } from 'vs/platform/update/common/update';
+import { State, IUpdate, StateType, AvailableForDownload } from 'vs/platform/update/common/update';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ILogService } from 'vs/platform/log/common/log';
@@ -23,6 +23,7 @@ import { download, asJson } from 'vs/base/node/request';
 import { checksum } from 'vs/base/node/crypto';
 import { tmpdir } from 'os';
 import { spawn } from 'child_process';
+import { shell } from 'electron';
 
 function pollUntil(fn: () => boolean, timeout = 1000): TPromise<void> {
 	return new TPromise<void>(c => {
@@ -43,11 +44,26 @@ interface IAvailableUpdate {
 	updateFilePath?: string;
 }
 
+enum UpdateType {
+	Automatic,
+	Manual
+}
+
+let _updateType: UpdateType | undefined = undefined;
+function getUpdateType(): UpdateType {
+	if (typeof _updateType === 'undefined') {
+		_updateType = fs.existsSync(path.join(path.dirname(process.execPath), 'unins000.exe'))
+			? UpdateType.Automatic
+			: UpdateType.Manual;
+	}
+
+	return _updateType;
+}
+
 export class Win32UpdateService extends AbstractUpdateService {
 
 	_serviceBrand: any;
 
-	private url: string | undefined;
 	private availableUpdate: IAvailableUpdate | undefined;
 
 	@memoize
@@ -61,29 +77,26 @@ export class Win32UpdateService extends AbstractUpdateService {
 		@IConfigurationService configurationService: IConfigurationService,
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IEnvironmentService environmentService: IEnvironmentService,
-		@IRequestService private requestService: IRequestService,
+		@IRequestService requestService: IRequestService,
 		@ILogService logService: ILogService
 	) {
-		super(lifecycleService, configurationService, environmentService, logService);
+		super(lifecycleService, configurationService, environmentService, requestService, logService);
 	}
 
-	protected setUpdateFeedUrl(quality: string): boolean {
-		if (!fs.existsSync(path.join(path.dirname(process.execPath), 'unins000.exe'))) {
-			return false;
-		}
-
+	protected buildUpdateFeedUrl(quality: string): string | undefined {
 		let platform = 'win32';
 
 		if (process.arch === 'x64') {
 			platform += '-x64';
 		}
 
-		if (product.target === 'user') {
+		if (getUpdateType() === UpdateType.Manual) {
+			platform += '-archive';
+		} else if (product.target === 'user') {
 			platform += '-user';
 		}
 
-		this.url = createUpdateURL(platform, quality);
-		return true;
+		return createUpdateURL(platform, quality);
 	}
 
 	protected doCheckForUpdates(context: any): void {
@@ -96,7 +109,7 @@ export class Win32UpdateService extends AbstractUpdateService {
 		this.requestService.request({ url: this.url })
 			.then<IUpdate>(asJson)
 			.then(update => {
-				if (!update || !update.url || !update.version) {
+				if (!update || !update.url || !update.version || !update.productVersion) {
 					/* __GDPR__
 							"update:notAvailable" : {
 								"explicit" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
@@ -108,6 +121,11 @@ export class Win32UpdateService extends AbstractUpdateService {
 					return TPromise.as(null);
 				}
 
+				if (getUpdateType() === UpdateType.Manual) {
+					this.setState(State.AvailableForDownload(update));
+					return TPromise.as(null);
+				}
+
 				this.setState(State.Downloading(update));
 
 				return this.cleanup(update.version).then(() => {
@@ -156,6 +174,12 @@ export class Win32UpdateService extends AbstractUpdateService {
 			});
 	}
 
+	protected doDownloadUpdate(state: AvailableForDownload): TPromise<void> {
+		shell.openExternal(state.update.url);
+		this.setState(State.Idle);
+		return TPromise.as(null);
+	}
+
 	private getUpdatePackagePath(version: string): TPromise<string> {
 		return this.cachePath.then(cachePath => path.join(cachePath, `CodeSetup-${product.quality}-${version}.exe`));
 	}
diff --git a/src/vs/platform/url/common/urlIpc.ts b/src/vs/platform/url/common/urlIpc.ts
index 0cc9ec695ad..84fdc5c2e65 100644
--- a/src/vs/platform/url/common/urlIpc.ts
+++ b/src/vs/platform/url/common/urlIpc.ts
@@ -10,6 +10,7 @@ import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { IURLHandler, IURLService } from './url';
 import URI from 'vs/base/common/uri';
 import { IDisposable } from 'vs/base/common/lifecycle';
+import { Event } from 'vs/base/common/event';
 
 export interface IURLServiceChannel extends IChannel {
 	call(command: 'open', url: string): TPromise<boolean>;
@@ -20,6 +21,10 @@ export class URLServiceChannel implements IURLServiceChannel {
 
 	constructor(private service: IURLService) { }
 
+	listen<T>(event: string, arg?: any): Event<T> {
+		throw new Error('No events');
+	}
+
 	call(command: string, arg?: any): TPromise<any> {
 		switch (command) {
 			case 'open': return this.service.open(URI.revive(arg));
@@ -52,6 +57,10 @@ export class URLHandlerChannel implements IURLHandlerChannel {
 
 	constructor(private handler: IURLHandler) { }
 
+	listen<T>(event: string, arg?: any): Event<T> {
+		throw new Error('No events');
+	}
+
 	call(command: string, arg?: any): TPromise<any> {
 		switch (command) {
 			case 'handleURL': return this.handler.handleURL(URI.revive(arg));
diff --git a/src/vs/platform/url/common/urlService.ts b/src/vs/platform/url/common/urlService.ts
index f4fbab19d7d..2d7fda8b99f 100644
--- a/src/vs/platform/url/common/urlService.ts
+++ b/src/vs/platform/url/common/urlService.ts
@@ -9,6 +9,7 @@ import { IURLService, IURLHandler } from 'vs/platform/url/common/url';
 import URI from 'vs/base/common/uri';
 import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
+import { first } from 'vs/base/common/async';
 
 declare module Array {
 	function from<T>(set: Set<T>): T[];
@@ -20,16 +21,9 @@ export class URLService implements IURLService {
 
 	private handlers = new Set<IURLHandler>();
 
-	async open(uri: URI): TPromise<boolean> {
+	open(uri: URI): TPromise<boolean> {
 		const handlers = Array.from(this.handlers);
-
-		for (const handler of handlers) {
-			if (await handler.handleURL(uri)) {
-				return true;
-			}
-		}
-
-		return false;
+		return first(handlers.map(h => () => h.handleURL(uri)), undefined, false);
 	}
 
 	registerHandler(handler: IURLHandler): IDisposable {
@@ -44,7 +38,7 @@ export class RelayURLService extends URLService implements IURLHandler {
 		super();
 	}
 
-	async open(uri: URI): TPromise<boolean> {
+	open(uri: URI): TPromise<boolean> {
 		return this.urlService.open(uri);
 	}
 
diff --git a/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.ts b/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.ts
index f8c42720026..ffc232d2f09 100644
--- a/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.ts
+++ b/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.ts
@@ -57,56 +57,57 @@ export class ExtensionUrlHandler implements IExtensionUrlHandler, IURLHandler {
 		]);
 	}
 
-	async handleURL(uri: URI): TPromise<boolean> {
+	handleURL(uri: URI): TPromise<boolean> {
 		if (!isExtensionId(uri.authority)) {
-			return false;
+			return TPromise.as(false);
 		}
 
 		const extensionId = uri.authority;
 		const wasHandlerAvailable = this.extensionHandlers.has(extensionId);
 
-		const extensions = await this.extensionService.getExtensions();
-		const extension = extensions.filter(e => e.id === extensionId)[0];
+		return this.extensionService.getExtensions().then(extensions => {
+			const extension = extensions.filter(e => e.id === extensionId)[0];
 
-		if (!extension) {
-			return false;
-		}
-
-		const result = await this.dialogService.confirm({
-			message: localize('confirmUrl', "Allow an extension to open this URL?", extensionId),
-			detail: `${extension.displayName || extension.name} (${extensionId}) wants to open a URL:\n\n${uri.toString()}`
-		});
-
-		if (!result.confirmed) {
-			return true;
-		}
-
-		const handler = this.extensionHandlers.get(extensionId);
-		if (handler) {
-			if (!wasHandlerAvailable) {
-				// forward it directly
-				return handler.handleURL(uri);
+			if (!extension) {
+				return TPromise.as(false);
 			}
 
-			// let the ExtensionUrlHandler instance handle this
-			return TPromise.as(false);
-		}
+			return this.dialogService.confirm({
+				message: localize('confirmUrl', "Allow an extension to open this URL?", extensionId),
+				detail: `${extension.displayName || extension.name} (${extensionId}) wants to open a URL:\n\n${uri.toString()}`
+			}).then(result => {
 
-		// collect URI for eventual extension activation
-		const timestamp = new Date().getTime();
-		let uris = this.uriBuffer.get(extensionId);
+				if (!result.confirmed) {
+					return TPromise.as(true);
+				}
 
-		if (!uris) {
-			uris = [];
-			this.uriBuffer.set(extensionId, uris);
-		}
+				const handler = this.extensionHandlers.get(extensionId);
+				if (handler) {
+					if (!wasHandlerAvailable) {
+						// forward it directly
+						return handler.handleURL(uri);
+					}
 
-		uris.push({ timestamp, uri });
+					// let the ExtensionUrlHandler instance handle this
+					return TPromise.as(false);
+				}
 
-		// activate the extension
-		await this.extensionService.activateByEvent(`onUri:${extensionId}`);
+				// collect URI for eventual extension activation
+				const timestamp = new Date().getTime();
+				let uris = this.uriBuffer.get(extensionId);
 
-		return true;
+				if (!uris) {
+					uris = [];
+					this.uriBuffer.set(extensionId, uris);
+				}
+
+				uris.push({ timestamp, uri });
+
+				// activate the extension
+				return this.extensionService.activateByEvent(`onUri:${extensionId}`)
+					.then(() => true);
+			});
+		});
 	}
 
 	registerExtensionHandler(extensionId: string, handler: IURLHandler): void {
diff --git a/src/vs/platform/windows/common/windows.ts b/src/vs/platform/windows/common/windows.ts
index 08102ecfce2..9c94e242e06 100644
--- a/src/vs/platform/windows/common/windows.ts
+++ b/src/vs/platform/windows/common/windows.ts
@@ -105,6 +105,7 @@ export interface IWindowsService {
 	onWindowBlur: Event<number>;
 	onWindowMaximize: Event<number>;
 	onWindowUnmaximize: Event<number>;
+	onRecentlyOpenedChange: Event<void>;
 
 	// Dialogs
 	pickFileFolderAndOpen(options: INativeOpenDialogOptions): TPromise<void>;
@@ -169,6 +170,7 @@ export interface IWindowsService {
 	// TODO: this is a bit backwards
 	startCrashReporter(config: CrashReporterStartOptions): TPromise<void>;
 
+	openAccessibilityOptions(): TPromise<void>;
 	openAboutDialog(): TPromise<void>;
 }
 
diff --git a/src/vs/platform/windows/common/windowsIpc.ts b/src/vs/platform/windows/common/windowsIpc.ts
index 7fdd5c8bbd8..0adca2f73b4 100644
--- a/src/vs/platform/windows/common/windowsIpc.ts
+++ b/src/vs/platform/windows/common/windowsIpc.ts
@@ -7,7 +7,7 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Event, buffer } from 'vs/base/common/event';
-import { IChannel, eventToCall, eventFromCall } from 'vs/base/parts/ipc/common/ipc';
+import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { IWindowsService, INativeOpenDialogOptions, IEnterWorkspaceResult, CrashReporterStartOptions, IMessageBoxResult, MessageBoxOptions, SaveDialogOptions, OpenDialogOptions, IDevToolsOptions } from 'vs/platform/windows/common/windows';
 import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
 import { IRecentlyOpened } from 'vs/platform/history/common/history';
@@ -16,9 +16,14 @@ import URI from 'vs/base/common/uri';
 import { ParsedArgs } from 'vs/platform/environment/common/environment';
 
 export interface IWindowsChannel extends IChannel {
-	call(command: 'event:onWindowOpen'): TPromise<number>;
-	call(command: 'event:onWindowFocus'): TPromise<number>;
-	call(command: 'event:onWindowBlur'): TPromise<number>;
+	listen(event: 'onWindowOpen'): Event<number>;
+	listen(event: 'onWindowFocus'): Event<number>;
+	listen(event: 'onWindowBlur'): Event<number>;
+	listen(event: 'onWindowMaximize'): Event<number>;
+	listen(event: 'onWindowUnmaximize'): Event<number>;
+	listen(event: 'onRecentlyOpenedChange'): Event<void>;
+	listen<T>(event: string, arg?: any): Event<T>;
+
 	call(command: 'pickFileFolderAndOpen', arg: INativeOpenDialogOptions): TPromise<void>;
 	call(command: 'pickFileAndOpen', arg: INativeOpenDialogOptions): TPromise<void>;
 	call(command: 'pickFolderAndOpen', arg: INativeOpenDialogOptions): TPromise<void>;
@@ -65,6 +70,7 @@ export interface IWindowsChannel extends IChannel {
 	call(command: 'showItemInFolder', arg: string): TPromise<void>;
 	call(command: 'openExternal', arg: string): TPromise<boolean>;
 	call(command: 'startCrashReporter', arg: CrashReporterStartOptions): TPromise<void>;
+	call(command: 'openAccessibilityOptions'): TPromise<void>;
 	call(command: 'openAboutDialog'): TPromise<void>;
 	call(command: string, arg?: any): TPromise<any>;
 }
@@ -76,6 +82,7 @@ export class WindowsChannel implements IWindowsChannel {
 	private onWindowBlur: Event<number>;
 	private onWindowMaximize: Event<number>;
 	private onWindowUnmaximize: Event<number>;
+	private onRecentlyOpenedChange: Event<void>;
 
 	constructor(private service: IWindowsService) {
 		this.onWindowOpen = buffer(service.onWindowOpen, true);
@@ -83,15 +90,24 @@ export class WindowsChannel implements IWindowsChannel {
 		this.onWindowBlur = buffer(service.onWindowBlur, true);
 		this.onWindowMaximize = buffer(service.onWindowMaximize, true);
 		this.onWindowUnmaximize = buffer(service.onWindowUnmaximize, true);
+		this.onRecentlyOpenedChange = buffer(service.onRecentlyOpenedChange, true);
+	}
+
+	listen<T>(event: string, arg?: any): Event<any> {
+		switch (event) {
+			case 'onWindowOpen': return this.onWindowOpen;
+			case 'onWindowFocus': return this.onWindowFocus;
+			case 'onWindowBlur': return this.onWindowBlur;
+			case 'onWindowMaximize': return this.onWindowMaximize;
+			case 'onWindowUnmaximize': return this.onWindowUnmaximize;
+			case 'onRecentlyOpenedChange': return this.onRecentlyOpenedChange;
+		}
+
+		throw new Error('No event found');
 	}
 
 	call(command: string, arg?: any): TPromise<any> {
 		switch (command) {
-			case 'event:onWindowOpen': return eventToCall(this.onWindowOpen);
-			case 'event:onWindowFocus': return eventToCall(this.onWindowFocus);
-			case 'event:onWindowBlur': return eventToCall(this.onWindowBlur);
-			case 'event:onWindowMaximize': return eventToCall(this.onWindowMaximize);
-			case 'event:onWindowUnmaximize': return eventToCall(this.onWindowUnmaximize);
 			case 'pickFileFolderAndOpen': return this.service.pickFileFolderAndOpen(arg);
 			case 'pickFileAndOpen': return this.service.pickFileAndOpen(arg);
 			case 'pickFolderAndOpen': return this.service.pickFolderAndOpen(arg);
@@ -152,6 +168,7 @@ export class WindowsChannel implements IWindowsChannel {
 			case 'showItemInFolder': return this.service.showItemInFolder(arg);
 			case 'openExternal': return this.service.openExternal(arg);
 			case 'startCrashReporter': return this.service.startCrashReporter(arg);
+			case 'openAccessibilityOptions': return this.service.openAccessibilityOptions();
 			case 'openAboutDialog': return this.service.openAboutDialog();
 		}
 		return undefined;
@@ -164,20 +181,12 @@ export class WindowsChannelClient implements IWindowsService {
 
 	constructor(private channel: IWindowsChannel) { }
 
-	private _onWindowOpen: Event<number> = eventFromCall<number>(this.channel, 'event:onWindowOpen');
-	get onWindowOpen(): Event<number> { return this._onWindowOpen; }
-
-	private _onWindowFocus: Event<number> = eventFromCall<number>(this.channel, 'event:onWindowFocus');
-	get onWindowFocus(): Event<number> { return this._onWindowFocus; }
-
-	private _onWindowBlur: Event<number> = eventFromCall<number>(this.channel, 'event:onWindowBlur');
-	get onWindowBlur(): Event<number> { return this._onWindowBlur; }
-
-	private _onWindowMaximize: Event<number> = eventFromCall<number>(this.channel, 'event:onWindowMaximize');
-	get onWindowMaximize(): Event<number> { return this._onWindowMaximize; }
-
-	private _onWindowUnmaximize: Event<number> = eventFromCall<number>(this.channel, 'event:onWindowUnmaximize');
-	get onWindowUnmaximize(): Event<number> { return this._onWindowUnmaximize; }
+	get onWindowOpen(): Event<number> { return this.channel.listen('onWindowOpen'); }
+	get onWindowFocus(): Event<number> { return this.channel.listen('onWindowFocus'); }
+	get onWindowBlur(): Event<number> { return this.channel.listen('onWindowBlur'); }
+	get onWindowMaximize(): Event<number> { return this.channel.listen('onWindowMaximize'); }
+	get onWindowUnmaximize(): Event<number> { return this.channel.listen('onWindowUnmaximize'); }
+	get onRecentlyOpenedChange(): Event<void> { return this.channel.listen('onRecentlyOpenedChange'); }
 
 	pickFileFolderAndOpen(options: INativeOpenDialogOptions): TPromise<void> {
 		return this.channel.call('pickFileFolderAndOpen', options);
@@ -367,6 +376,10 @@ export class WindowsChannelClient implements IWindowsService {
 		return this.channel.call('updateTouchBar', [windowId, items]);
 	}
 
+	openAccessibilityOptions(): TPromise<void> {
+		return this.channel.call('openAccessibilityOptions');
+	}
+
 	openAboutDialog(): TPromise<void> {
 		return this.channel.call('openAboutDialog');
 	}
diff --git a/src/vs/platform/windows/electron-main/windowsService.ts b/src/vs/platform/windows/electron-main/windowsService.ts
index 12d8e421d78..2987443c204 100644
--- a/src/vs/platform/windows/electron-main/windowsService.ts
+++ b/src/vs/platform/windows/electron-main/windowsService.ts
@@ -13,7 +13,7 @@ import URI from 'vs/base/common/uri';
 import product from 'vs/platform/node/product';
 import { IWindowsService, OpenContext, INativeOpenDialogOptions, IEnterWorkspaceResult, IMessageBoxResult, IDevToolsOptions } from 'vs/platform/windows/common/windows';
 import { IEnvironmentService, ParsedArgs } from 'vs/platform/environment/common/environment';
-import { shell, crashReporter, app, Menu, clipboard } from 'electron';
+import { shell, crashReporter, app, Menu, clipboard, BrowserWindow } from 'electron';
 import { Event, fromNodeEventEmitter, mapEvent, filterEvent, anyEvent } from 'vs/base/common/event';
 import { IURLService, IURLHandler } from 'vs/platform/url/common/url';
 import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
@@ -23,7 +23,7 @@ import { IWorkspaceIdentifier, IWorkspaceFolderCreationData } from 'vs/platform/
 import { ISerializableCommandAction } 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 { isWindows, isMacintosh } from 'vs/base/common/platform';
 import { ILogService } from 'vs/platform/log/common/log';
 
 export class WindowsService implements IWindowsService, IURLHandler, IDisposable {
@@ -42,6 +42,8 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
 	readonly onWindowMaximize: Event<number> = filterEvent(fromNodeEventEmitter(app, 'browser-window-maximize', (_, w: Electron.BrowserWindow) => w.id), id => !!this.windowsMainService.getWindowById(id));
 	readonly onWindowUnmaximize: Event<number> = filterEvent(fromNodeEventEmitter(app, 'browser-window-unmaximize', (_, w: Electron.BrowserWindow) => w.id), id => !!this.windowsMainService.getWindowById(id));
 
+	readonly onRecentlyOpenedChange: Event<void> = this.historyService.onRecentlyOpenedChange;
+
 	constructor(
 		private sharedProcess: ISharedProcess,
 		@IWindowsMainService private windowsMainService: IWindowsMainService,
@@ -131,7 +133,7 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
 
 		if (codeWindow) {
 			const contents = codeWindow.win.webContents;
-			if (codeWindow.hasHiddenTitleBarStyle() && !codeWindow.win.isFullScreen() && !contents.isDevToolsOpened()) {
+			if (isMacintosh && codeWindow.hasHiddenTitleBarStyle() && !codeWindow.win.isFullScreen() && !contents.isDevToolsOpened()) {
 				contents.openDevTools({ mode: 'undocked' }); // due to https://github.com/electron/electron/issues/3647
 			} else {
 				contents.toggleDevTools();
@@ -468,6 +470,29 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
 		return TPromise.as(null);
 	}
 
+	openAccessibilityOptions(): TPromise<void> {
+		this.logService.trace('windowsService#openAccessibilityOptions');
+
+		const win = new BrowserWindow({
+			alwaysOnTop: true,
+			skipTaskbar: true,
+			resizable: false,
+			width: 450,
+			height: 300,
+			show: true,
+			title: nls.localize('accessibilityOptionsWindowTitle', "Accessibility Options"),
+			webPreferences: {
+				disableBlinkFeatures: 'Auxclick'
+			}
+		});
+
+		win.setMenuBarVisibility(false);
+
+		win.loadURL('chrome://accessibility');
+
+		return TPromise.as(null);
+	}
+
 	openAboutDialog(): TPromise<void> {
 		this.logService.trace('windowsService#openAboutDialog');
 		const lastActiveWindow = this.windowsMainService.getFocusedWindow() || this.windowsMainService.getLastActiveWindow();
@@ -505,21 +530,22 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
 		return TPromise.as(null);
 	}
 
-	async handleURL(uri: URI): TPromise<boolean> {
+	handleURL(uri: URI): TPromise<boolean> {
 		// Catch file URLs
 		if (uri.authority === Schemas.file && !!uri.path) {
-			return this.openFileForURI(URI.file(uri.fsPath));
+			this.openFileForURI(URI.file(uri.fsPath));
+			return TPromise.as(true);
 		}
 
-		return false;
+		return TPromise.wrap(false);
 	}
 
-	private async openFileForURI(uri: URI): TPromise<boolean> {
+	private openFileForURI(uri: URI): TPromise<boolean> {
 		const cli = assign(Object.create(null), this.environmentService.args, { goto: true });
 		const pathsToOpen = [uri.fsPath];
 
 		this.windowsMainService.open({ context: OpenContext.API, cli, pathsToOpen });
-		return true;
+		return TPromise.wrap(true);
 	}
 
 	dispose(): void {
diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts
index b9b31f4b2a0..2263c848f17 100644
--- a/src/vs/platform/workspace/common/workspace.ts
+++ b/src/vs/platform/workspace/common/workspace.ts
@@ -141,7 +141,7 @@ export class Workspace implements IWorkspace {
 		this.folders = folders;
 	}
 
-	public update(workspace: Workspace) {
+	update(workspace: Workspace) {
 		this._id = workspace.id;
 		this._name = workspace.name;
 		this._configuration = workspace.configuration;
@@ -149,40 +149,40 @@ export class Workspace implements IWorkspace {
 		this.folders = workspace.folders;
 	}
 
-	public get folders(): WorkspaceFolder[] {
+	get folders(): WorkspaceFolder[] {
 		return this._folders;
 	}
 
-	public set folders(folders: WorkspaceFolder[]) {
+	set folders(folders: WorkspaceFolder[]) {
 		this._folders = folders;
 		this.updateFoldersMap();
 	}
 
-	public get id(): string {
+	get id(): string {
 		return this._id;
 	}
 
-	public get ctime(): number {
+	get ctime(): number {
 		return this._ctime;
 	}
 
-	public get name(): string {
+	get name(): string {
 		return this._name;
 	}
 
-	public set name(name: string) {
+	set name(name: string) {
 		this._name = name;
 	}
 
-	public get configuration(): URI {
+	get configuration(): URI {
 		return this._configuration;
 	}
 
-	public set configuration(configuration: URI) {
+	set configuration(configuration: URI) {
 		this._configuration = configuration;
 	}
 
-	public getFolder(resource: URI): IWorkspaceFolder {
+	getFolder(resource: URI): IWorkspaceFolder {
 		if (!resource) {
 			return null;
 		}
@@ -197,7 +197,7 @@ export class Workspace implements IWorkspace {
 		}
 	}
 
-	public toJSON(): IWorkspace {
+	toJSON(): IWorkspace {
 		return { id: this.id, folders: this.folders, name: this.name, configuration: this.configuration };
 	}
 }
diff --git a/src/vs/platform/workspaces/common/workspacesIpc.ts b/src/vs/platform/workspaces/common/workspacesIpc.ts
index 91257d6d12e..e123da0b4c7 100644
--- a/src/vs/platform/workspaces/common/workspacesIpc.ts
+++ b/src/vs/platform/workspaces/common/workspacesIpc.ts
@@ -9,6 +9,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { IWorkspacesService, IWorkspaceIdentifier, IWorkspaceFolderCreationData, IWorkspacesMainService } from 'vs/platform/workspaces/common/workspaces';
 import URI from 'vs/base/common/uri';
+import { Event } from 'vs/base/common/event';
 
 export interface IWorkspacesChannel extends IChannel {
 	call(command: 'createWorkspace', arg: [IWorkspaceFolderCreationData[]]): TPromise<string>;
@@ -19,7 +20,11 @@ export class WorkspacesChannel implements IWorkspacesChannel {
 
 	constructor(private service: IWorkspacesMainService) { }
 
-	public call(command: string, arg?: any): TPromise<any> {
+	listen<T>(event: string, arg?: any): Event<T> {
+		throw new Error('No events');
+	}
+
+	call(command: string, arg?: any): TPromise<any> {
 		switch (command) {
 			case 'createWorkspace': {
 				const rawFolders: IWorkspaceFolderCreationData[] = arg;
@@ -47,7 +52,7 @@ export class WorkspacesChannelClient implements IWorkspacesService {
 
 	constructor(private channel: IWorkspacesChannel) { }
 
-	public createWorkspace(folders?: IWorkspaceFolderCreationData[]): TPromise<IWorkspaceIdentifier> {
+	createWorkspace(folders?: IWorkspaceFolderCreationData[]): TPromise<IWorkspaceIdentifier> {
 		return this.channel.call('createWorkspace', folders);
 	}
 }
\ No newline at end of file
diff --git a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
index a339d3efafb..45a50ab6543 100644
--- a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
+++ b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
@@ -33,7 +33,7 @@ export interface IStoredWorkspace {
 
 export class WorkspacesMainService implements IWorkspacesMainService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	protected workspacesHome: string;
 
@@ -50,15 +50,15 @@ export class WorkspacesMainService implements IWorkspacesMainService {
 		this._onUntitledWorkspaceDeleted = new Emitter<IWorkspaceIdentifier>();
 	}
 
-	public get onWorkspaceSaved(): Event<IWorkspaceSavedEvent> {
+	get onWorkspaceSaved(): Event<IWorkspaceSavedEvent> {
 		return this._onWorkspaceSaved.event;
 	}
 
-	public get onUntitledWorkspaceDeleted(): Event<IWorkspaceIdentifier> {
+	get onUntitledWorkspaceDeleted(): Event<IWorkspaceIdentifier> {
 		return this._onUntitledWorkspaceDeleted.event;
 	}
 
-	public resolveWorkspaceSync(path: string): IResolvedWorkspace {
+	resolveWorkspaceSync(path: string): IResolvedWorkspace {
 		if (!this.isWorkspacePath(path)) {
 			return null; // does not look like a valid workspace config file
 		}
@@ -96,12 +96,7 @@ export class WorkspacesMainService implements IWorkspacesMainService {
 	private doParseStoredWorkspace(path: string, contents: string): IStoredWorkspace {
 
 		// Parse workspace file
-		let storedWorkspace: IStoredWorkspace;
-		try {
-			storedWorkspace = json.parse(contents); // use fault tolerant parser
-		} catch (error) {
-			throw new Error(`${path} cannot be parsed as JSON file (${error}).`);
-		}
+		let storedWorkspace: IStoredWorkspace = json.parse(contents); // use fault tolerant parser
 
 		// Filter out folders which do not have a path or uri set
 		if (Array.isArray(storedWorkspace.folders)) {
@@ -120,7 +115,7 @@ export class WorkspacesMainService implements IWorkspacesMainService {
 		return isParent(path, this.environmentService.workspacesHome, !isLinux /* ignore case */);
 	}
 
-	public createWorkspace(folders?: IWorkspaceFolderCreationData[]): TPromise<IWorkspaceIdentifier> {
+	createWorkspace(folders?: IWorkspaceFolderCreationData[]): TPromise<IWorkspaceIdentifier> {
 		const { workspace, configParent, storedWorkspace } = this.createUntitledWorkspace(folders);
 
 		return mkdirp(configParent).then(() => {
@@ -128,7 +123,7 @@ export class WorkspacesMainService implements IWorkspacesMainService {
 		});
 	}
 
-	public createWorkspaceSync(folders?: IWorkspaceFolderCreationData[]): IWorkspaceIdentifier {
+	createWorkspaceSync(folders?: IWorkspaceFolderCreationData[]): IWorkspaceIdentifier {
 		const { workspace, configParent, storedWorkspace } = this.createUntitledWorkspace(folders);
 
 		if (!existsSync(this.workspacesHome)) {
@@ -180,7 +175,7 @@ export class WorkspacesMainService implements IWorkspacesMainService {
 		};
 	}
 
-	public getWorkspaceId(workspaceConfigPath: string): string {
+	getWorkspaceId(workspaceConfigPath: string): string {
 		if (!isLinux) {
 			workspaceConfigPath = workspaceConfigPath.toLowerCase(); // sanitize for platform file system
 		}
@@ -188,11 +183,11 @@ export class WorkspacesMainService implements IWorkspacesMainService {
 		return createHash('md5').update(workspaceConfigPath).digest('hex');
 	}
 
-	public isUntitledWorkspace(workspace: IWorkspaceIdentifier): boolean {
+	isUntitledWorkspace(workspace: IWorkspaceIdentifier): boolean {
 		return this.isInsideWorkspacesHome(workspace.configPath);
 	}
 
-	public saveWorkspace(workspace: IWorkspaceIdentifier, targetConfigPath: string): TPromise<IWorkspaceIdentifier> {
+	saveWorkspace(workspace: IWorkspaceIdentifier, targetConfigPath: string): TPromise<IWorkspaceIdentifier> {
 
 		// Return early if target is same as source
 		if (isEqual(workspace.configPath, targetConfigPath, !isLinux)) {
@@ -247,7 +242,7 @@ export class WorkspacesMainService implements IWorkspacesMainService {
 		});
 	}
 
-	public deleteUntitledWorkspaceSync(workspace: IWorkspaceIdentifier): void {
+	deleteUntitledWorkspaceSync(workspace: IWorkspaceIdentifier): void {
 		if (!this.isUntitledWorkspace(workspace)) {
 			return; // only supported for untitled workspaces
 		}
@@ -267,7 +262,7 @@ export class WorkspacesMainService implements IWorkspacesMainService {
 		}
 	}
 
-	public getUntitledWorkspacesSync(): IWorkspaceIdentifier[] {
+	getUntitledWorkspacesSync(): IWorkspaceIdentifier[] {
 		let untitledWorkspacePaths: string[] = [];
 		try {
 			untitledWorkspacePaths = readdirSync(this.workspacesHome).map(folder => join(this.workspacesHome, folder, UNTITLED_WORKSPACE_NAME));
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index dc0b0fbc616..a2b480f95c6 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -3948,9 +3948,9 @@ declare module 'vscode' {
 		 *
 		 * Diagnostics with this tag are rendered faded out. The amount of fading
 		 * is controlled by the `"editorUnnecessaryCode.opacity"` theme color. For
-		 * example, `"editorUnnecessaryCode.opacity": "#000000c0" will render the
+		 * example, `"editorUnnecessaryCode.opacity": "#000000c0"` will render the
 		 * code with 75% opacity. For high contrast themes, use the
-		 * `"editorUnnecessaryCode.border"` the color to underline unnecessary code
+		 * `"editorUnnecessaryCode.border"` theme color to underline unnecessary code
 		 * instead of fading it out.
 		 */
 		Unnecessary = 1,
@@ -5484,12 +5484,12 @@ declare module 'vscode' {
 		readonly viewColumn?: ViewColumn;
 
 		/**
-		 * Is the panel currently active?
+		 * Whether the panel is active (focused by the user).
 		 */
 		readonly active: boolean;
 
 		/**
-		 * Is the panel currently visible?
+		 * Whether the panel is visible.
 		 */
 		readonly visible: boolean;
 
@@ -5539,6 +5539,52 @@ declare module 'vscode' {
 		readonly webviewPanel: WebviewPanel;
 	}
 
+	/**
+	 * Restore webview panels that have been persisted when vscode shuts down.
+	 *
+	 * There are two types of webview persistence:
+	 *
+	 * - Persistence within a session.
+	 * - Persistence across sessions (across restarts of VS Code).
+	 *
+	 * A `WebviewPanelSerializer` is only required for the second case: persisting a webview across sessions.
+	 *
+	 * Persistence within a session allows a webview to save its state when it becomes hidden
+	 * and restore its content from this state when it becomes visible again. It is powered entirely
+	 * by the webview content itself. To save off a persisted state, call `acquireVsCodeApi().setState()` with
+	 * any json serializable object. To restore the state again, call `getState()`
+	 *
+	 * ```js
+	 * // Within the webview
+	 * const vscode = acquireVsCodeApi();
+	 *
+	 * // Get existing state
+	 * const oldState = vscode.getState() || { value: 0 };
+	 *
+	 * // Update state
+	 * setState({ value: oldState.value + 1 })
+	 * ```
+	 *
+	 * A `WebviewPanelSerializer` extends this persistence across restarts of VS Code. When the editor is shutdown,
+	 * VS Code will save off the state from `setState` of all webviews that have a serializer. When the
+	 * webview first becomes visible after the restart, this state is passed to `deserializeWebviewPanel`.
+	 * The extension can then restore the old `WebviewPanel` from this state.
+	 */
+	interface WebviewPanelSerializer {
+		/**
+		 * Restore a webview panel from its seriailzed `state`.
+		 *
+		 * Called when a serialized webview first becomes visible.
+		 *
+		 * @param webviewPanel Webview panel to restore. The serializer should take ownership of this panel. The
+		 * serializer must restore the webview's `.html` and hook up all webview events.
+		 * @param state Persisted state from the webview content.
+		 *
+		 * @return Thanble indicating that the webview has been fully restored.
+		 */
+		deserializeWebviewPanel(webviewPanel: WebviewPanel, state: any): Thenable<void>;
+	}
+
 	/**
 	 * Namespace describing the environment the editor runs in.
 	 */
@@ -5753,6 +5799,17 @@ declare module 'vscode' {
 		 */
 		export const onDidChangeTextEditorViewColumn: Event<TextEditorViewColumnChangeEvent>;
 
+		/**
+		 * The currently opened terminals or an empty array.
+		 */
+		export const terminals: ReadonlyArray<Terminal>;
+
+		/**
+		 * An [event](#Event) which fires when a terminal has been created, either through the
+		 * [createTerminal](#window.createTerminal) API or commands.
+		 */
+		export const onDidOpenTerminal: Event<Terminal>;
+
 		/**
 		 * An [event](#Event) which fires when a terminal is disposed.
 		 */
@@ -6183,6 +6240,19 @@ declare module 'vscode' {
 		 * @param handler The uri handler to register for this extension.
 		 */
 		export function registerUriHandler(handler: UriHandler): Disposable;
+
+		/**
+		 * Registers a webview panel serializer.
+		 *
+		 * Extensions that support reviving should have an`"onWebviewPanel:viewType"` activation event and
+		 * make sure that[registerWebviewPanelSerializer](#registerWebviewPanelSerializer) is called during activation.
+		 *
+		 * Only a single serializer may be registered at a time for a given`viewType`.
+		 *
+		 * @param viewType Type of the webview panel that can be serialized.
+		 * @param serializer Webview serializer.
+		 */
+		export function registerWebviewPanelSerializer(viewType: string, serializer: WebviewPanelSerializer): Disposable;
 	}
 
 	/**
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
index 10dea16487e..819ddb33c41 100644
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -13,46 +13,204 @@ declare module 'vscode' {
 		export function sampleFunction(): Thenable<any>;
 	}
 
-	//#region Joh: remote, search provider
+	//#region Rob: search provider
 
+	/**
+	 * The parameters of a query for text search.
+	 */
 	export interface TextSearchQuery {
+		/**
+		 * The text pattern to search for.
+		 */
 		pattern: string;
-		isRegExp: boolean;
-		isCaseSensitive: boolean;
-		isWordMatch: boolean;
+
+		/**
+		 * Whether or not `pattern` should be interpreted as a regular expression.
+		 */
+		isRegExp?: boolean;
+
+		/**
+		 * Whether or not the search should be case-sensitive.
+		 */
+		isCaseSensitive?: boolean;
+
+		/**
+		 * Whether or not to search for whole word matches only.
+		 */
+		isWordMatch?: boolean;
 	}
 
+	/**
+	 * A file glob pattern to match file paths against.
+	 * TODO@roblou - merge this with the GlobPattern docs/definition in vscode.d.ts.
+	 * @see [GlobPattern](#GlobPattern)
+	 */
+	export type GlobString = string;
+
+	/**
+	 * Options common to file and text search
+	 */
 	export interface SearchOptions {
+		/**
+		 * The root folder to search within.
+		 */
 		folder: Uri;
-		includes: string[]; // paths relative to folder
-		excludes: string[];
+
+		/**
+		 * Files that match an `includes` glob pattern should be included in the search.
+		 */
+		includes: GlobString[];
+
+		/**
+		 * Files that match an `excludes` glob pattern should be excluded from the search.
+		 */
+		excludes: GlobString[];
+
+		/**
+		 * Whether external files that exclude files, like .gitignore, should be respected.
+		 * See the vscode setting `"search.useIgnoreFiles"`.
+		 */
 		useIgnoreFiles?: boolean;
+
+		/**
+		 * Whether symlinks should be followed while searching.
+		 * See the vscode setting `"search.followSymlinks"`.
+		 */
 		followSymlinks?: boolean;
+
+		/**
+		 * The maximum number of results to be returned.
+		 */
+		maxResults?: number;
 	}
 
+	/**
+	 * Options that apply to text search.
+	 */
 	export interface TextSearchOptions extends SearchOptions {
-		previewOptions?: any; // total length? # of context lines? leading and trailing # of chars?
+		/**
+		 *  TODO@roblou - total length? # of context lines? leading and trailing # of chars?
+		 */
+		previewOptions?: any;
+
+		/**
+		 * Exclude files larger than `maxFileSize` in bytes.
+		 */
 		maxFileSize?: number;
+
+		/**
+		 * Interpret files using this encoding.
+		 * See the vscode setting `"files.encoding"`
+		 */
 		encoding?: string;
 	}
 
-	export interface FileSearchOptions extends SearchOptions { }
+	/**
+	 * The parameters of a query for file search.
+	 */
+	export interface FileSearchQuery {
+		/**
+		 * The search pattern to match against file paths.
+		 */
+		pattern: string;
 
-	export interface TextSearchResult {
-		path: string;
-		range: Range;
-
-		// For now, preview must be a single line of text
-		preview: { text: string, match: Range };
+		/**
+		 * `cacheKey` has the same value when `provideFileSearchResults` is invoked multiple times during a single quickopen session.
+		 * Providers can optionally use this to cache results at the beginning of a quickopen session and filter results as the user types.
+		 * It will have a different value for each folder searched.
+		 */
+		cacheKey?: string;
 	}
 
+	/**
+	 * Options that apply to file search.
+	 */
+	export interface FileSearchOptions extends SearchOptions { }
+
+	export interface TextSearchResultPreview {
+		/**
+		 * The matching line of text, or a portion of the matching line that contains the match.
+		 * For now, this can only be a single line.
+		 */
+		text: string;
+
+		/**
+		 * The Range within `text` corresponding to the text of the match.
+		 */
+		match: Range;
+	}
+
+	/**
+	 * A match from a text search
+	 */
+	export interface TextSearchResult {
+		/**
+		 * The uri for the matching document.
+		 */
+		uri: Uri;
+
+		/**
+		 * The range of the match within the document.
+		 */
+		range: Range;
+
+		/**
+		 * A preview of the matching line
+		 */
+		preview: TextSearchResultPreview;
+	}
+
+	/**
+	 * A SearchProvider provides search results for files or text in files. It can be invoked by quickopen, the search viewlet, and other extensions.
+	 */
 	export interface SearchProvider {
-		provideFileSearchResults?(options: FileSearchOptions, progress: Progress<string>, token: CancellationToken): Thenable<void>;
+		/**
+		 * Provide the set of files that match a certain file path pattern.
+		 * @param query The parameters for this query.
+		 * @param options A set of options to consider while searching files.
+		 * @param progress A progress callback that must be invoked for all results.
+		 * @param token A cancellation token.
+		 */
+		provideFileSearchResults?(query: FileSearchQuery, options: FileSearchOptions, progress: Progress<Uri>, token: CancellationToken): Thenable<void>;
+
+		/**
+		 * Optional - if the provider makes use of `query.cacheKey`, it can implement this method which is invoked when the cache can be cleared.
+		 * @param cacheKey The same key that was passed as `query.cacheKey`.
+		 */
+		clearCache?(cacheKey: string): void;
+
+		/**
+		 * Provide results that match the given text pattern.
+		 * @param query The parameters for this query.
+		 * @param options A set of options to consider while searching.
+		 * @param progress A progress callback that must be invoked for all results.
+		 * @param token A cancellation token.
+		 */
 		provideTextSearchResults?(query: TextSearchQuery, options: TextSearchOptions, progress: Progress<TextSearchResult>, token: CancellationToken): Thenable<void>;
 	}
 
+	export interface FindTextInFilesOptions {
+		include?: GlobPattern;
+		exclude?: GlobPattern;
+		maxResults?: number;
+		useIgnoreFiles?: boolean;
+		followSymlinks?: boolean;
+		encoding?: string;
+	}
+
 	export namespace workspace {
+		/**
+		 * Register a search provider.
+		 *
+		 * Only one provider can be registered per scheme.
+		 *
+		 * @param scheme The provider will be invoked for workspace folders that have this file scheme.
+		 * @param provider The provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
 		export function registerSearchProvider(scheme: string, provider: SearchProvider): Disposable;
+
+		export function findTextInFiles(query: TextSearchQuery, options: FindTextInFilesOptions, callback: (result: TextSearchResult) => void, token?: CancellationToken): Thenable<void>;
 	}
 
 	//#endregion
@@ -341,7 +499,7 @@ declare module 'vscode' {
 		 * provides access to the raw data stream from the process running within the terminal,
 		 * including VT sequences.
 		 */
-		onData: Event<string>;
+		onDidWriteData: Event<string>;
 	}
 
 	/**
@@ -351,12 +509,12 @@ declare module 'vscode' {
 		/**
 		 * The number of columns in the terminal.
 		 */
-		cols: number;
+		readonly columns: number;
 
 		/**
 		 * The number of rows in the terminal.
 		 */
-		rows: number;
+		readonly rows: number;
 	}
 
 	/**
@@ -368,10 +526,10 @@ declare module 'vscode' {
 	 * created with all its APIs available for use by extensions. When using the Terminal object
 	 * of a TerminalRenderer it acts just like normal only the extension that created the
 	 * TerminalRenderer essentially acts as a process. For example when an
-	 * [Terminal.onData](#Terminal.onData) listener is registered, that will fire when
-	 * [TerminalRenderer.write](#TerminalRenderer.write) is called. Similarly when
+	 * [Terminal.onDidWriteData](#Terminal.onDidWriteData) listener is registered, that will fire
+	 * when [TerminalRenderer.write](#TerminalRenderer.write) is called. Similarly when
 	 * [Terminal.sendText](#Terminal.sendText) is triggered that will fire the
-	 * [TerminalRenderer.onInput](#TerminalRenderer.onInput) event.
+	 * [TerminalRenderer.onDidAcceptInput](#TerminalRenderer.onDidAcceptInput) event.
 	 *
 	 * **Example:** Create a terminal renderer, show it and write hello world in red
 	 * ```typescript
@@ -399,7 +557,7 @@ declare module 'vscode' {
 		 * };
 		 * ```
 		 */
-		dimensions: TerminalDimensions;
+		dimensions: TerminalDimensions | undefined;
 
 		/**
 		 * The maximum dimensions of the terminal, this will be undefined immediately after a
@@ -407,12 +565,12 @@ declare module 'vscode' {
 		 * Listen to [onDidChangeMaximumDimensions](TerminalRenderer.onDidChangeMaximumDimensions)
 		 * to get notified when this value changes.
 		 */
-		readonly maximumDimensions: TerminalDimensions;
+		readonly maximumDimensions: TerminalDimensions | undefined;
 
 		/**
 		 * The corressponding [Terminal](#Terminal) for this TerminalRenderer.
 		 */
-		readonly terminal: Thenable<Terminal>;
+		readonly terminal: Terminal;
 
 		/**
 		 * Write text to the terminal. Unlike [Terminal.sendText](#Terminal.sendText) which sends
@@ -441,50 +599,35 @@ declare module 'vscode' {
 		 * workbench command such as `workbench.action.terminal.runSelectedText`
 		 * ```typescript
 		 * const terminalRenderer = window.createTerminalRenderer('test');
-		 * terminalRenderer.onInput(data => {
+		 * terminalRenderer.onDidAcceptInput(data => {
 		 *   cosole.log(data); // 'Hello world'
 		 * });
 		 * terminalRenderer.terminal.then(t => t.sendText('Hello world'));
 		 * ```
 		 */
-		onInput: Event<string>;
+		readonly onDidAcceptInput: Event<string>;
 
 		/**
 		 * An event which fires when the [maximum dimensions](#TerminalRenderer.maimumDimensions) of
 		 * the terminal renderer change.
 		 */
-		onDidChangeMaximumDimensions: Event<TerminalDimensions>;
+		readonly onDidChangeMaximumDimensions: Event<TerminalDimensions>;
 	}
 
 	export namespace window {
-		/**
-		 * The currently opened terminals or an empty array.
-		 *
-		 * @readonly
-		 */
-		export let terminals: Terminal[];
-
 		/**
 		 * The currently active terminal or `undefined`. The active terminal is the one that
 		 * currently has focus or most recently had focus.
-		 *
-		 * @readonly
 		 */
-		export let activeTerminal: Terminal | undefined;
+		export const activeTerminal: Terminal | undefined;
 
 		/**
 		 * An [event](#Event) which fires when the [active terminal](#window.activeTerminal)
-		 * has changed. *Note* that the event also fires when the active editor changes
+		 * has changed. *Note* that the event also fires when the active terminal changes
 		 * to `undefined`.
 		 */
 		export const onDidChangeActiveTerminal: Event<Terminal | undefined>;
 
-		/**
-		 * An [event](#Event) which fires when a terminal has been created, either through the
-		 * [createTerminal](#window.createTerminal) API or commands.
-		 */
-		export const onDidOpenTerminal: Event<Terminal>;
-
 		/**
 		 * Create a [TerminalRenderer](#TerminalRenderer).
 		 *
@@ -507,90 +650,279 @@ declare module 'vscode' {
 
 	export namespace window {
 
+		/**
+		 * A back button for [QuickPick](#QuickPick) and [InputBox](#InputBox).
+		 *
+		 * When a navigation 'back' button is needed this one should be used for consistency.
+		 * It comes with a predefined icon, tooltip and location.
+		 */
 		export const quickInputBackButton: QuickInputButton;
 
+		/**
+		 * Creates a [QuickPick](#QuickPick) to let the user pick an item from a list
+		 * of items of type T.
+		 *
+		 * Note that in many cases the more convenient [window.showQuickPick](#window.showQuickPick)
+		 * is easier to use. [window.createQuickPick](#window.createQuickPick) should be used,
+		 * when [window.showQuickPick](#window.showQuickPick) does not offer the required flexibility.
+		 *
+		 * @return A new [QuickPick](#QuickPick).
+		 */
 		export function createQuickPick<T extends QuickPickItem>(): QuickPick<T>;
 
+		/**
+		 * Creates a [InputBox](#InputBox) to let the user enter some text input.
+		 *
+		 * Note that in many cases the more convenient [window.showInputBox](#window.showInputBox)
+		 * is easier to use. [window.createInputBox](#window.createInputBox) should be used,
+		 * when [window.showInputBox](#window.showInputBox) does not offer the required flexibility.
+		 *
+		 * @return A new [InputBox](#InputBox).
+		 */
 		export function createInputBox(): InputBox;
 	}
 
+	/**
+	 * A light-weight user input UI that is intially not visible. After
+	 * configuring it through its properties the extension can make it
+	 * visible by calling [QuickInput.show](#QuickInput.show).
+	 *
+	 * There are several reasons why this UI might have to be hidden and
+	 * the extension will be notified through [QuickInput.onDidHide](#QuickInput.onDidHide).
+	 * (Examples include: an explict call to [QuickInput.hide](#QuickInput.hide),
+	 * the user pressing Esc, some other input UI opening, etc.)
+	 *
+	 * A user pressing Enter or some other gesture implying acceptance
+	 * of the current state does not automatically hide this UI component.
+	 * It is up to the extension to decide whether to accept the user's input
+	 * and if the UI should indeed be hidden through a call to [QuickInput.hide](#QuickInput.hide).
+	 *
+	 * When the extension no longer needs this input UI, it should
+	 * [QuickInput.dispose](#QuickInput.dispose) it to allow for freeing up
+	 * any resources associated with it.
+	 *
+	 * See [QuickPick](#QuickPick) and [InputBox](#InputBox) for concrete UIs.
+	 */
 	export interface QuickInput {
 
+		/**
+		 * An optional title.
+		 */
 		title: string | undefined;
 
+		/**
+		 * An optional current step count.
+		 */
 		step: number | undefined;
 
+		/**
+		 * An optional total step count.
+		 */
 		totalSteps: number | undefined;
 
+		/**
+		 * If the UI should allow for user input. Defaults to true.
+		 *
+		 * Change this to false, e.g., while validating user input or
+		 * loading data for the next step in user input.
+		 */
 		enabled: boolean;
 
+		/**
+		 * If the UI should show a progress indicator. Defaults to false.
+		 *
+		 * Change this to true, e.g., while loading more data or validating
+		 * user input.
+		 */
 		busy: boolean;
 
+		/**
+		 * If the UI should stay open even when loosing UI focus. Defaults to false.
+		 */
 		ignoreFocusOut: boolean;
 
+		/**
+		 * Makes the input UI visible in its current configuration. Any other input
+		 * UI will first fire an [QuickInput.onDidHide](#QuickInput.onDidHide) event.
+		 */
 		show(): void;
 
+		/**
+		 * Hides this input UI. This will also fire an [QuickInput.onDidHide](#QuickInput.onDidHide)
+		 * event.
+		 */
 		hide(): void;
 
+		/**
+		 * An event signaling when this input UI is hidden.
+		 *
+		 * There are several reasons why this UI might have to be hidden and
+		 * the extension will be notified through [QuickInput.onDidHide](#QuickInput.onDidHide).
+		 * (Examples include: an explict call to [QuickInput.hide](#QuickInput.hide),
+		 * the user pressing Esc, some other input UI opening, etc.)
+		 */
 		onDidHide: Event<void>;
 
+		/**
+		 * Dispose of this input UI and any associated resources. If it is still
+		 * visible, it is first hidden. After this call the input UI is no longer
+		 * functional and no additional methods or properties on it should be
+		 * accessed. Instead a new input UI should be created.
+		 */
 		dispose(): void;
 	}
 
+	/**
+	 * A concrete [QuickInput](#QuickInput) to let the user pick an item from a
+	 * list of items of type T. The items can be filtered through a filter text field and
+	 * there is an option [canSelectMany](#QuickPick.canSelectMany) to allow for
+	 * selecting multiple items.
+	 *
+	 * Note that in many cases the more convenient [window.showQuickPick](#window.showQuickPick)
+	 * is easier to use. [window.createQuickPick](#window.createQuickPick) should be used,
+	 * when [window.showQuickPick](#window.showQuickPick) does not offer the required flexibility.
+	 */
 	export interface QuickPick<T extends QuickPickItem> extends QuickInput {
 
+		/**
+		 * Current value of the filter text.
+		 */
 		value: string;
 
+		/**
+		 * Optional placeholder in the filter text.
+		 */
 		placeholder: string | undefined;
 
+		/**
+		 * An event signaling when the value of the filter text has changed.
+		 */
 		readonly onDidChangeValue: Event<string>;
 
+		/**
+		 * An event signaling when the user indicated acceptance of the selected item(s).
+		 */
 		readonly onDidAccept: Event<void>;
 
+		/**
+		 * Buttons for actions in the UI.
+		 */
 		buttons: ReadonlyArray<QuickInputButton>;
 
+		/**
+		 * An event signaling when a button was triggered.
+		 */
 		readonly onDidTriggerButton: Event<QuickInputButton>;
 
+		/**
+		 * Items to pick from.
+		 */
 		items: ReadonlyArray<T>;
 
+		/**
+		 * If multiple items can be selected at the same time. Defaults to false.
+		 */
 		canSelectMany: boolean;
 
+		/**
+		 * If the filter text should also be matched against the description of the items. Defaults to false.
+		 */
 		matchOnDescription: boolean;
 
+		/**
+		 * If the filter text should also be matched against the detail of the items. Defaults to false.
+		 */
 		matchOnDetail: boolean;
 
+		/**
+		 * Active items. This can be read and updated by the extension.
+		 */
 		activeItems: ReadonlyArray<T>;
 
+		/**
+		 * An event signaling when the active items have changed.
+		 */
 		readonly onDidChangeActive: Event<T[]>;
 
+		/**
+		 * Selected items. This can be read and updated by the extension.
+		 */
 		selectedItems: ReadonlyArray<T>;
 
+		/**
+		 * An event signaling when the selected items have changed.
+		 */
 		readonly onDidChangeSelection: Event<T[]>;
 	}
 
+	/**
+	 * A concrete [QuickInput](#QuickInput) to let the user input a text value.
+	 *
+	 * Note that in many cases the more convenient [window.showInputBox](#window.showInputBox)
+	 * is easier to use. [window.createInputBox](#window.createInputBox) should be used,
+	 * when [window.showInputBox](#window.showInputBox) does not offer the required flexibility.
+	 */
 	export interface InputBox extends QuickInput {
 
+		/**
+		 * Current input value.
+		 */
 		value: string;
 
+		/**
+		 * Optional placeholder in the filter text.
+		 */
 		placeholder: string | undefined;
 
+		/**
+		 * If the input value should be hidden. Defaults to false.
+		 */
 		password: boolean;
 
+		/**
+		 * An event signaling when the value has changed.
+		 */
 		readonly onDidChangeValue: Event<string>;
 
+		/**
+		 * An event signaling when the user indicated acceptance of the input value.
+		 */
 		readonly onDidAccept: Event<void>;
 
+		/**
+		 * Buttons for actions in the UI.
+		 */
 		buttons: ReadonlyArray<QuickInputButton>;
 
+		/**
+		 * An event signaling when a button was triggered.
+		 */
 		readonly onDidTriggerButton: Event<QuickInputButton>;
 
+		/**
+		 * An optional prompt text providing some ask or explanation to the user.
+		 */
 		prompt: string | undefined;
 
+		/**
+		 * An optional validation message indicating a problem with the current input value.
+		 */
 		validationMessage: string | undefined;
 	}
 
+	/**
+	 * Button for an action in a [QuickPick](#QuickPick) or [InputBox](#InputBox).
+	 */
 	export interface QuickInputButton {
+
+		/**
+		 * Icon for the button.
+		 */
 		readonly iconPath: string | Uri | { light: string | Uri; dark: string | Uri } | ThemeIcon;
+
+		/**
+		 * An optional tooltip.
+		 */
 		readonly tooltip?: string | undefined;
 	}
 
@@ -620,7 +952,7 @@ declare module 'vscode' {
 		 *
 		 * @param uri The uri of the file that is to be deleted.
 		 */
-		deleteFile(uri: Uri): void;
+		deleteFile(uri: Uri, options?: { recursive?: boolean }): void;
 
 		/**
 		 * Rename a file or folder.
@@ -636,6 +968,21 @@ declare module 'vscode' {
 		// deleteText(uri: Uri, range: Range): void;
 	}
 
+	export namespace workspace {
+		/**
+		 * Make changes to one or many resources as defined by the given
+		 * [workspace edit](#WorkspaceEdit).
+		 *
+		 * The editor implements an 'all-or-nothing'-strategy and that means failure to modify,
+		 * delete, rename, or create one file will abort the operation. In that case, the thenable returned
+		 * by this function resolves to `false`.
+		 *
+		 * @param edit A workspace edit.
+		 * @return A thenable that resolves when the edit could be applied.
+		 */
+		export function applyEdit(edit: WorkspaceEdit): Thenable<boolean>;
+	}
+
 	//#endregion
 
 	//#region mjbvz,joh: https://github.com/Microsoft/vscode/issues/43768
@@ -656,69 +1003,6 @@ declare module 'vscode' {
 	}
 	//#endregion
 
-	//#region Matt: WebView Serializer
-
-	/**
-	 * Restore webview panels that have been persisted when vscode shuts down.
-	 *
-	 * There are two types of webview persistence:
-	 *
-	 * - Persistence within a session.
-	 * - Persistence across sessions (across restarts of VS Code).
-	 *
-	 * A `WebviewPanelSerializer` is only required for the second case: persisting a webview across sessions.
-	 *
-	 * Persistence within a session allows a webview to save its state when it becomes hidden
-	 * and restore its content from this state when it becomes visible again. It is powered entirely
-	 * by the webview content itself. To save off a persisted state, call `acquireVsCodeApi().setState()` with
-	 * any json serializable object. To restore the state again, call `getState()`
-	 *
-	 * ```js
-	 * // Within the webview
-	 * const vscode = acquireVsCodeApi();
-	 *
-	 * // Get existing state
-	 * const oldState = vscode.getState() || { value: 0 };
-	 *
-	 * // Update state
-	 * setState({ value: oldState.value + 1 })
-	 * ```
-	 *
-	 * A `WebviewPanelSerializer` extends this persistence across restarts of VS Code. When the editor is shutdown, VS Code will save off the state from `setState` of all webviews that have a serializer. When the
-	 * webview first becomes visible after the restart, this state is passed to `deserializeWebviewPanel`.
-	 * The extension can then restore the old `WebviewPanel` from this state.
-	 */
-	interface WebviewPanelSerializer {
-		/**
-		 * Restore a webview panel from its seriailzed `state`.
-		 *
-		 * Called when a serialized webview first becomes visible.
-		 *
-		 * @param webviewPanel Webview panel to restore. The serializer should take ownership of this panel.
-		 * @param state Persisted state.
-		 *
-		 * @return Thanble indicating that the webview has been fully restored.
-		 */
-		deserializeWebviewPanel(webviewPanel: WebviewPanel, state: any): Thenable<void>;
-	}
-
-	namespace window {
-		/**
-		 * Registers a webview panel serializer.
-		 *
-		 * Extensions that support reviving should have an `"onWebviewPanel:viewType"` activation method and
-		 * make sure that [registerWebviewPanelSerializer](#registerWebviewPanelSerializer) is called during activation.
-		 *
-		 * Only a single serializer may be registered at a time for a given `viewType`.
-		 *
-		 * @param viewType Type of the webview panel that can be serialized.
-		 * @param serializer Webview serializer.
-		 */
-		export function registerWebviewPanelSerializer(viewType: string, serializer: WebviewPanelSerializer): Disposable;
-	}
-
-	//#endregion
-
 	//#region Matt: Deinition range
 
 	/**
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts b/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
index f2159515af5..b98563c70b1 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
@@ -69,7 +69,7 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 	}
 
 	substituteVariables(folder: IWorkspaceFolder, config: IConfig): TPromise<IConfig> {
-		return this._proxy.$substituteVariables(folder.uri, config);
+		return this._proxy.$substituteVariables(folder ? folder.uri : undefined, config);
 	}
 
 	runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDecorations.ts b/src/vs/workbench/api/electron-browser/mainThreadDecorations.ts
index 1f8d8af2c36..4cef3fd8b1b 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadDecorations.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadDecorations.ts
@@ -10,14 +10,14 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { ExtHostContext, MainContext, IExtHostContext, MainThreadDecorationsShape, ExtHostDecorationsShape, DecorationData, DecorationRequest } from '../node/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 import { IDecorationsService, IDecorationData } from 'vs/workbench/services/decorations/browser/decorations';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { values } from 'vs/base/common/collections';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 class DecorationRequestsQueue {
 
 	private _idPool = 0;
 	private _requests: { [id: number]: DecorationRequest } = Object.create(null);
-	private _resolver: { [id: number]: Function } = Object.create(null);
+	private _resolver: { [id: number]: (data: DecorationData) => any } = Object.create(null);
 
 	private _timer: number;
 
@@ -27,16 +27,18 @@ class DecorationRequestsQueue {
 		//
 	}
 
-	enqueue(handle: number, uri: URI): TPromise<DecorationData> {
+	enqueue(handle: number, uri: URI, token: CancellationToken): Promise<DecorationData> {
 		const id = ++this._idPool;
-		return new TPromise((resolve, reject) => {
+		const result = new Promise<DecorationData>(resolve => {
 			this._requests[id] = { id, handle, uri };
 			this._resolver[id] = resolve;
 			this._processQueue();
-		}, () => {
+		});
+		token.onCancellationRequested(() => {
 			delete this._requests[id];
 			delete this._resolver[id];
 		});
+		return result;
 	}
 
 	private _processQueue(): void {
@@ -87,8 +89,8 @@ export class MainThreadDecorations implements MainThreadDecorationsShape {
 		const registration = this._decorationsService.registerDecorationsProvider({
 			label,
 			onDidChange: emitter.event,
-			provideDecorations: (uri) => {
-				return this._requestQueue.enqueue(handle, uri).then(data => {
+			provideDecorations: (uri, token) => {
+				return this._requestQueue.enqueue(handle, uri, token).then(data => {
 					if (!data) {
 						return undefined;
 					}
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDocumentContentProviders.ts b/src/vs/workbench/api/electron-browser/mainThreadDocumentContentProviders.ts
index ccf9eeb2637..dfd5a60757e 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadDocumentContentProviders.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadDocumentContentProviders.ts
@@ -4,17 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { onUnexpectedError } from 'vs/base/common/errors';
 import { IDisposable } from 'vs/base/common/lifecycle';
+import URI, { UriComponents } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { ITextModel, DefaultEndOfLine } from 'vs/editor/common/model';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { MainThreadDocumentContentProvidersShape, ExtHostContext, ExtHostDocumentContentProvidersShape, MainContext, IExtHostContext } from '../node/extHost.protocol';
-import { createTextBuffer } from 'vs/editor/common/model/textModel';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IModeService } from 'vs/editor/common/services/modeService';
+import { EditOperation } from 'vs/editor/common/core/editOperation';
+import { Range } from 'vs/editor/common/core/range';
+import { ITextModel } from 'vs/editor/common/model';
+import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService';
 import { IModelService } from 'vs/editor/common/services/modelService';
+import { IModeService } from 'vs/editor/common/services/modeService';
+import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
+import { ExtHostContext, ExtHostDocumentContentProvidersShape, IExtHostContext, MainContext, MainThreadDocumentContentProvidersShape } from '../node/extHost.protocol';
 
 @extHostNamedCustomer(MainContext.MainThreadDocumentContentProviders)
 export class MainThreadDocumentContentProviders implements MainThreadDocumentContentProvidersShape {
@@ -27,6 +30,7 @@ export class MainThreadDocumentContentProviders implements MainThreadDocumentCon
 		@ITextModelService private readonly _textModelResolverService: ITextModelService,
 		@IModeService private readonly _modeService: IModeService,
 		@IModelService private readonly _modelService: IModelService,
+		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
 		@ICodeEditorService codeEditorService: ICodeEditorService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostDocumentContentProviders);
@@ -67,10 +71,11 @@ export class MainThreadDocumentContentProviders implements MainThreadDocumentCon
 			return;
 		}
 
-		const textBuffer = createTextBuffer(value, DefaultEndOfLine.CRLF);
-
-		if (!model.equalsTextBuffer(textBuffer)) {
-			model.setValueFromTextBuffer(textBuffer);
-		}
+		this._editorWorkerService.computeMoreMinimalEdits(model.uri, [{ text: value, range: model.getFullModelRange() }]).then(edits => {
+			if (edits.length > 0) {
+				// use the evil-edit as these models show in readonly-editor only
+				model.applyEdits(edits.map(edit => EditOperation.replace(Range.lift(edit.range), edit.text)));
+			}
+		}, onUnexpectedError);
 	}
 }
diff --git a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
index 81593724b68..29bf1a401c4 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
@@ -8,7 +8,7 @@ import { Emitter, Event } from 'vs/base/common/event';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { FileWriteOptions, FileSystemProviderCapabilities, IFileChange, IFileService, IFileSystemProvider, IStat, IWatchOptions, FileType, FileOverwriteOptions } from 'vs/platform/files/common/files';
+import { FileWriteOptions, FileSystemProviderCapabilities, IFileChange, IFileService, IFileSystemProvider, IStat, IWatchOptions, FileType, FileOverwriteOptions, FileDeleteOptions } from 'vs/platform/files/common/files';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 import { ExtHostContext, ExtHostFileSystemShape, IExtHostContext, IFileChangeDto, MainContext, MainThreadFileSystemShape } from '../node/extHost.protocol';
 
@@ -107,8 +107,8 @@ class RemoteFileSystemProvider implements IFileSystemProvider {
 		return this._proxy.$writeFile(this._handle, resource, encoded, opts);
 	}
 
-	delete(resource: URI): TPromise<void, any> {
-		return this._proxy.$delete(this._handle, resource);
+	delete(resource: URI, opts: FileDeleteOptions): TPromise<void, any> {
+		return this._proxy.$delete(this._handle, resource, opts);
 	}
 
 	mkdir(resource: URI): TPromise<void, any> {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts b/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
index 5afe23566d3..7435dda07b6 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
@@ -38,7 +38,7 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 	public dispose(): void {
 	}
 
-	$show(options: IPickOptions): TPromise<number | number[]> {
+	$show(options: IPickOptions<TransferQuickPickItems>): TPromise<number | number[]> {
 		const myToken = ++this._token;
 
 		this._contents = new TPromise<TransferQuickPickItems[]>((c, e) => {
@@ -55,16 +55,21 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 			};
 		});
 
+		options = {
+			...options,
+			onDidFocus: el => {
+				if (el) {
+					this._proxy.$onItemSelected((<TransferQuickPickItems>el).handle);
+				}
+			}
+		};
+
 		if (options.canPickMany) {
 			return asWinJsPromise(token => this._quickInputService.pick(this._contents, options as { canPickMany: true }, token)).then(items => {
 				if (items) {
 					return items.map(item => item.handle);
 				}
 				return undefined;
-			}, undefined, progress => {
-				if (progress) {
-					this._proxy.$onItemSelected((<TransferQuickPickItems>progress).handle);
-				}
 			});
 		} else {
 			return asWinJsPromise(token => this._quickInputService.pick(this._contents, options, token)).then(item => {
@@ -72,10 +77,6 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 					return item.handle;
 				}
 				return undefined;
-			}, undefined, progress => {
-				if (progress) {
-					this._proxy.$onItemSelected((<TransferQuickPickItems>progress).handle);
-				}
 			});
 		}
 	}
diff --git a/src/vs/workbench/api/electron-browser/mainThreadSCM.ts b/src/vs/workbench/api/electron-browser/mainThreadSCM.ts
index 6bd43da77dc..8ee8daaee7a 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadSCM.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadSCM.ts
@@ -401,17 +401,17 @@ export class MainThreadSCM implements MainThreadSCMShape {
 		}
 
 		if (enabled) {
-			repository.input.validateInput = async (value, pos): TPromise<IInputValidation | undefined> => {
-				const result = await this._proxy.$validateInput(sourceControlHandle, value, pos);
+			repository.input.validateInput = (value, pos): TPromise<IInputValidation | undefined> => {
+				return this._proxy.$validateInput(sourceControlHandle, value, pos).then(result => {
+					if (!result) {
+						return undefined;
+					}
 
-				if (!result) {
-					return undefined;
-				}
-
-				return {
-					message: result[0],
-					type: result[1]
-				};
+					return {
+						message: result[0],
+						type: result[1]
+					};
+				});
 			};
 		} else {
 			repository.input.validateInput = () => TPromise.as(undefined);
diff --git a/src/vs/workbench/api/electron-browser/mainThreadSearch.ts b/src/vs/workbench/api/electron-browser/mainThreadSearch.ts
index 2fc636b81e1..7e3224c1de2 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadSearch.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadSearch.ts
@@ -29,7 +29,7 @@ export class MainThreadSearch implements MainThreadSearchShape {
 	}
 
 	dispose(): void {
-		this._searchProvider.forEach(value => dispose());
+		this._searchProvider.forEach(value => value.dispose());
 		this._searchProvider.clear();
 	}
 
@@ -42,7 +42,11 @@ export class MainThreadSearch implements MainThreadSearchShape {
 		this._searchProvider.delete(handle);
 	}
 
-	$handleFindMatch(handle: number, session, data: UriComponents | IRawFileMatch2[]): void {
+	$handleFileMatch(handle: number, session, data: UriComponents[]): void {
+		this._searchProvider.get(handle).handleFindMatch(session, data);
+	}
+
+	$handleTextMatch(handle: number, session, data: IRawFileMatch2[]): void {
 		this._searchProvider.get(handle).handleFindMatch(session, data);
 	}
 
@@ -75,7 +79,7 @@ class SearchOperation {
 	}
 }
 
-class RemoteSearchProvider implements ISearchResultProvider {
+class RemoteSearchProvider implements ISearchResultProvider, IDisposable {
 
 	private readonly _registrations: IDisposable[];
 	private readonly _searches = new Map<number, SearchOperation>();
@@ -86,7 +90,7 @@ class RemoteSearchProvider implements ISearchResultProvider {
 		private readonly _handle: number,
 		private readonly _proxy: ExtHostSearchShape
 	) {
-		this._registrations = [searchService.registerSearchResultProvider(this)];
+		this._registrations = [searchService.registerSearchResultProvider(this._scheme, this)];
 	}
 
 	dispose(): void {
@@ -134,22 +138,28 @@ class RemoteSearchProvider implements ISearchResultProvider {
 		});
 	}
 
-	handleFindMatch(session: number, dataOrUri: UriComponents | IRawFileMatch2[]): void {
+	clearCache(cacheKey: string): TPromise<void> {
+		return this._proxy.$clearCache(this._handle, cacheKey);
+	}
+
+	handleFindMatch(session: number, dataOrUri: (UriComponents | IRawFileMatch2)[]): void {
 		if (!this._searches.has(session)) {
 			// ignore...
 			return;
 		}
 
 		const searchOp = this._searches.get(session);
-		if (Array.isArray(dataOrUri)) {
-			dataOrUri.forEach(m => {
+		dataOrUri.forEach(result => {
+			if ((<IRawFileMatch2>result).lineMatches) {
 				searchOp.addMatch({
-					resource: URI.revive(m.resource),
-					lineMatches: m.lineMatches
+					resource: URI.revive((<IRawFileMatch2>result).resource),
+					lineMatches: (<IRawFileMatch2>result).lineMatches
 				});
-			});
-		} else {
-			searchOp.addMatch({ resource: URI.revive(dataOrUri) });
-		}
+			} else {
+				searchOp.addMatch({
+					resource: URI.revive(result)
+				});
+			}
+		});
 	}
 }
diff --git a/src/vs/workbench/api/electron-browser/mainThreadTask.ts b/src/vs/workbench/api/electron-browser/mainThreadTask.ts
index 45c911be480..6658414014b 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadTask.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadTask.ts
@@ -11,6 +11,7 @@ import * as Objects from 'vs/base/common/objects';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as Types from 'vs/base/common/types';
 import * as Platform from 'vs/base/common/platform';
+import { IStringDictionary } from 'vs/base/common/collections';
 
 import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 
@@ -386,8 +387,8 @@ export class MainThreadTask implements MainThreadTaskShape {
 
 	public $registerTaskProvider(handle: number): TPromise<void> {
 		this._taskService.registerTaskProvider(handle, {
-			provideTasks: () => {
-				return this._proxy.$provideTasks(handle).then((value) => {
+			provideTasks: (validTypes: IStringDictionary<boolean>) => {
+				return this._proxy.$provideTasks(handle, validTypes).then((value) => {
 					let tasks: Task[] = [];
 					for (let task of value.tasks) {
 						let taskTransfer = task._source as any as ExtensionTaskSourceTransfer;
diff --git a/src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts b/src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts
index 421daa0c9e4..242091da9b1 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts
@@ -39,6 +39,10 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 			this._onTerminalOpened(t);
 			t.processReady.then(() => this._onTerminalProcessIdReady(t));
 		});
+		const activeInstance = this.terminalService.getActiveInstance();
+		if (activeInstance) {
+			this._proxy.$acceptActiveTerminalChanged(activeInstance.id);
+		}
 	}
 
 	public dispose(): void {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
index f10dd9cc5a0..bbd23cb0e50 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
@@ -34,6 +34,7 @@ export class MainThreadTreeViews extends Disposable implements MainThreadTreeVie
 		if (viewer) {
 			viewer.dataProvider = dataProvider;
 			this.registerListeners(treeViewId, viewer);
+			this._proxy.$setVisible(treeViewId, viewer.visible);
 		} else {
 			this.notificationService.error('No view is registered with id: ' + treeViewId);
 		}
diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
index 4c2d53c73a3..8def9ec323a 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
@@ -117,7 +117,7 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 		this._webviewService.revealWebview(webview, targetGroup || this._editorGroupService.activeGroup, preserveFocus);
 	}
 
-	public async $postMessage(handle: WebviewPanelHandle, message: any): TPromise<boolean> {
+	public $postMessage(handle: WebviewPanelHandle, message: any): TPromise<boolean> {
 		const webview = this.getWebview(handle);
 		const editors = this._editorService.visibleControls
 			.filter(e => e instanceof WebviewEditor)
@@ -128,7 +128,7 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv
 			editor.sendMessage(message);
 		}
 
-		return (editors.length > 0);
+		return TPromise.as(editors.length > 0);
 	}
 
 	public $registerSerializer(viewType: string): void {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts b/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
index 297e9886d14..371e4abab23 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
@@ -5,18 +5,20 @@
 'use strict';
 
 import { isPromiseCanceledError } from 'vs/base/common/errors';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import URI, { UriComponents } from 'vs/base/common/uri';
-import { ISearchService, QueryType, ISearchQuery, IFolderQuery, ISearchConfiguration } from 'vs/platform/search/common/search';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { MainThreadWorkspaceShape, ExtHostWorkspaceShape, ExtHostContext, MainContext, IExtHostContext } from '../node/extHost.protocol';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
 import { localize } from 'vs/nls';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IFileMatch, IFolderQuery, IPatternInfo, IQueryOptions, ISearchConfiguration, ISearchQuery, ISearchService, QueryType } from 'vs/platform/search/common/search';
 import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar';
+import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
+import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
+import { QueryBuilder } from 'vs/workbench/parts/search/common/queryBuilder';
+import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
+import { ExtHostContext, ExtHostWorkspaceShape, IExtHostContext, MainContext, MainThreadWorkspaceShape } from '../node/extHost.protocol';
 
 @extHostNamedCustomer(MainContext.MainThreadWorkspace)
 export class MainThreadWorkspace implements MainThreadWorkspaceShape {
@@ -32,7 +34,8 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		@ITextFileService private readonly _textFileService: ITextFileService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IWorkspaceEditingService private readonly _workspaceEditingService: IWorkspaceEditingService,
-		@IStatusbarService private readonly _statusbarService: IStatusbarService
+		@IStatusbarService private readonly _statusbarService: IStatusbarService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostWorkspace);
 		this._contextService.onDidChangeWorkspaceFolders(this._onDidChangeWorkspace, this, this._toDispose);
@@ -97,7 +100,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 
 	// --- search ---
 
-	$startSearch(includePattern: string, includeFolder: string, excludePatternOrDisregardExcludes: string | false, maxResults: number, requestId: number): Thenable<URI[]> {
+	$startFileSearch(includePattern: string, includeFolder: string, excludePatternOrDisregardExcludes: string | false, maxResults: number, requestId: number): Thenable<URI[]> {
 		const workspace = this._contextService.getWorkspace();
 		if (!workspace.folders.length) {
 			return undefined;
@@ -158,6 +161,37 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		return search;
 	}
 
+	$startTextSearch(pattern: IPatternInfo, options: IQueryOptions, requestId: number): TPromise<void, IFileMatch> {
+		const workspace = this._contextService.getWorkspace();
+		const folders = workspace.folders.map(folder => folder.uri);
+
+		const queryBuilder = this._instantiationService.createInstance(QueryBuilder);
+		const query = queryBuilder.text(pattern, folders, options);
+
+		return new TPromise((resolve, reject) => {
+			const search = this._searchService.search(query).then(
+				() => {
+					delete this._activeSearches[requestId];
+					resolve(null);
+				},
+				err => {
+					delete this._activeSearches[requestId];
+					if (!isPromiseCanceledError(err)) {
+						reject(TPromise.wrapError(err));
+					}
+
+					return undefined;
+				},
+				p => {
+					if (p.lineMatches) {
+						this._proxy.$handleTextSearchResult(p, requestId);
+					}
+				});
+
+			this._activeSearches[requestId] = search;
+		});
+	}
+
 	$cancelSearch(requestId: number): Thenable<boolean> {
 		const search = this._activeSearches[requestId];
 		if (search) {
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
index a13e4ea75f0..eea4190baed 100644
--- a/src/vs/workbench/api/node/extHost.api.impl.ts
+++ b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -335,7 +335,7 @@ export function createApiFactory(
 				return proposedApiFunction(extension, extHostTerminalService.activeTerminal);
 			},
 			get terminals() {
-				return proposedApiFunction(extension, extHostTerminalService.terminals);
+				return extHostTerminalService.terminals;
 			},
 			showTextDocument(documentOrUri: vscode.TextDocument | vscode.Uri, columnOrOptions?: vscode.ViewColumn | vscode.TextDocumentShowOptions, preserveFocus?: boolean): TPromise<vscode.TextEditor> {
 				let documentPromise: TPromise<vscode.TextDocument>;
@@ -372,9 +372,9 @@ export function createApiFactory(
 			onDidCloseTerminal(listener, thisArg?, disposables?) {
 				return extHostTerminalService.onDidCloseTerminal(listener, thisArg, disposables);
 			},
-			onDidOpenTerminal: proposedApiFunction(extension, (listener, thisArg?, disposables?) => {
+			onDidOpenTerminal(listener, thisArg?, disposables?) {
 				return extHostTerminalService.onDidOpenTerminal(listener, thisArg, disposables);
-			}),
+			},
 			onDidChangeActiveTerminal: proposedApiFunction(extension, (listener, thisArg?, disposables?) => {
 				return extHostTerminalService.onDidChangeActiveTerminal(listener, thisArg, disposables);
 			}),
@@ -442,6 +442,9 @@ export function createApiFactory(
 			createTreeView(viewId: string, options: { treeDataProvider: vscode.TreeDataProvider<any> }): vscode.TreeView<any> {
 				return extHostTreeViews.createTreeView(viewId, options);
 			},
+			registerWebviewPanelSerializer: (viewType: string, serializer: vscode.WebviewPanelSerializer) => {
+				return extHostWebviews.registerWebviewPanelSerializer(viewType, serializer);
+			},
 			// proposed API
 			sampleFunction: proposedApiFunction(extension, () => {
 				return extHostMessageService.showMessage(extension, Severity.Info, 'Hello Proposed Api!', {}, []);
@@ -449,9 +452,6 @@ export function createApiFactory(
 			registerDecorationProvider: proposedApiFunction(extension, (provider: vscode.DecorationProvider) => {
 				return extHostDecorations.registerDecorationProvider(provider, extension.id);
 			}),
-			registerWebviewPanelSerializer: proposedApiFunction(extension, (viewType: string, serializer: vscode.WebviewPanelSerializer) => {
-				return extHostWebviews.registerWebviewPanelSerializer(viewType, serializer);
-			}),
 			registerUriHandler(handler: vscode.UriHandler) {
 				return extHostUrls.registerUriHandler(extension.id, handler);
 			},
@@ -500,6 +500,9 @@ export function createApiFactory(
 			findFiles: (include, exclude, maxResults?, token?) => {
 				return extHostWorkspace.findFiles(typeConverters.GlobPattern.from(include), typeConverters.GlobPattern.from(exclude), maxResults, extension.id, token);
 			},
+			findTextInFiles: (query: vscode.TextSearchQuery, options: vscode.FindTextInFilesOptions, callback: (result: vscode.TextSearchResult) => void, token?: vscode.CancellationToken) => {
+				return extHostWorkspace.findTextInFiles(query, options || {}, callback, extension.id, token);
+			},
 			saveAll: (includeUntitled?) => {
 				return extHostWorkspace.saveAll(includeUntitled);
 			},
@@ -826,7 +829,9 @@ function defineAPI(factory: IExtensionApiFactory, extensionPaths: TernarySearchT
 
 		// fall back to a default implementation
 		if (!defaultApiImpl) {
-			console.warn(`Could not identify extension for 'vscode' require call from ${parent.filename}`);
+			let extensionPathsPretty = '';
+			extensionPaths.forEach((value, index) => extensionPathsPretty += `\t${index} -> ${value.id}\n`);
+			console.warn(`Could not identify extension for 'vscode' require call from ${parent.filename}. These are the extension path mappings: \n${extensionPathsPretty}`);
 			defaultApiImpl = factory(nullExtensionDescription);
 		}
 		return defaultApiImpl;
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 20996b207a6..c65fd9cf161 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -4,52 +4,43 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { createMainContextProxyIdentifier as createMainId, createExtHostContextProxyIdentifier as createExtId, ProxyIdentifier, IRPCProtocol } from 'vs/workbench/services/extensions/node/proxyIdentifier';
-
-import * as vscode from 'vscode';
-
-import URI, { UriComponents } from 'vs/base/common/uri';
+import { SerializedError } from 'vs/base/common/errors';
+import { IDisposable } from 'vs/base/common/lifecycle';
 import Severity from 'vs/base/common/severity';
+import URI, { UriComponents } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
-
-import { IMarkerData } from 'vs/platform/markers/common/markers';
-import { EditorViewColumn } from 'vs/workbench/api/shared/editor';
-import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { StatusbarAlignment as MainThreadStatusBarAlignment } from 'vs/platform/statusbar/common/statusbar';
-import { ITelemetryInfo } from 'vs/platform/telemetry/common/telemetry';
-import { ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
-import { IProgressOptions, IProgressStep } from 'vs/workbench/services/progress/common/progress';
-
-import * as editorCommon from 'vs/editor/common/editorCommon';
-import * as modes from 'vs/editor/common/modes';
-
-import { IConfigurationData, ConfigurationTarget, IConfigurationModel } from 'vs/platform/configuration/common/configuration';
-import { IConfig, IAdapterExecutable, ITerminalSettings } from 'vs/workbench/parts/debug/common/debug';
-
-import { IQuickPickItem, IPickOptions, IQuickInputButton } from 'vs/platform/quickinput/common/quickInput';
-import { SaveReason } from 'vs/workbench/services/textfile/common/textfiles';
 import { TextEditorCursorStyle } from 'vs/editor/common/config/editorOptions';
-import { EndOfLine, TextEditorLineNumbersStyle } from 'vs/workbench/api/node/extHostTypes';
-
-
-import { TaskSet } from 'vs/workbench/parts/tasks/common/tasks';
-import { IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel';
 import { IPosition } from 'vs/editor/common/core/position';
 import { IRange } from 'vs/editor/common/core/range';
 import { ISelection, Selection } from 'vs/editor/common/core/selection';
-
-import { ITreeItem } from 'vs/workbench/common/views';
-import { ThemeColor } from 'vs/platform/theme/common/themeService';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { SerializedError } from 'vs/base/common/errors';
-import { IStat, FileChangeType, IWatchOptions, FileSystemProviderCapabilities, FileWriteOptions, FileType, FileOverwriteOptions } from 'vs/platform/files/common/files';
-import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { CommentRule, CharacterPair, EnterAction } from 'vs/editor/common/modes/languageConfiguration';
+import * as editorCommon from 'vs/editor/common/editorCommon';
 import { ISingleEditOperation } from 'vs/editor/common/model';
-import { IPatternInfo, IRawSearchQuery, IRawFileMatch2, ISearchCompleteStats } from 'vs/platform/search/common/search';
+import { IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel';
+import * as modes from 'vs/editor/common/modes';
+import { CharacterPair, CommentRule, EnterAction } from 'vs/editor/common/modes/languageConfiguration';
+import { ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
+import { ConfigurationTarget, IConfigurationData, IConfigurationModel } from 'vs/platform/configuration/common/configuration';
+import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
+import { FileChangeType, FileDeleteOptions, FileOverwriteOptions, FileSystemProviderCapabilities, FileType, FileWriteOptions, IStat, IWatchOptions } from 'vs/platform/files/common/files';
 import { LogLevel } from 'vs/platform/log/common/log';
-import { TaskExecutionDTO, TaskDTO, TaskHandleDTO, TaskFilterDTO, TaskProcessStartedDTO, TaskProcessEndedDTO, TaskSystemInfoDTO } from 'vs/workbench/api/shared/tasks';
+import { IMarkerData } from 'vs/platform/markers/common/markers';
+import { IPickOptions, IQuickInputButton, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+import { IPatternInfo, IQueryOptions, IRawFileMatch2, IRawSearchQuery, ISearchCompleteStats } from 'vs/platform/search/common/search';
+import { StatusbarAlignment as MainThreadStatusBarAlignment } from 'vs/platform/statusbar/common/statusbar';
+import { ITelemetryInfo } from 'vs/platform/telemetry/common/telemetry';
+import { ThemeColor } from 'vs/platform/theme/common/themeService';
+import { EndOfLine, IFileOperationOptions, TextEditorLineNumbersStyle } from 'vs/workbench/api/node/extHostTypes';
+import { EditorViewColumn } from 'vs/workbench/api/shared/editor';
+import { TaskDTO, TaskExecutionDTO, TaskFilterDTO, TaskHandleDTO, TaskProcessEndedDTO, TaskProcessStartedDTO, TaskSystemInfoDTO } from 'vs/workbench/api/shared/tasks';
+import { ITreeItem } from 'vs/workbench/common/views';
+import { IAdapterExecutable, IConfig, ITerminalSettings } from 'vs/workbench/parts/debug/common/debug';
+import { TaskSet } from 'vs/workbench/parts/tasks/common/tasks';
 import { ITerminalDimensions } from 'vs/workbench/parts/terminal/common/terminal';
+import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
+import { createExtHostContextProxyIdentifier as createExtId, createMainContextProxyIdentifier as createMainId, IRPCProtocol, ProxyIdentifier } from 'vs/workbench/services/extensions/node/proxyIdentifier';
+import { IProgressOptions, IProgressStep } from 'vs/workbench/services/progress/common/progress';
+import { SaveReason } from 'vs/workbench/services/textfile/common/textfiles';
+import * as vscode from 'vscode';
 
 export interface IEnvironment {
 	isExtensionDevelopmentDebug: boolean;
@@ -411,7 +402,7 @@ export interface TransferInputBox extends BaseTransferQuickInput {
 }
 
 export interface MainThreadQuickOpenShape extends IDisposable {
-	$show(options: IPickOptions): TPromise<number | number[]>;
+	$show(options: IPickOptions<TransferQuickPickItems>): TPromise<number | number[]>;
 	$setItems(items: TransferQuickPickItems[]): TPromise<any>;
 	$setError(error: Error): TPromise<any>;
 	$input(options: vscode.InputBoxOptions, validateInput: boolean): TPromise<string>;
@@ -471,7 +462,8 @@ export interface ExtHostUrlsShape {
 }
 
 export interface MainThreadWorkspaceShape extends IDisposable {
-	$startSearch(includePattern: string, includeFolder: string, excludePatternOrDisregardExcludes: string | false, maxResults: number, requestId: number): Thenable<UriComponents[]>;
+	$startFileSearch(includePattern: string, includeFolder: string, excludePatternOrDisregardExcludes: string | false, maxResults: number, requestId: number): Thenable<UriComponents[]>;
+	$startTextSearch(query: IPatternInfo, options: IQueryOptions, requestId: number): TPromise<void>;
 	$cancelSearch(requestId: number): Thenable<boolean>;
 	$saveAll(includeUntitled?: boolean): Thenable<boolean>;
 	$updateWorkspaceFolders(extensionName: string, index: number, deleteCount: number, workspaceFoldersToAdd: { uri: UriComponents, name?: string }[]): Thenable<void>;
@@ -491,7 +483,8 @@ export interface MainThreadFileSystemShape extends IDisposable {
 export interface MainThreadSearchShape extends IDisposable {
 	$registerSearchProvider(handle: number, scheme: string): void;
 	$unregisterProvider(handle: number): void;
-	$handleFindMatch(handle: number, session: number, data: UriComponents | IRawFileMatch2[]): void;
+	$handleFileMatch(handle: number, session: number, data: UriComponents[]): void;
+	$handleTextMatch(handle: number, session: number, data: IRawFileMatch2[]): void;
 	$handleTelemetry(eventName: string, data: any): void;
 }
 
@@ -671,6 +664,7 @@ export interface ExtHostTreeViewsShape {
 
 export interface ExtHostWorkspaceShape {
 	$acceptWorkspaceData(workspace: IWorkspaceData): void;
+	$handleTextSearchResult(result: IRawFileMatch2, requestId: number): void;
 }
 
 export interface ExtHostFileSystemShape {
@@ -681,13 +675,14 @@ export interface ExtHostFileSystemShape {
 	$rename(handle: number, resource: UriComponents, target: UriComponents, opts: FileOverwriteOptions): TPromise<void>;
 	$copy(handle: number, resource: UriComponents, target: UriComponents, opts: FileOverwriteOptions): TPromise<void>;
 	$mkdir(handle: number, resource: UriComponents): TPromise<void>;
-	$delete(handle: number, resource: UriComponents): TPromise<void>;
+	$delete(handle: number, resource: UriComponents, opts: FileDeleteOptions): TPromise<void>;
 	$watch(handle: number, session: number, resource: UriComponents, opts: IWatchOptions): void;
 	$unwatch(handle: number, session: number): void;
 }
 
 export interface ExtHostSearchShape {
 	$provideFileSearchResults(handle: number, session: number, query: IRawSearchQuery): TPromise<ISearchCompleteStats>;
+	$clearCache(handle: number, cacheKey: string): TPromise<void>;
 	$provideTextSearchResults(handle: number, session: number, pattern: IPatternInfo, query: IRawSearchQuery): TPromise<ISearchCompleteStats>;
 }
 
@@ -774,7 +769,7 @@ export interface WorkspaceSymbolsDto extends IdObject {
 export interface ResourceFileEditDto {
 	oldUri: UriComponents;
 	newUri: UriComponents;
-	options: { overwrite?: boolean, ignoreIfExists?: boolean };
+	options: IFileOperationOptions;
 }
 
 export interface ResourceTextEditDto {
@@ -883,7 +878,7 @@ export interface ExtHostSCMShape {
 }
 
 export interface ExtHostTaskShape {
-	$provideTasks(handle: number): TPromise<TaskSet>;
+	$provideTasks(handle: number, validTypes: { [key: string]: boolean; }): TPromise<TaskSet>;
 	$onDidStartTask(execution: TaskExecutionDTO): void;
 	$onDidStartTaskProcess(value: TaskProcessStartedDTO): void;
 	$onDidEndTaskProcess(value: TaskProcessEndedDTO): void;
diff --git a/src/vs/workbench/api/node/extHostApiCommands.ts b/src/vs/workbench/api/node/extHostApiCommands.ts
index d3467d37632..37cd6a1908d 100644
--- a/src/vs/workbench/api/node/extHostApiCommands.ts
+++ b/src/vs/workbench/api/node/extHostApiCommands.ts
@@ -19,6 +19,7 @@ import { ExtHostCommands } from 'vs/workbench/api/node/extHostCommands';
 import { CustomCodeAction } from 'vs/workbench/api/node/extHostLanguageFeatures';
 import { ICommandsExecutor, PreviewHTMLAPICommand, OpenFolderAPICommand, DiffAPICommand, OpenAPICommand, RemoveFromRecentlyOpenedAPICommand, SetEditorLayoutAPICommand } from './apiCommands';
 import { EditorGroupLayout } from 'vs/workbench/services/group/common/editorGroupsService';
+import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 
 export class ExtHostApiCommands {
 
@@ -411,15 +412,24 @@ export class ExtHostApiCommands {
 		});
 	}
 
-	private _executeDocumentSymbolProvider(resource: URI): Thenable<vscode.DocumentSymbol[]> {
+	private _executeDocumentSymbolProvider(resource: URI): Thenable<vscode.SymbolInformation[]> {
 		const args = {
 			resource
 		};
 		return this._commands.executeCommand<modes.DocumentSymbol[]>('_executeDocumentSymbolProvider', args).then(value => {
-			if (value && Array.isArray(value)) {
-				return value.map(typeConverters.DocumentSymbol.to);
+			if (isFalsyOrEmpty(value)) {
+				return undefined;
 			}
-			return undefined;
+			let result: vscode.SymbolInformation[] = [];
+			for (const symbol of value) {
+				result.push(new types.SymbolInformation(
+					symbol.name,
+					typeConverters.SymbolKind.to(symbol.kind),
+					symbol.containerName,
+					new types.Location(resource, typeConverters.Range.to(symbol.range))
+				));
+			}
+			return result;
 		});
 	}
 
diff --git a/src/vs/workbench/api/node/extHostDebugService.ts b/src/vs/workbench/api/node/extHostDebugService.ts
index d01e7dc7533..192fc8c86da 100644
--- a/src/vs/workbench/api/node/extHostDebugService.ts
+++ b/src/vs/workbench/api/node/extHostDebugService.ts
@@ -123,7 +123,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 		}
 	}
 
-	public async $runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {
+	public $runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {
 
 		if (args.kind === 'integrated') {
 
@@ -136,20 +136,31 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 				});
 			}
 
-			let t = this._integratedTerminalInstance;
+			return new TPromise(resolve => {
+				if (this._integratedTerminalInstance) {
+					this._integratedTerminalInstance.processId.then(pid => {
+						resolve(hasChildprocesses(pid));
+					}, err => {
+						resolve(true);
+					});
+				} else {
+					resolve(true);
+				}
+			}).then(needNewTerminal => {
 
-			if ((t && hasChildprocesses(await t.processId)) || !t) {
-				t = this._terminalService.createTerminal(args.title || nls.localize('debug.terminal.title', "debuggee"));
-				this._integratedTerminalInstance = t;
-			}
-			t.show();
+				if (needNewTerminal) {
+					this._integratedTerminalInstance = this._terminalService.createTerminal(args.title || nls.localize('debug.terminal.title', "debuggee"));
+				}
 
-			return new TPromise((resolve, error) => {
-				setTimeout(_ => {
-					const command = prepareCommand(args, config);
-					t.sendText(command, true);
-					resolve(void 0);
-				}, 500);
+				this._integratedTerminalInstance.show();
+
+				return new TPromise((resolve, error) => {
+					setTimeout(_ => {
+						const command = prepareCommand(args, config);
+						this._integratedTerminalInstance.sendText(command, true);
+						resolve(void 0);
+					}, 500);
+				});
 			});
 
 		} else if (args.kind === 'external') {
@@ -166,15 +177,18 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 		if (!this._variableResolver) {
 			this._variableResolver = new ExtHostVariableResolverService(this._workspaceService, this._editorsService, this._configurationService);
 		}
+		let ws: IWorkspaceFolder;
 		const folder = this.getFolder(folderUri);
-		let ws: IWorkspaceFolder = {
-			uri: folder.uri,
-			name: folder.name,
-			index: folder.index,
-			toResource: () => {
-				throw new Error('Not implemented');
-			}
-		};
+		if (folder) {
+			ws = {
+				uri: folder.uri,
+				name: folder.name,
+				index: folder.index,
+				toResource: () => {
+					throw new Error('Not implemented');
+				}
+			};
+		}
 		return asWinJsPromise(token => this._variableResolver.resolveAny(ws, config));
 	}
 
@@ -412,9 +426,9 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 	private fireBreakpointChanges(added: vscode.Breakpoint[], removed: vscode.Breakpoint[], changed: vscode.Breakpoint[]) {
 		if (added.length > 0 || removed.length > 0 || changed.length > 0) {
 			this._onDidChangeBreakpoints.fire(Object.freeze({
-				added: Object.freeze<vscode.Breakpoint[]>(added),
-				removed: Object.freeze<vscode.Breakpoint[]>(removed),
-				changed: Object.freeze<vscode.Breakpoint[]>(changed)
+				added,
+				removed,
+				changed,
 			}));
 		}
 	}
@@ -524,7 +538,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 		this._onDidReceiveDebugSessionCustomEvent.fire(ee);
 	}
 
-	private getFolder(_folderUri: UriComponents | undefined): vscode.WorkspaceFolder {
+	private getFolder(_folderUri: UriComponents | undefined): vscode.WorkspaceFolder | undefined {
 		if (_folderUri) {
 			const folderURI = URI.revive(_folderUri);
 			return this._workspaceService.resolveWorkspaceFolder(folderURI);
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index cbddae20573..61ec236d842 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -68,7 +68,7 @@ class ExtensionStoragePath {
 	private readonly _workspace: IWorkspaceData;
 	private readonly _environment: IEnvironment;
 
-	private readonly _ready: TPromise<string>;
+	private readonly _ready: Promise<string>;
 	private _value: string;
 
 	constructor(workspace: IWorkspaceData, environment: IEnvironment) {
@@ -77,7 +77,7 @@ class ExtensionStoragePath {
 		this._ready = this._getOrCreateWorkspaceStoragePath().then(value => this._value = value);
 	}
 
-	get whenReady(): TPromise<any> {
+	get whenReady(): Promise<any> {
 		return this._ready;
 	}
 
@@ -88,7 +88,7 @@ class ExtensionStoragePath {
 		return undefined;
 	}
 
-	private async _getOrCreateWorkspaceStoragePath(): TPromise<string> {
+	private async _getOrCreateWorkspaceStoragePath(): Promise<string> {
 		if (!this._workspace) {
 			return TPromise.as(undefined);
 		}
diff --git a/src/vs/workbench/api/node/extHostFileSystem.ts b/src/vs/workbench/api/node/extHostFileSystem.ts
index 58f06eb2188..1b1d65efcea 100644
--- a/src/vs/workbench/api/node/extHostFileSystem.ts
+++ b/src/vs/workbench/api/node/extHostFileSystem.ts
@@ -168,8 +168,8 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape {
 		return asWinJsPromise(() => this._fsProvider.get(handle).writeFile(URI.revive(resource), Buffer.from(base64Content, 'base64'), opts));
 	}
 
-	$delete(handle: number, resource: UriComponents): TPromise<void, any> {
-		return asWinJsPromise(() => this._fsProvider.get(handle).delete(URI.revive(resource), { recursive: true }));
+	$delete(handle: number, resource: UriComponents, opts: files.FileDeleteOptions): TPromise<void, any> {
+		return asWinJsPromise(() => this._fsProvider.get(handle).delete(URI.revive(resource), opts));
 	}
 
 	$rename(handle: number, oldUri: UriComponents, newUri: UriComponents, opts: files.FileOverwriteOptions): TPromise<void, any> {
diff --git a/src/vs/workbench/api/node/extHostFileSystemEventService.ts b/src/vs/workbench/api/node/extHostFileSystemEventService.ts
index 14424fe8b80..1b196d9df1d 100644
--- a/src/vs/workbench/api/node/extHostFileSystemEventService.ts
+++ b/src/vs/workbench/api/node/extHostFileSystemEventService.ts
@@ -146,7 +146,7 @@ export class ExtHostFileSystemEventService implements ExtHostFileSystemEventServ
 		const newUri = URI.revive(newUriDto);
 
 		const edits: WorkspaceEdit[] = [];
-		return this._onWillRenameFile.fireAsync((bucket, listener) => {
+		return TPromise.wrap(this._onWillRenameFile.fireAsync((bucket, listener) => {
 			return {
 				oldUri,
 				newUri,
@@ -179,6 +179,6 @@ export class ExtHostFileSystemEventService implements ExtHostFileSystemEventServ
 				}
 			}
 			return this._mainThreadTextEditors.$tryApplyWorkspaceEdit({ edits: flatten(allEdits) });
-		});
+		}));
 	}
 }
diff --git a/src/vs/workbench/api/node/extHostSCM.ts b/src/vs/workbench/api/node/extHostSCM.ts
index b008b72b086..eeafdc4a416 100644
--- a/src/vs/workbench/api/node/extHostSCM.ts
+++ b/src/vs/workbench/api/node/extHostSCM.ts
@@ -237,14 +237,14 @@ class ExtHostSourceControlResourceGroup implements vscode.SourceControlResourceG
 		return this._resourceStatesMap.get(handle);
 	}
 
-	async $executeResourceCommand(handle: number): TPromise<void> {
+	$executeResourceCommand(handle: number): TPromise<void> {
 		const command = this._resourceStatesCommandsMap.get(handle);
 
 		if (!command) {
-			return;
+			return TPromise.as(null);
 		}
 
-		await this._commands.executeCommand(command.command, ...command.arguments);
+		return asWinJsPromise(_ => this._commands.executeCommand(command.command, ...command.arguments));
 	}
 
 	_takeResourceStateSnapshot(): SCMRawResourceSplice[] {
@@ -568,25 +568,25 @@ export class ExtHostSCM implements ExtHostSCMShape {
 		return TPromise.as(null);
 	}
 
-	async $executeResourceCommand(sourceControlHandle: number, groupHandle: number, handle: number): TPromise<void> {
+	$executeResourceCommand(sourceControlHandle: number, groupHandle: number, handle: number): TPromise<void> {
 		this.logService.trace('ExtHostSCM#$executeResourceCommand', sourceControlHandle, groupHandle, handle);
 
 		const sourceControl = this._sourceControls.get(sourceControlHandle);
 
 		if (!sourceControl) {
-			return;
+			return TPromise.as(null);
 		}
 
 		const group = sourceControl.getResourceGroup(groupHandle);
 
 		if (!group) {
-			return;
+			return TPromise.as(null);
 		}
 
-		await group.$executeResourceCommand(handle);
+		return group.$executeResourceCommand(handle);
 	}
 
-	async $validateInput(sourceControlHandle: number, value: string, cursorPosition: number): TPromise<[string, number] | undefined> {
+	$validateInput(sourceControlHandle: number, value: string, cursorPosition: number): TPromise<[string, number] | undefined> {
 		this.logService.trace('ExtHostSCM#$validateInput', sourceControlHandle);
 
 		const sourceControl = this._sourceControls.get(sourceControlHandle);
@@ -599,12 +599,12 @@ export class ExtHostSCM implements ExtHostSCMShape {
 			return TPromise.as(undefined);
 		}
 
-		const result = await sourceControl.inputBox.validateInput(value, cursorPosition);
+		return asWinJsPromise(_ => Promise.resolve(sourceControl.inputBox.validateInput(value, cursorPosition))).then(result => {
+			if (!result) {
+				return TPromise.as(undefined);
+			}
 
-		if (!result) {
-			return TPromise.as(undefined);
-		}
-
-		return [result.message, result.type];
+			return TPromise.as<[string, number]>([result.message, result.type]);
+		});
 	}
 }
diff --git a/src/vs/workbench/api/node/extHostSearch.ts b/src/vs/workbench/api/node/extHostSearch.ts
index c4cf892bd17..d35c2401007 100644
--- a/src/vs/workbench/api/node/extHostSearch.ts
+++ b/src/vs/workbench/api/node/extHostSearch.ts
@@ -4,23 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as pfs from 'vs/base/node/pfs';
-import * as extfs from 'vs/base/node/extfs';
 import * as path from 'path';
-import * as arrays from 'vs/base/common/arrays';
+import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import * as glob from 'vs/base/common/glob';
+import * as resources from 'vs/base/common/resources';
 import * as strings from 'vs/base/common/strings';
 import URI, { UriComponents } from 'vs/base/common/uri';
 import { PPromise, TPromise } from 'vs/base/common/winjs.base';
-import { IItemAccessor, ScorerCache, compareItemsByScore, prepareQuery } from 'vs/base/parts/quickopen/common/quickOpenScorer';
-import { ICachedSearchStats, IFileMatch, IFolderQuery, IPatternInfo, IRawSearchQuery, ISearchQuery, ISearchCompleteStats, IRawFileMatch2 } from 'vs/platform/search/common/search';
+import * as extfs from 'vs/base/node/extfs';
+import * as pfs from 'vs/base/node/pfs';
+import { IFileMatch, IFolderQuery, IPatternInfo, IRawSearchQuery, ISearchCompleteStats, ISearchQuery } from 'vs/platform/search/common/search';
 import * as vscode from 'vscode';
 import { ExtHostSearchShape, IMainContext, MainContext, MainThreadSearchShape } from './extHost.protocol';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { joinPath } from 'vs/base/common/resources';
-
-type OneOrMore<T> = T | T[];
 
 export interface ISchemeTransformer {
 	transformOutgoing(scheme: string): string;
@@ -36,9 +32,7 @@ export class ExtHostSearch implements ExtHostSearchShape {
 
 	constructor(mainContext: IMainContext, private _schemeTransformer: ISchemeTransformer, private _extfs = extfs, private _pfs = pfs) {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadSearch);
-		this._fileSearchManager = new FileSearchManager(
-			(eventName: string, data: any) => this._proxy.$handleTelemetry(eventName, data),
-			this._pfs);
+		this._fileSearchManager = new FileSearchManager(this._pfs);
 	}
 
 	private _transformScheme(scheme: string): string {
@@ -71,16 +65,20 @@ export class ExtHostSearch implements ExtHostSearchShape {
 			null,
 			null,
 			progress => {
-				if (Array.isArray(progress)) {
-					progress.forEach(p => {
-						this._proxy.$handleFindMatch(handle, session, p.resource);
-					});
-				} else {
-					this._proxy.$handleFindMatch(handle, session, progress.resource);
-				}
+				this._proxy.$handleFileMatch(handle, session, progress.map(p => p.resource));
 			});
 	}
 
+	$clearCache(handle: number, cacheKey: string): TPromise<void> {
+		const provider = this._searchProvider.get(handle);
+		if (!provider.clearCache) {
+			return TPromise.as(undefined);
+		}
+
+		return TPromise.as(
+			this._fileSearchManager.clearCache(cacheKey, provider));
+	}
+
 	$provideTextSearchResults(handle: number, session: number, pattern: IPatternInfo, rawQuery: IRawSearchQuery): TPromise<ISearchCompleteStats> {
 		const provider = this._searchProvider.get(handle);
 		if (!provider.provideTextSearchResults) {
@@ -93,7 +91,7 @@ export class ExtHostSearch implements ExtHostSearchShape {
 			null,
 			null,
 			progress => {
-				this._proxy.$handleFindMatch(handle, session, progress);
+				this._proxy.$handleTextMatch(handle, session, progress);
 			});
 	}
 }
@@ -132,29 +130,28 @@ function reviveFolderQuery(rawFolderQuery: IFolderQuery<UriComponents>): IFolder
 }
 
 class TextSearchResultsCollector {
-	private _batchedCollector: BatchedCollector<IRawFileMatch2>;
+	private _batchedCollector: BatchedCollector<IFileMatch>;
 
 	private _currentFolderIdx: number;
-	private _currentRelativePath: string;
-	private _currentFileMatch: IRawFileMatch2;
+	private _currentUri: URI;
+	private _currentFileMatch: IFileMatch;
 
-	constructor(private folderQueries: IFolderQuery[], private _onResult: (result: IRawFileMatch2[]) => void) {
-		this._batchedCollector = new BatchedCollector<IRawFileMatch2>(512, items => this.sendItems(items));
+	constructor(private _onResult: (result: IFileMatch[]) => void) {
+		this._batchedCollector = new BatchedCollector<IFileMatch>(512, items => this.sendItems(items));
 	}
 
 	add(data: vscode.TextSearchResult, folderIdx: number): void {
 		// Collects TextSearchResults into IInternalFileMatches and collates using BatchedCollector.
 		// This is efficient for ripgrep which sends results back one file at a time. It wouldn't be efficient for other search
 		// providers that send results in random order. We could do this step afterwards instead.
-		if (this._currentFileMatch && (this._currentFolderIdx !== folderIdx || this._currentRelativePath !== data.path)) {
+		if (this._currentFileMatch && (this._currentFolderIdx !== folderIdx || resources.isEqual(this._currentUri, data.uri))) {
 			this.pushToCollector();
 			this._currentFileMatch = null;
 		}
 
 		if (!this._currentFileMatch) {
-			const resource = joinPath(this.folderQueries[folderIdx].folder, data.path);
 			this._currentFileMatch = {
-				resource,
+				resource: data.uri,
 				lineMatches: []
 			};
 		}
@@ -180,8 +177,8 @@ class TextSearchResultsCollector {
 		this._batchedCollector.flush();
 	}
 
-	private sendItems(items: IRawFileMatch2 | IRawFileMatch2[]): void {
-		this._onResult(Array.isArray(items) ? items : [items]);
+	private sendItems(items: IFileMatch[]): void {
+		this._onResult(items);
 	}
 }
 
@@ -202,7 +199,7 @@ class BatchedCollector<T> {
 	private batchSize = 0;
 	private timeoutHandle: number;
 
-	constructor(private maxBatchSize: number, private cb: (items: T | T[]) => void) {
+	constructor(private maxBatchSize: number, private cb: (items: T[]) => void) {
 	}
 
 	addItem(item: T, size: number): void {
@@ -210,11 +207,7 @@ class BatchedCollector<T> {
 			return;
 		}
 
-		if (this.maxBatchSize > 0) {
-			this.addItemToBatch(item, size);
-		} else {
-			this.cb(item);
-		}
+		this.addItemToBatch(item, size);
 	}
 
 	addItems(items: T[], size: number): void {
@@ -390,11 +383,11 @@ class TextSearchEngine {
 		this.activeCancellationTokens = new Set();
 	}
 
-	public search(): PPromise<{ limitHit: boolean }, IRawFileMatch2[]> {
+	public search(): PPromise<{ limitHit: boolean }, IFileMatch[]> {
 		const folderQueries = this.config.folderQueries;
 
-		return new PPromise<{ limitHit: boolean }, IRawFileMatch2[]>((resolve, reject, _onResult) => {
-			this.collector = new TextSearchResultsCollector(this.config.folderQueries, _onResult);
+		return new PPromise<{ limitHit: boolean }, IFileMatch[]>((resolve, reject, _onResult) => {
+			this.collector = new TextSearchResultsCollector(_onResult);
 
 			const onResult = (match: vscode.TextSearchResult, folderIdx: number) => {
 				if (this.isCanceled) {
@@ -437,11 +430,12 @@ class TextSearchEngine {
 			const progress = {
 				report: (result: vscode.TextSearchResult) => {
 					const siblingFn = folderQuery.folder.scheme === 'file' && (() => {
-						return this.readdir(path.dirname(path.join(folderQuery.folder.fsPath, result.path)));
+						return this.readdir(path.dirname(result.uri.fsPath));
 					});
 
+					const relativePath = path.relative(folderQuery.folder.fsPath, result.uri.fsPath);
 					testingPs.push(
-						queryTester.includedInQuery(result.path, path.basename(result.path), siblingFn)
+						queryTester.includedInQuery(relativePath, path.basename(relativePath), siblingFn)
 							.then(included => {
 								if (included) {
 									onResult(result);
@@ -495,7 +489,8 @@ class TextSearchEngine {
 			useIgnoreFiles: !this.config.disregardIgnoreFiles,
 			followSymlinks: !this.config.ignoreSymlinks,
 			encoding: this.config.fileEncoding,
-			maxFileSize: this.config.maxFileSize
+			maxFileSize: this.config.maxFileSize,
+			maxResults: this.config.maxResults
 		};
 	}
 }
@@ -515,16 +510,12 @@ class FileSearchEngine {
 	private includePattern: glob.ParsedExpression;
 	private maxResults: number;
 	private exists: boolean;
-	// private maxFilesize: number;
 	private isLimitHit: boolean;
 	private resultCount: number;
 	private isCanceled: boolean;
 
 	private activeCancellationTokens: Set<CancellationTokenSource>;
 
-	// private filesWalked: number;
-	// private directoriesWalked: number;
-
 	private globalExcludePattern: glob.ParsedExpression;
 
 	constructor(private config: ISearchQuery, private provider: vscode.SearchProvider, private _pfs: typeof pfs) {
@@ -532,14 +523,10 @@ class FileSearchEngine {
 		this.includePattern = config.includePattern && glob.parse(config.includePattern);
 		this.maxResults = config.maxResults || null;
 		this.exists = config.exists;
-		// this.maxFilesize = config.maxFileSize || null;
 		this.resultCount = 0;
 		this.isLimitHit = false;
 		this.activeCancellationTokens = new Set<CancellationTokenSource>();
 
-		// this.filesWalked = 0;
-		// this.directoriesWalked = 0;
-
 		if (this.filePattern) {
 			this.normalizedFilePatternLowercase = strings.stripWildcards(this.filePattern).toLowerCase();
 		}
@@ -553,87 +540,68 @@ class FileSearchEngine {
 		this.activeCancellationTokens = new Set();
 	}
 
-	public search(): PPromise<{ isLimitHit: boolean }, IInternalFileMatch> {
+	public search(): PPromise<IInternalSearchComplete, IInternalFileMatch> {
 		const folderQueries = this.config.folderQueries;
 
-		return new PPromise<{ isLimitHit: boolean }, IInternalFileMatch>((resolve, reject, _onResult) => {
+		return new PPromise((resolve, reject, _onResult) => {
 			const onResult = (match: IInternalFileMatch) => {
 				this.resultCount++;
 				_onResult(match);
 			};
 
 			// Support that the file pattern is a full path to a file that exists
-			this.checkFilePatternAbsoluteMatch().then(({ exists, size }) => {
-				if (this.isCanceled) {
-					return resolve({ isLimitHit: this.isLimitHit });
-				}
+			if (this.isCanceled) {
+				return resolve({ limitHit: this.isLimitHit, cacheKeys: [] });
+			}
 
-				// Report result from file pattern if matching
-				if (exists) {
-					onResult({
-						base: URI.file(this.filePattern),
-						basename: path.basename(this.filePattern),
-						size
+			// For each extra file
+			if (this.config.extraFileResources) {
+				this.config.extraFileResources
+					.forEach(extraFile => {
+						const extraFileStr = extraFile.toString(); // ?
+						const basename = path.basename(extraFileStr);
+						if (this.globalExcludePattern && this.globalExcludePattern(extraFileStr, basename)) {
+							return; // excluded
+						}
+
+						// File: Check for match on file pattern and include pattern
+						this.matchFile(onResult, { base: extraFile, basename });
 					});
+			}
 
-					// Optimization: a match on an absolute path is a good result and we do not
-					// continue walking the entire root paths array for other matches because
-					// it is very unlikely that another file would match on the full absolute path
-					return resolve({ isLimitHit: this.isLimitHit });
-				}
+			// For each root folder
+			PPromise.join(folderQueries.map(fq => {
+				return this.searchInFolder(fq).then(null, null, onResult);
+			})).then(cacheKeys => {
+				resolve({ limitHit: this.isLimitHit, cacheKeys });
+			}, (errs: Error[]) => {
+				const errMsg = errs
+					.map(err => toErrorMessage(err))
+					.filter(msg => !!msg)[0];
 
-				// For each extra file
-				if (this.config.extraFileResources) {
-					this.config.extraFileResources
-						.forEach(extraFile => {
-							const extraFileStr = extraFile.toString(); // ?
-							const basename = path.basename(extraFileStr);
-							if (this.globalExcludePattern && this.globalExcludePattern(extraFileStr, basename)) {
-								return; // excluded
-							}
-
-							// File: Check for match on file pattern and include pattern
-							this.matchFile(onResult, { base: extraFile, basename });
-						});
-				}
-
-				// For each root folder
-				PPromise.join(folderQueries.map(fq => {
-					return this.searchInFolder(fq).then(null, null, onResult);
-				})).then(() => {
-					resolve({ isLimitHit: this.isLimitHit });
-				}, (errs: Error[]) => {
-					const errMsg = errs
-						.map(err => toErrorMessage(err))
-						.filter(msg => !!msg)[0];
-
-					reject(new Error(errMsg));
-				});
+				reject(new Error(errMsg));
 			});
 		});
 	}
 
-	private searchInFolder(fq: IFolderQuery<URI>): PPromise<void, IInternalFileMatch> {
+	private searchInFolder(fq: IFolderQuery<URI>): PPromise<string, IInternalFileMatch> {
 		let cancellation = new CancellationTokenSource();
 		return new PPromise((resolve, reject, onResult) => {
 			const options = this.getSearchOptionsForFolder(fq);
-			let filePatternSeen = false;
 			const tree = this.initDirectoryTree();
 
 			const queryTester = new QueryGlobTester(this.config, fq);
 			const noSiblingsClauses = !queryTester.hasSiblingExcludeClauses();
 
-			const onProviderResult = (relativePath: string) => {
+			const onProviderResult = (result: URI) => {
 				if (this.isCanceled) {
 					return;
 				}
 
-				if (noSiblingsClauses) {
-					if (relativePath === this.filePattern) {
-						filePatternSeen = true;
-					}
+				const relativePath = path.relative(fq.folder.fsPath, result.fsPath);
 
-					const basename = path.basename(relativePath);
+				if (noSiblingsClauses) {
+					const basename = path.basename(result.fsPath);
 					this.matchFile(onResult, { base: fq.folder, relativePath, basename });
 
 					return;
@@ -643,10 +611,21 @@ class FileSearchEngine {
 				this.addDirectoryEntries(tree, fq.folder, relativePath, onResult);
 			};
 
-			new TPromise(resolve => process.nextTick(resolve))
+			let folderCacheKey: string;
+			new TPromise(_resolve => process.nextTick(_resolve))
 				.then(() => {
 					this.activeCancellationTokens.add(cancellation);
-					return this.provider.provideFileSearchResults(options, { report: onProviderResult }, cancellation.token);
+
+					folderCacheKey = this.config.cacheKey && (this.config.cacheKey + '_' + fq.folder.fsPath);
+
+					return this.provider.provideFileSearchResults(
+						{
+							pattern: this.config.filePattern || '',
+							cacheKey: folderCacheKey
+						},
+						options,
+						{ report: onProviderResult },
+						cancellation.token);
 				})
 				.then(() => {
 					this.activeCancellationTokens.delete(cancellation);
@@ -655,18 +634,16 @@ class FileSearchEngine {
 					}
 
 					if (noSiblingsClauses && this.isLimitHit) {
-						if (!filePatternSeen) {
-							// If the limit was hit, check whether filePattern is an exact relative match because it must be included
-							return this.checkFilePatternRelativeMatch(fq.folder).then(({ exists, size }) => {
-								if (exists) {
-									onResult({
-										base: fq.folder,
-										relativePath: this.filePattern,
-										basename: path.basename(this.filePattern),
-									});
-								}
-							});
-						}
+						// If the limit was hit, check whether filePattern is an exact relative match because it must be included
+						return this.checkFilePatternRelativeMatch(fq.folder).then(({ exists, size }) => {
+							if (exists) {
+								onResult({
+									base: fq.folder,
+									relativePath: this.filePattern,
+									basename: path.basename(this.filePattern),
+								});
+							}
+						});
 					}
 
 					this.matchDirectoryTree(tree, queryTester, onResult);
@@ -674,7 +651,7 @@ class FileSearchEngine {
 				}).then(
 					() => {
 						cancellation.dispose();
-						resolve(undefined);
+						resolve(folderCacheKey);
 					},
 					err => {
 						cancellation.dispose();
@@ -692,7 +669,8 @@ class FileSearchEngine {
 			excludes,
 			includes,
 			useIgnoreFiles: !this.config.disregardIgnoreFiles,
-			followSymlinks: !this.config.ignoreSymlinks
+			followSymlinks: !this.config.ignoreSymlinks,
+			maxResults: this.config.maxResults
 		};
 	}
 
@@ -734,7 +712,6 @@ class FileSearchEngine {
 		const self = this;
 		const filePattern = this.filePattern;
 		function matchDirectory(entries: IDirectoryEntry[]) {
-			// self.directoriesWalked++;
 			for (let i = 0, n = entries.length; i < n; i++) {
 				const entry = entries[i];
 				const { relativePath, basename } = entry;
@@ -751,7 +728,6 @@ class FileSearchEngine {
 				if (sub) {
 					matchDirectory(sub);
 				} else {
-					// self.filesWalked++;
 					if (relativePath === filePattern) {
 						continue; // ignore file if its path matches with the file pattern because that is already matched above
 					}
@@ -767,44 +743,6 @@ class FileSearchEngine {
 		matchDirectory(rootEntries);
 	}
 
-	public getStats(): any {
-		return null;
-		// return {
-		// 	fromCache: false,
-		// 	traversal: Traversal[this.traversal],
-		// 	errors: this.errors,
-		// 	fileWalkStartTime: this.fileWalkStartTime,
-		// 	fileWalkResultTime: Date.now(),
-		// 	directoriesWalked: this.directoriesWalked,
-		// 	filesWalked: this.filesWalked,
-		// 	resultCount: this.resultCount,
-		// 	cmdForkResultTime: this.cmdForkResultTime,
-		// 	cmdResultCount: this.cmdResultCount
-		// };
-	}
-
-	/**
-	 * Return whether the file pattern is an absolute path to a file that exists.
-	 * TODO@roblou should use FS provider?
-	 */
-	private checkFilePatternAbsoluteMatch(): TPromise<{ exists: boolean, size?: number }> {
-		if (!this.filePattern || !path.isAbsolute(this.filePattern)) {
-			return TPromise.wrap({ exists: false });
-		}
-
-		return this._pfs.stat(this.filePattern)
-			.then(stat => {
-				return {
-					exists: !stat.isDirectory(),
-					size: stat.size
-				};
-			}, err => {
-				return {
-					exists: false
-				};
-			});
-	}
-
 	private checkFilePatternRelativeMatch(base: URI): TPromise<{ exists: boolean, size?: number }> {
 		if (!this.filePattern || path.isAbsolute(this.filePattern) || base.scheme !== 'file') {
 			return TPromise.wrap({ exists: false });
@@ -851,263 +789,69 @@ class FileSearchEngine {
 	}
 }
 
+interface IInternalSearchComplete {
+	limitHit: boolean;
+	cacheKeys: string[];
+}
+
 class FileSearchManager {
 
 	private static readonly BATCH_SIZE = 512;
 
-	private caches: { [cacheKey: string]: Cache; } = Object.create(null);
+	private readonly expandedCacheKeys = new Map<string, string[]>();
 
-	constructor(private telemetryCallback: (eventName: string, data: any) => void, private _pfs: typeof pfs) { }
+	constructor(private _pfs: typeof pfs) { }
 
-	public fileSearch(config: ISearchQuery, provider: vscode.SearchProvider): PPromise<ISearchCompleteStats, OneOrMore<IFileMatch>> {
-		if (config.sortByScore) {
-			let sortedSearch = this.trySortedSearchFromCache(config);
-			if (!sortedSearch) {
-				const engineConfig = config.maxResults ?
-					{
-						...config,
-						...{ maxResults: null }
-					} :
-					config;
-
-				const engine = new FileSearchEngine(engineConfig, provider, this._pfs);
-				sortedSearch = this.doSortedSearch(engine, provider, config);
-			}
-
-			return new PPromise<ISearchCompleteStats, OneOrMore<IFileMatch>>((c, e, p) => {
-				process.nextTick(() => { // allow caller to register progress callback first
-					sortedSearch.then(([result, rawMatches]) => {
-						const serializedMatches = rawMatches.map(rawMatch => this.rawMatchToSearchItem(rawMatch));
-						this.sendProgress(serializedMatches, p, FileSearchManager.BATCH_SIZE);
-						c(result);
-					}, e, p);
-				});
-			}, () => {
-				sortedSearch.cancel();
-			});
-		}
-
-		let searchPromise: PPromise<void, OneOrMore<IInternalFileMatch>>;
-		return new PPromise<ISearchCompleteStats, OneOrMore<IFileMatch>>((c, e, p) => {
+	fileSearch(config: ISearchQuery, provider: vscode.SearchProvider): PPromise<ISearchCompleteStats, IFileMatch[]> {
+		let searchP: PPromise;
+		return new PPromise<ISearchCompleteStats, IFileMatch[]>((c, e, p) => {
 			const engine = new FileSearchEngine(config, provider, this._pfs);
-			searchPromise = this.doSearch(engine, provider, FileSearchManager.BATCH_SIZE)
-				.then(c, e, progress => {
-					if (Array.isArray(progress)) {
-						p(progress.map(m => this.rawMatchToSearchItem(m)));
-					} else if ((<IInternalFileMatch>progress).relativePath) {
-						p(this.rawMatchToSearchItem(<IInternalFileMatch>progress));
+
+			searchP = this.doSearch(engine, FileSearchManager.BATCH_SIZE).then(
+				result => {
+					if (config.cacheKey) {
+						this.expandedCacheKeys.set(config.cacheKey, result.cacheKeys);
 					}
+
+					c({
+						limitHit: result.limitHit
+					});
+				},
+				e,
+				progress => {
+					p(progress.map(m => this.rawMatchToSearchItem(m)));
 				});
 		}, () => {
-			searchPromise.cancel();
+			if (searchP) {
+				searchP.cancel();
+			}
 		});
 	}
 
+	clearCache(cacheKey: string, provider: vscode.SearchProvider): void {
+		if (!this.expandedCacheKeys.has(cacheKey)) {
+			return;
+		}
+
+		this.expandedCacheKeys.get(cacheKey).forEach(key => provider.clearCache(key));
+		this.expandedCacheKeys.delete(cacheKey);
+	}
+
 	private rawMatchToSearchItem(match: IInternalFileMatch): IFileMatch {
 		return {
-			resource: joinPath(match.base, match.relativePath)
+			resource: resources.joinPath(match.base, match.relativePath)
 		};
 	}
 
-	private doSortedSearch(engine: FileSearchEngine, provider: vscode.SearchProvider, config: IRawSearchQuery): PPromise<[ISearchCompleteStats, IInternalFileMatch[]]> {
-		let searchPromise: PPromise<void, OneOrMore<IInternalFileMatch>>;
-		let allResultsPromise = new PPromise<[ISearchCompleteStats, IInternalFileMatch[]], OneOrMore<IInternalFileMatch>>((c, e, p) => {
-			let results: IInternalFileMatch[] = [];
-			searchPromise = this.doSearch(engine, provider, -1)
-				.then(result => {
-					c([result, results]);
-					this.telemetryCallback('fileSearch', null);
-				}, e, progress => {
-					if (Array.isArray(progress)) {
-						results = progress;
-					} else {
-						p(progress);
-					}
-				});
-		}, () => {
-			searchPromise.cancel();
-		});
-
-		let cache: Cache;
-		if (config.cacheKey) {
-			cache = this.getOrCreateCache(config.cacheKey);
-			cache.resultsToSearchCache[config.filePattern] = allResultsPromise;
-			allResultsPromise.then(null, err => {
-				delete cache.resultsToSearchCache[config.filePattern];
-			});
-			allResultsPromise = this.preventCancellation(allResultsPromise);
-		}
-
-		let chained: TPromise<void>;
-		return new PPromise<[ISearchCompleteStats, IInternalFileMatch[]]>((c, e, p) => {
-			chained = allResultsPromise.then(([result, results]) => {
-				const scorerCache: ScorerCache = cache ? cache.scorerCache : Object.create(null);
-				const unsortedResultTime = Date.now();
-				return this.sortResults(config, results, scorerCache)
-					.then(sortedResults => {
-						const sortedResultTime = Date.now();
-
-						c([{
-							stats: {
-								...result.stats,
-								...{ unsortedResultTime, sortedResultTime }
-							},
-							limitHit: result.limitHit || typeof config.maxResults === 'number' && results.length > config.maxResults
-						}, sortedResults]);
-					});
-			}, e, p);
-		}, () => {
-			chained.cancel();
-		});
-	}
-
-	private getOrCreateCache(cacheKey: string): Cache {
-		const existing = this.caches[cacheKey];
-		if (existing) {
-			return existing;
-		}
-		return this.caches[cacheKey] = new Cache();
-	}
-
-	private trySortedSearchFromCache(config: IRawSearchQuery): TPromise<[ISearchCompleteStats, IInternalFileMatch[]]> {
-		const cache = config.cacheKey && this.caches[config.cacheKey];
-		if (!cache) {
-			return undefined;
-		}
-
-		const cacheLookupStartTime = Date.now();
-		const cached = this.getResultsFromCache(cache, config.filePattern);
-		if (cached) {
-			let chained: TPromise<void>;
-			return new TPromise<[ISearchCompleteStats, IInternalFileMatch[]]>((c, e) => {
-				chained = cached.then(([result, results, cacheStats]) => {
-					const cacheLookupResultTime = Date.now();
-					return this.sortResults(config, results, cache.scorerCache)
-						.then(sortedResults => {
-							const sortedResultTime = Date.now();
-
-							const stats: ICachedSearchStats = {
-								fromCache: true,
-								cacheLookupStartTime: cacheLookupStartTime,
-								cacheFilterStartTime: cacheStats.cacheFilterStartTime,
-								cacheLookupResultTime: cacheLookupResultTime,
-								cacheEntryCount: cacheStats.cacheFilterResultCount,
-								resultCount: results.length
-							};
-							if (config.sortByScore) {
-								stats.unsortedResultTime = cacheLookupResultTime;
-								stats.sortedResultTime = sortedResultTime;
-							}
-							if (!cacheStats.cacheWasResolved) {
-								stats.joined = result.stats;
-							}
-							c([
-								{
-									limitHit: result.limitHit || typeof config.maxResults === 'number' && results.length > config.maxResults,
-									stats: stats
-								},
-								sortedResults
-							]);
-						});
-				}, e);
-			}, () => {
-				chained.cancel();
-			});
-		}
-		return undefined;
-	}
-
-	private sortResults(config: IRawSearchQuery, results: IInternalFileMatch[], scorerCache: ScorerCache): TPromise<IInternalFileMatch[]> {
-		// we use the same compare function that is used later when showing the results using fuzzy scoring
-		// this is very important because we are also limiting the number of results by config.maxResults
-		// and as such we want the top items to be included in this result set if the number of items
-		// exceeds config.maxResults.
-		const query = prepareQuery(config.filePattern);
-		const compare = (matchA: IInternalFileMatch, matchB: IInternalFileMatch) => compareItemsByScore(matchA, matchB, query, true, FileMatchItemAccessor, scorerCache);
-
-		return arrays.topAsync(results, compare, config.maxResults, 10000);
-	}
-
-	private sendProgress(results: IFileMatch[], progressCb: (batch: IFileMatch[]) => void, batchSize: number) {
-		if (batchSize && batchSize > 0) {
-			for (let i = 0; i < results.length; i += batchSize) {
-				progressCb(results.slice(i, i + batchSize));
-			}
-		} else {
-			progressCb(results);
-		}
-	}
-
-	private getResultsFromCache(cache: Cache, searchValue: string): PPromise<[ISearchCompleteStats, IInternalFileMatch[], CacheStats]> {
-		if (path.isAbsolute(searchValue)) {
-			return null; // bypass cache if user looks up an absolute path where matching goes directly on disk
-		}
-
-		// Find cache entries by prefix of search value
-		const hasPathSep = searchValue.indexOf(path.sep) >= 0;
-		let cached: PPromise<[ISearchCompleteStats, IInternalFileMatch[]], OneOrMore<IInternalFileMatch>>;
-		let wasResolved: boolean;
-		for (let previousSearch in cache.resultsToSearchCache) {
-
-			// If we narrow down, we might be able to reuse the cached results
-			if (strings.startsWith(searchValue, previousSearch)) {
-				if (hasPathSep && previousSearch.indexOf(path.sep) < 0) {
-					continue; // since a path character widens the search for potential more matches, require it in previous search too
-				}
-
-				const c = cache.resultsToSearchCache[previousSearch];
-				c.then(() => { wasResolved = false; });
-				wasResolved = true;
-				cached = this.preventCancellation(c);
-				break;
-			}
-		}
-
-		if (!cached) {
-			return null;
-		}
-
-		return new PPromise<[ISearchCompleteStats, IInternalFileMatch[], CacheStats]>((c, e, p) => {
-			cached.then(([complete, cachedEntries]) => {
-				const cacheFilterStartTime = Date.now();
-
-				// Pattern match on results
-				let results: IInternalFileMatch[] = [];
-				const normalizedSearchValueLowercase = strings.stripWildcards(searchValue).toLowerCase();
-				for (let i = 0; i < cachedEntries.length; i++) {
-					let entry = cachedEntries[i];
-
-					// Check if this entry is a match for the search value
-					if (!strings.fuzzyContains(entry.relativePath, normalizedSearchValueLowercase)) {
-						continue;
-					}
-
-					results.push(entry);
-				}
-
-				c([complete, results, {
-					cacheWasResolved: wasResolved,
-					cacheFilterStartTime: cacheFilterStartTime,
-					cacheFilterResultCount: cachedEntries.length
-				}]);
-			}, e, p);
-		}, () => {
-			cached.cancel();
-		});
-	}
-
-	private doSearch(engine: FileSearchEngine, provider: vscode.SearchProvider, batchSize?: number): PPromise<ISearchCompleteStats, OneOrMore<IInternalFileMatch>> {
-		return new PPromise<ISearchCompleteStats, OneOrMore<IInternalFileMatch>>((c, e, p) => {
+	private doSearch(engine: FileSearchEngine, batchSize: number): PPromise<IInternalSearchComplete, IInternalFileMatch[]> {
+		return new PPromise((c, e, p) => {
 			let batch: IInternalFileMatch[] = [];
 			engine.search().then(result => {
 				if (batch.length) {
 					p(batch);
 				}
 
-				c({
-					limitHit: result.isLimitHit,
-					stats: engine.getStats() // TODO@roblou
-				});
+				c(result);
 			}, error => {
 				if (batch.length) {
 					p(batch);
@@ -1116,14 +860,10 @@ class FileSearchManager {
 				e(error);
 			}, match => {
 				if (match) {
-					if (batchSize) {
-						batch.push(match);
-						if (batchSize > 0 && batch.length >= batchSize) {
-							p(batch);
-							batch = [];
-						}
-					} else {
-						p(match);
+					batch.push(match);
+					if (batchSize > 0 && batch.length >= batchSize) {
+						p(batch);
+						batch = [];
 					}
 				}
 			});
@@ -1131,48 +871,4 @@ class FileSearchManager {
 			engine.cancel();
 		});
 	}
-
-	public clearCache(cacheKey: string): TPromise<void> {
-		delete this.caches[cacheKey];
-		return TPromise.as(undefined);
-	}
-
-	private preventCancellation<C, P>(promise: PPromise<C, P>): PPromise<C, P> {
-		return new PPromise<C, P>((c, e, p) => {
-			// Allow for piled up cancellations to come through first.
-			process.nextTick(() => {
-				promise.then(c, e, p);
-			});
-		}, () => {
-			// Do not propagate.
-		});
-	}
-}
-
-class Cache {
-
-	public resultsToSearchCache: { [searchValue: string]: PPromise<[ISearchCompleteStats, IInternalFileMatch[]], OneOrMore<IInternalFileMatch>>; } = Object.create(null);
-
-	public scorerCache: ScorerCache = Object.create(null);
-}
-
-const FileMatchItemAccessor = new class implements IItemAccessor<IInternalFileMatch> {
-
-	public getItemLabel(match: IInternalFileMatch): string {
-		return match.basename; // e.g. myFile.txt
-	}
-
-	public getItemDescription(match: IInternalFileMatch): string {
-		return match.relativePath.substr(0, match.relativePath.length - match.basename.length - 1); // e.g. some/path/to/file
-	}
-
-	public getItemPath(match: IInternalFileMatch): string {
-		return match.relativePath; // e.g. some/path/to/file/myFile.txt
-	}
-};
-
-interface CacheStats {
-	cacheWasResolved: boolean;
-	cacheFilterStartTime: number;
-	cacheFilterResultCount: number;
 }
diff --git a/src/vs/workbench/api/node/extHostTask.ts b/src/vs/workbench/api/node/extHostTask.ts
index 386a0ed6580..c8a40bb16a8 100644
--- a/src/vs/workbench/api/node/extHostTask.ts
+++ b/src/vs/workbench/api/node/extHostTask.ts
@@ -860,15 +860,23 @@ export class ExtHostTask implements ExtHostTaskShape {
 		}
 	}
 
-	public $provideTasks(handle: number): TPromise<tasks.TaskSet> {
+	public $provideTasks(handle: number, validTypes: { [key: string]: boolean; }): TPromise<tasks.TaskSet> {
 		let handler = this._handlers.get(handle);
 		if (!handler) {
 			return TPromise.wrapError<tasks.TaskSet>(new Error('no handler found'));
 		}
 		return asWinJsPromise(token => handler.provider.provideTasks(token)).then(value => {
+			let sanitized: vscode.Task[] = [];
+			for (let task of value) {
+				if (task.definition && validTypes[task.definition.type] === true) {
+					sanitized.push(task);
+				} else {
+					console.error(`Dropping task [${task.source}, ${task.name}]. Its type is not known to the system.`);
+				}
+			}
 			let workspaceFolders = this._workspaceService.getWorkspaceFolders();
 			return {
-				tasks: Tasks.from(value, workspaceFolders && workspaceFolders.length > 0 ? workspaceFolders[0] : undefined, handler.extension),
+				tasks: Tasks.from(sanitized, workspaceFolders && workspaceFolders.length > 0 ? workspaceFolders[0] : undefined, handler.extension),
 				extension: handler.extension
 			};
 		});
diff --git a/src/vs/workbench/api/node/extHostTerminalService.ts b/src/vs/workbench/api/node/extHostTerminalService.ts
index 5589c538331..956f724057e 100644
--- a/src/vs/workbench/api/node/extHostTerminalService.ts
+++ b/src/vs/workbench/api/node/extHostTerminalService.ts
@@ -62,7 +62,7 @@ export class BaseExtHostTerminal {
 		request.run(this._proxy, this._id);
 	}
 
-	protected _runQueuedRequests(id: number): void {
+	public _runQueuedRequests(id: number): void {
 		this._id = id;
 		this._idPromiseComplete(id);
 		this._queuedRequests.forEach((r) => {
@@ -77,7 +77,7 @@ export class ExtHostTerminal extends BaseExtHostTerminal implements vscode.Termi
 	private _pidPromiseComplete: (value: number) => any;
 
 	private readonly _onData: Emitter<string> = new Emitter<string>();
-	public get onData(): Event<string> {
+	public get onDidWriteData(): Event<string> {
 		// Tell the main side to start sending data if it's not already
 		this._proxy.$registerOnDataListener(this._id);
 		return this._onData && this._onData.event;
@@ -156,7 +156,7 @@ export class ExtHostTerminalRenderer extends BaseExtHostTerminal implements vsco
 	}
 
 	private readonly _onInput: Emitter<string> = new Emitter<string>();
-	public get onInput(): Event<string> {
+	public get onDidAcceptInput(): Event<string> {
 		this._checkDisposed();
 		this._queueApiRequest(this._proxy.$terminalRendererRegisterOnInputListener, [this._id]);
 		// Tell the main side to start sending data if it's not already
@@ -179,7 +179,7 @@ export class ExtHostTerminalRenderer extends BaseExtHostTerminal implements vsco
 		}
 		return {
 			rows: this._maximumDimensions.rows,
-			cols: this._maximumDimensions.cols
+			columns: this._maximumDimensions.columns
 		};
 	}
 
@@ -188,18 +188,19 @@ export class ExtHostTerminalRenderer extends BaseExtHostTerminal implements vsco
 		return this._onDidChangeMaximumDimensions && this._onDidChangeMaximumDimensions.event;
 	}
 
-	public get terminal(): Promise<ExtHostTerminal> {
-		return this._idPromise.then(id => this._fetchTerminal(id));
+	public get terminal(): ExtHostTerminal {
+		return this._terminal;
 	}
 
 	constructor(
 		proxy: MainThreadTerminalServiceShape,
 		private _name: string,
-		private _fetchTerminal: (id: number) => Promise<ExtHostTerminal>
+		private _terminal: ExtHostTerminal
 	) {
 		super(proxy);
 		this._proxy.$createTerminalRenderer(this._name).then(id => {
 			this._runQueuedRequests(id);
+			(<any>this._terminal)._runQueuedRequests(id);
 		});
 	}
 
@@ -212,8 +213,11 @@ export class ExtHostTerminalRenderer extends BaseExtHostTerminal implements vsco
 		this._onInput.fire(data);
 	}
 
-	public _setMaximumDimensions(cols: number, rows: number): void {
-		this._maximumDimensions = { cols, rows };
+	public _setMaximumDimensions(columns: number, rows: number): void {
+		if (this._maximumDimensions && this._maximumDimensions.columns === columns && this._maximumDimensions.rows === rows) {
+			return;
+		}
+		this._maximumDimensions = { columns, rows };
 		this._onDidChangeMaximumDimensions.fire(this.maximumDimensions);
 	}
 }
@@ -258,8 +262,13 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 	}
 
 	public createTerminalRenderer(name: string): vscode.TerminalRenderer {
-		const renderer = new ExtHostTerminalRenderer(this._proxy, name, (id) => this._getTerminalByIdEventually(id));
+		const terminal = new ExtHostTerminal(this._proxy, name);
+		terminal._setProcessId(undefined);
+		this._terminals.push(terminal);
+
+		const renderer = new ExtHostTerminalRenderer(this._proxy, name, terminal);
 		this._terminalRenderers.push(renderer);
+
 		return renderer;
 	}
 
@@ -267,18 +276,22 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 		const original = this._activeTerminal;
 		if (id === null) {
 			this._activeTerminal = undefined;
-		} else {
-			const terminal = this._getTerminalById(id);
-			if (terminal) {
-				this._activeTerminal = terminal;
+			if (original !== this._activeTerminal) {
+				this._onDidChangeActiveTerminal.fire(this._activeTerminal);
 			}
 		}
-		if (original !== this._activeTerminal) {
-			this._onDidChangeActiveTerminal.fire(this._activeTerminal);
-		}
+		this._performTerminalIdAction(id, terminal => {
+			if (terminal) {
+				this._activeTerminal = terminal;
+				if (original !== this._activeTerminal) {
+					this._onDidChangeActiveTerminal.fire(this._activeTerminal);
+				}
+			}
+		});
 	}
 
 	public $acceptTerminalProcessData(id: number, data: string): void {
+		// TODO: Queue requests, currently the first 100ms of data may get missed
 		const terminal = this._getTerminalById(id);
 		if (terminal) {
 			terminal._fireOnData(data);
@@ -322,16 +335,19 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 	}
 
 	public $acceptTerminalProcessId(id: number, processId: number): void {
-		let terminal = this._getTerminalById(id);
+		this._performTerminalIdAction(id, terminal => terminal._setProcessId(processId));
+	}
 
+	private _performTerminalIdAction(id: number, callback: (terminal: ExtHostTerminal) => void): void {
+		let terminal = this._getTerminalById(id);
 		if (terminal) {
-			terminal._setProcessId(processId);
+			callback(terminal);
 		} else {
 			// Retry one more time in case the terminal has not yet been initialized.
 			setTimeout(() => {
 				terminal = this._getTerminalById(id);
 				if (terminal) {
-					terminal._setProcessId(processId);
+					callback(terminal);
 				}
 			}, EXT_HOST_CREATION_DELAY);
 		}
diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts
index 19b4b163334..a63e56f9972 100644
--- a/src/vs/workbench/api/node/extHostTreeViews.ts
+++ b/src/vs/workbench/api/node/extHostTreeViews.ts
@@ -125,7 +125,7 @@ class ExtHostTreeView<T> extends Disposable {
 	private elements: Map<TreeItemHandle, T> = new Map<TreeItemHandle, T>();
 	private nodes: Map<T, TreeNode> = new Map<T, TreeNode>();
 
-	private _visible: boolean = true;
+	private _visible: boolean = false;
 	get visible(): boolean { return this._visible; }
 
 	private _selectedHandles: TreeItemHandle[] = [];
diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts
index 677f2a9ccf4..81e6a53db9a 100644
--- a/src/vs/workbench/api/node/extHostTypes.ts
+++ b/src/vs/workbench/api/node/extHostTypes.ts
@@ -495,11 +495,17 @@ export class TextEdit {
 }
 
 
+export interface IFileOperationOptions {
+	overwrite?: boolean;
+	ignoreIfExists?: boolean;
+	recursive?: boolean;
+}
+
 export interface IFileOperation {
 	_type: 1;
 	from: URI;
 	to: URI;
-	options?: { overwrite?: boolean, ignoreIfExists?: boolean; };
+	options?: IFileOperationOptions;
 }
 
 export interface IFileTextEdit {
@@ -520,8 +526,8 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit {
 		this._edits.push({ _type: 1, from: undefined, to: uri, options });
 	}
 
-	deleteFile(uri: vscode.Uri): void {
-		this._edits.push({ _type: 1, from: uri, to: undefined });
+	deleteFile(uri: vscode.Uri, options?: { recursive?: boolean }): void {
+		this._edits.push({ _type: 1, from: uri, to: undefined, options });
 	}
 
 	replace(uri: URI, range: Range, newText: string): void {
@@ -593,8 +599,8 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit {
 		return values(textEdits);
 	}
 
-	_allEntries(): ([URI, TextEdit[]] | [URI, URI, { overwrite?: boolean, ignoreIfExists?: boolean }])[] {
-		let res: ([URI, TextEdit[]] | [URI, URI, { overwrite?: boolean, ignoreIfExists?: boolean }])[] = [];
+	_allEntries(): ([URI, TextEdit[]] | [URI, URI, IFileOperationOptions])[] {
+		let res: ([URI, TextEdit[]] | [URI, URI, IFileOperationOptions])[] = [];
 		for (let edit of this._edits) {
 			if (edit._type === 1) {
 				res.push([edit.from, edit.to, edit.options]);
diff --git a/src/vs/workbench/api/node/extHostWorkspace.ts b/src/vs/workbench/api/node/extHostWorkspace.ts
index 7fd58a461ac..2afd565ed8a 100644
--- a/src/vs/workbench/api/node/extHostWorkspace.ts
+++ b/src/vs/workbench/api/node/extHostWorkspace.ts
@@ -4,22 +4,25 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
-import { Event, Emitter } from 'vs/base/common/event';
-import { normalize } from 'vs/base/common/paths';
+import { posix, relative, join } from 'path';
 import { delta as arrayDelta } from 'vs/base/common/arrays';
-import { relative, posix } from 'path';
-import { Workspace, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IWorkspaceData, ExtHostWorkspaceShape, MainContext, MainThreadWorkspaceShape, IMainContext, MainThreadMessageServiceShape } from './extHost.protocol';
-import * as vscode from 'vscode';
-import { compare } from 'vs/base/common/strings';
+import { Emitter, Event } from 'vs/base/common/event';
 import { TernarySearchTree } from 'vs/base/common/map';
-import { basenameOrAuthority, isEqual } from 'vs/base/common/resources';
+import { normalize } from 'vs/base/common/paths';
 import { isLinux } from 'vs/base/common/platform';
-import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
+import { basenameOrAuthority, isEqual } from 'vs/base/common/resources';
+import { compare } from 'vs/base/common/strings';
+import URI from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
 import { localize } from 'vs/nls';
-import { Severity } from 'vs/platform/notification/common/notification';
 import { ILogService } from 'vs/platform/log/common/log';
+import { Severity } from 'vs/platform/notification/common/notification';
+import { IQueryOptions, IRawFileMatch2 } from 'vs/platform/search/common/search';
+import { Workspace, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { Range } from 'vs/workbench/api/node/extHostTypes';
+import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
+import * as vscode from 'vscode';
+import { ExtHostWorkspaceShape, IMainContext, IWorkspaceData, MainContext, MainThreadMessageServiceShape, MainThreadWorkspaceShape } from './extHost.protocol';
 
 function isFolderEqual(folderA: URI, folderB: URI): boolean {
 	return isEqual(folderA, folderB, !isLinux);
@@ -145,6 +148,8 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
 
 	readonly onDidChangeWorkspace: Event<vscode.WorkspaceFoldersChangeEvent> = this._onDidChangeWorkspace.event;
 
+	private readonly _activeSearchCallbacks = [];
+
 	constructor(
 		mainContext: IMainContext,
 		data: IWorkspaceData,
@@ -324,8 +329,8 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
 
 		// Events
 		this._onDidChangeWorkspace.fire(Object.freeze({
-			added: Object.freeze<vscode.WorkspaceFolder[]>(added),
-			removed: Object.freeze<vscode.WorkspaceFolder[]>(removed)
+			added,
+			removed,
 		}));
 	}
 
@@ -358,13 +363,70 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
 			}
 		}
 
-		const result = this._proxy.$startSearch(includePattern, includeFolder, excludePatternOrDisregardExcludes, maxResults, requestId);
+		const result = this._proxy.$startFileSearch(includePattern, includeFolder, excludePatternOrDisregardExcludes, maxResults, requestId);
 		if (token) {
 			token.onCancellationRequested(() => this._proxy.$cancelSearch(requestId));
 		}
 		return result.then(data => Array.isArray(data) ? data.map(URI.revive) : []);
 	}
 
+	findTextInFiles(query: vscode.TextSearchQuery, options: vscode.FindTextInFilesOptions, callback: (result: vscode.TextSearchResult) => void, extensionId: string, token?: vscode.CancellationToken) {
+		this._logService.trace(`extHostWorkspace#findTextInFiles: textSearch, extension: ${extensionId}, entryPoint: findTextInFiles`);
+
+		const requestId = ExtHostWorkspace._requestIdPool++;
+
+		const globPatternToString = (pattern: vscode.GlobPattern | string) => {
+			if (typeof pattern === 'string') {
+				return pattern;
+			}
+
+			return join(pattern.base, pattern.pattern);
+		};
+
+		const queryOptions: IQueryOptions = {
+			ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined,
+			disregardIgnoreFiles: typeof options.useIgnoreFiles === 'boolean' ? !options.useIgnoreFiles : undefined,
+			disregardExcludeSettings: options.exclude === null,
+			fileEncoding: options.encoding,
+			maxResults: options.maxResults,
+
+			includePattern: options.include && globPatternToString(options.include),
+			excludePattern: options.exclude && globPatternToString(options.exclude)
+		};
+
+		this._activeSearchCallbacks[requestId] = p => {
+			p.lineMatches.forEach(lineMatch => {
+				lineMatch.offsetAndLengths.forEach(offsetAndLength => {
+					const range = new Range(lineMatch.lineNumber, offsetAndLength[0], lineMatch.lineNumber, offsetAndLength[0] + offsetAndLength[1]);
+					callback({
+						uri: URI.revive(p.resource),
+						preview: { text: lineMatch.preview, match: range },
+						range
+					});
+				});
+			});
+		};
+
+		if (token) {
+			token.onCancellationRequested(() => this._proxy.$cancelSearch(requestId));
+		}
+
+		return this._proxy.$startTextSearch(query, queryOptions, requestId).then(
+			() => {
+				delete this._activeSearchCallbacks[requestId];
+			},
+			err => {
+				delete this._activeSearchCallbacks[requestId];
+				return TPromise.wrapError(err);
+			});
+	}
+
+	$handleTextSearchResult(result: IRawFileMatch2, requestId: number): void {
+		if (this._activeSearchCallbacks[requestId]) {
+			this._activeSearchCallbacks[requestId](result);
+		}
+	}
+
 	saveAll(includeUntitled?: boolean): Thenable<boolean> {
 		return this._proxy.$saveAll(includeUntitled);
 	}
diff --git a/src/vs/workbench/browser/actions.ts b/src/vs/workbench/browser/actions.ts
index 8538ba3afdb..12ec83d310b 100644
--- a/src/vs/workbench/browser/actions.ts
+++ b/src/vs/workbench/browser/actions.ts
@@ -20,35 +20,35 @@ export class ActionBarContributor {
 	/**
 	 * Returns true if this contributor has actions for the given context.
 	 */
-	public hasActions(context: any): boolean {
+	hasActions(context: any): boolean {
 		return false;
 	}
 
 	/**
 	 * Returns an array of primary actions in the given context.
 	 */
-	public getActions(context: any): IAction[] {
+	getActions(context: any): IAction[] {
 		return [];
 	}
 
 	/**
 	 * Returns true if this contributor has secondary actions for the given context.
 	 */
-	public hasSecondaryActions(context: any): boolean {
+	hasSecondaryActions(context: any): boolean {
 		return false;
 	}
 
 	/**
 	 * Returns an array of secondary actions in the given context.
 	 */
-	public getSecondaryActions(context: any): IAction[] {
+	getSecondaryActions(context: any): IAction[] {
 		return [];
 	}
 
 	/**
 	 * Can return a specific IActionItem to render the given action.
 	 */
-	public getActionItem(context: any, action: Action): BaseActionItem {
+	getActionItem(context: any, action: Action): BaseActionItem {
 		return null;
 	}
 }
@@ -80,7 +80,7 @@ export class ContributableActionProvider implements IActionProvider {
 		};
 	}
 
-	public hasActions(tree: ITree, element: any): boolean {
+	hasActions(tree: ITree, element: any): boolean {
 		const context = this.toContext(tree, element);
 
 		const contributors = this.registry.getActionBarContributors(Scope.VIEWER);
@@ -94,7 +94,7 @@ export class ContributableActionProvider implements IActionProvider {
 		return false;
 	}
 
-	public getActions(tree: ITree, element: any): TPromise<IAction[]> {
+	getActions(tree: ITree, element: any): TPromise<IAction[]> {
 		const actions: IAction[] = [];
 		const context = this.toContext(tree, element);
 
@@ -110,7 +110,7 @@ export class ContributableActionProvider implements IActionProvider {
 		return TPromise.as(prepareActions(actions));
 	}
 
-	public hasSecondaryActions(tree: ITree, element: any): boolean {
+	hasSecondaryActions(tree: ITree, element: any): boolean {
 		const context = this.toContext(tree, element);
 
 		const contributors = this.registry.getActionBarContributors(Scope.VIEWER);
@@ -124,7 +124,7 @@ export class ContributableActionProvider implements IActionProvider {
 		return false;
 	}
 
-	public getSecondaryActions(tree: ITree, element: any): TPromise<IAction[]> {
+	getSecondaryActions(tree: ITree, element: any): TPromise<IAction[]> {
 		const actions: IAction[] = [];
 		const context = this.toContext(tree, element);
 
@@ -140,7 +140,7 @@ export class ContributableActionProvider implements IActionProvider {
 		return TPromise.as(prepareActions(actions));
 	}
 
-	public getActionItem(tree: ITree, element: any, action: Action): BaseActionItem {
+	getActionItem(tree: ITree, element: any, action: Action): BaseActionItem {
 		const contributors = this.registry.getActionBarContributors(Scope.VIEWER);
 		const context = this.toContext(tree, element);
 
@@ -279,7 +279,7 @@ class ActionBarRegistry implements IActionBarRegistry {
 	private actionBarContributorInstances: { [scope: string]: ActionBarContributor[] } = Object.create(null);
 	private instantiationService: IInstantiationService;
 
-	public setInstantiationService(service: IInstantiationService): void {
+	setInstantiationService(service: IInstantiationService): void {
 		this.instantiationService = service;
 
 		while (this.actionBarContributorConstructors.length > 0) {
@@ -301,7 +301,7 @@ class ActionBarRegistry implements IActionBarRegistry {
 		return this.actionBarContributorInstances[scope] || [];
 	}
 
-	public getActionBarActionsForContext(scope: string, context: any): IAction[] {
+	getActionBarActionsForContext(scope: string, context: any): IAction[] {
 		const actions: IAction[] = [];
 
 		// Go through contributors for scope
@@ -316,7 +316,7 @@ class ActionBarRegistry implements IActionBarRegistry {
 		return actions;
 	}
 
-	public getSecondaryActionBarActionsForContext(scope: string, context: any): IAction[] {
+	getSecondaryActionBarActionsForContext(scope: string, context: any): IAction[] {
 		const actions: IAction[] = [];
 
 		// Go through contributors
@@ -331,7 +331,7 @@ class ActionBarRegistry implements IActionBarRegistry {
 		return actions;
 	}
 
-	public getActionItemForContext(scope: string, context: any, action: Action): BaseActionItem {
+	getActionItemForContext(scope: string, context: any, action: Action): BaseActionItem {
 		const contributors = this.getContributors(scope);
 		for (let i = 0; i < contributors.length; i++) {
 			const contributor = contributors[i];
@@ -344,7 +344,7 @@ class ActionBarRegistry implements IActionBarRegistry {
 		return null;
 	}
 
-	public registerActionBarContributor(scope: string, ctor: IConstructorSignature0<ActionBarContributor>): void {
+	registerActionBarContributor(scope: string, ctor: IConstructorSignature0<ActionBarContributor>): void {
 		if (!this.instantiationService) {
 			this.actionBarContributorConstructors.push({
 				scope: scope,
@@ -355,7 +355,7 @@ class ActionBarRegistry implements IActionBarRegistry {
 		}
 	}
 
-	public getActionBarContributors(scope: string): ActionBarContributor[] {
+	getActionBarContributors(scope: string): ActionBarContributor[] {
 		return this.getContributors(scope).slice(0);
 	}
 }
diff --git a/src/vs/workbench/browser/actions/toggleActivityBarVisibility.ts b/src/vs/workbench/browser/actions/toggleActivityBarVisibility.ts
index 3018aeda0d8..bb784e89472 100644
--- a/src/vs/workbench/browser/actions/toggleActivityBarVisibility.ts
+++ b/src/vs/workbench/browser/actions/toggleActivityBarVisibility.ts
@@ -15,8 +15,8 @@ import { IPartService, Parts } from 'vs/workbench/services/part/common/partServi
 
 export class ToggleActivityBarVisibilityAction extends Action {
 
-	public static readonly ID = 'workbench.action.toggleActivityBarVisibility';
-	public static readonly LABEL = nls.localize('toggleActivityBar', "Toggle Activity Bar Visibility");
+	static readonly ID = 'workbench.action.toggleActivityBarVisibility';
+	static readonly LABEL = nls.localize('toggleActivityBar', "Toggle Activity Bar Visibility");
 
 	private static readonly activityBarVisibleKey = 'workbench.activityBar.visible';
 
@@ -31,7 +31,7 @@ export class ToggleActivityBarVisibilityAction extends Action {
 		this.enabled = !!this.partService;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const visibility = this.partService.isVisible(Parts.ACTIVITYBAR_PART);
 		const newVisibilityValue = !visibility;
 
diff --git a/src/vs/workbench/browser/actions/toggleCenteredLayout.ts b/src/vs/workbench/browser/actions/toggleCenteredLayout.ts
index 663541555e4..2ab19d4ca4d 100644
--- a/src/vs/workbench/browser/actions/toggleCenteredLayout.ts
+++ b/src/vs/workbench/browser/actions/toggleCenteredLayout.ts
@@ -13,8 +13,8 @@ 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");
+	static readonly ID = 'workbench.action.toggleCenteredLayout';
+	static readonly LABEL = nls.localize('toggleCenteredLayout', "Toggle Centered Layout");
 
 	constructor(
 		id: string,
@@ -25,7 +25,7 @@ class ToggleCenteredLayout extends Action {
 		this.enabled = !!this.partService;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.partService.centerEditorLayout(!this.partService.isEditorLayoutCentered());
 
 		return TPromise.as(null);
diff --git a/src/vs/workbench/browser/actions/toggleEditorLayout.ts b/src/vs/workbench/browser/actions/toggleEditorLayout.ts
index 1e57dc2392a..8f553a8fa22 100644
--- a/src/vs/workbench/browser/actions/toggleEditorLayout.ts
+++ b/src/vs/workbench/browser/actions/toggleEditorLayout.ts
@@ -19,8 +19,8 @@ import { IEditorGroupsService, GroupOrientation } from 'vs/workbench/services/gr
 
 export class ToggleEditorLayoutAction extends Action {
 
-	public static readonly ID = 'workbench.action.toggleEditorGroupLayout';
-	public static readonly LABEL = nls.localize('flipLayout', "Toggle Vertical/Horizontal Editor Layout");
+	static readonly ID = 'workbench.action.toggleEditorGroupLayout';
+	static readonly LABEL = nls.localize('flipLayout', "Toggle Vertical/Horizontal Editor Layout");
 
 	private toDispose: IDisposable[];
 
@@ -48,14 +48,14 @@ export class ToggleEditorLayoutAction extends Action {
 		this.enabled = this.editorGroupService.count > 1;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const newOrientation = (this.editorGroupService.orientation === GroupOrientation.VERTICAL) ? GroupOrientation.HORIZONTAL : GroupOrientation.VERTICAL;
 		this.editorGroupService.setGroupOrientation(newOrientation);
 
 		return TPromise.as(null);
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.toDispose = dispose(this.toDispose);
 
 		super.dispose();
diff --git a/src/vs/workbench/browser/actions/toggleSidebarPosition.ts b/src/vs/workbench/browser/actions/toggleSidebarPosition.ts
index b0a223a0ab6..3de25a53e7e 100644
--- a/src/vs/workbench/browser/actions/toggleSidebarPosition.ts
+++ b/src/vs/workbench/browser/actions/toggleSidebarPosition.ts
@@ -15,8 +15,8 @@ import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configur
 
 export class ToggleSidebarPositionAction extends Action {
 
-	public static readonly ID = 'workbench.action.toggleSidebarPosition';
-	public static readonly LABEL = nls.localize('toggleSidebarPosition', "Toggle Side Bar Position");
+	static readonly ID = 'workbench.action.toggleSidebarPosition';
+	static readonly LABEL = nls.localize('toggleSidebarPosition', "Toggle Side Bar Position");
 
 	private static readonly sidebarPositionConfigurationKey = 'workbench.sideBar.location';
 
@@ -31,7 +31,7 @@ export class ToggleSidebarPositionAction extends Action {
 		this.enabled = !!this.partService && !!this.configurationService;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const position = this.partService.getSideBarPosition();
 		const newPositionValue = (position === Position.LEFT) ? 'right' : 'left';
 
diff --git a/src/vs/workbench/browser/actions/toggleSidebarVisibility.ts b/src/vs/workbench/browser/actions/toggleSidebarVisibility.ts
index 72afba76346..95f4d8a21e8 100644
--- a/src/vs/workbench/browser/actions/toggleSidebarVisibility.ts
+++ b/src/vs/workbench/browser/actions/toggleSidebarVisibility.ts
@@ -15,8 +15,8 @@ import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 
 export class ToggleSidebarVisibilityAction extends Action {
 
-	public static readonly ID = 'workbench.action.toggleSidebarVisibility';
-	public static readonly LABEL = nls.localize('toggleSidebar', "Toggle Side Bar Visibility");
+	static readonly ID = 'workbench.action.toggleSidebarVisibility';
+	static readonly LABEL = nls.localize('toggleSidebar', "Toggle Side Bar Visibility");
 
 	constructor(
 		id: string,
@@ -28,7 +28,7 @@ export class ToggleSidebarVisibilityAction extends Action {
 		this.enabled = !!this.partService;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const hideSidebar = this.partService.isVisible(Parts.SIDEBAR_PART);
 		return this.partService.setSideBarHidden(hideSidebar);
 	}
diff --git a/src/vs/workbench/browser/actions/toggleStatusbarVisibility.ts b/src/vs/workbench/browser/actions/toggleStatusbarVisibility.ts
index da09591e2d0..2fe83369bb8 100644
--- a/src/vs/workbench/browser/actions/toggleStatusbarVisibility.ts
+++ b/src/vs/workbench/browser/actions/toggleStatusbarVisibility.ts
@@ -15,8 +15,8 @@ import { IPartService, Parts } from 'vs/workbench/services/part/common/partServi
 
 export class ToggleStatusbarVisibilityAction extends Action {
 
-	public static readonly ID = 'workbench.action.toggleStatusbarVisibility';
-	public static readonly LABEL = nls.localize('toggleStatusbar', "Toggle Status Bar Visibility");
+	static readonly ID = 'workbench.action.toggleStatusbarVisibility';
+	static readonly LABEL = nls.localize('toggleStatusbar', "Toggle Status Bar Visibility");
 
 	private static readonly statusbarVisibleKey = 'workbench.statusBar.visible';
 
@@ -31,7 +31,7 @@ export class ToggleStatusbarVisibilityAction extends Action {
 		this.enabled = !!this.partService;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const visibility = this.partService.isVisible(Parts.STATUSBAR_PART);
 		const newVisibilityValue = !visibility;
 
diff --git a/src/vs/workbench/browser/actions/toggleTabsVisibility.ts b/src/vs/workbench/browser/actions/toggleTabsVisibility.ts
index 9bf5df9e7a3..ebfb647ffab 100644
--- a/src/vs/workbench/browser/actions/toggleTabsVisibility.ts
+++ b/src/vs/workbench/browser/actions/toggleTabsVisibility.ts
@@ -15,8 +15,8 @@ import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 
 export class ToggleTabsVisibilityAction extends Action {
 
-	public static readonly ID = 'workbench.action.toggleTabsVisibility';
-	public static readonly LABEL = nls.localize('toggleTabs', "Toggle Tab Visibility");
+	static readonly ID = 'workbench.action.toggleTabsVisibility';
+	static readonly LABEL = nls.localize('toggleTabs', "Toggle Tab Visibility");
 
 	private static readonly tabsVisibleKey = 'workbench.editor.showTabs';
 
@@ -28,7 +28,7 @@ export class ToggleTabsVisibilityAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const visibility = this.configurationService.getValue<string>(ToggleTabsVisibilityAction.tabsVisibleKey);
 		const newVisibilityValue = !visibility;
 
diff --git a/src/vs/workbench/browser/actions/toggleZenMode.ts b/src/vs/workbench/browser/actions/toggleZenMode.ts
index 3d58623c10c..955a69799ce 100644
--- a/src/vs/workbench/browser/actions/toggleZenMode.ts
+++ b/src/vs/workbench/browser/actions/toggleZenMode.ts
@@ -14,8 +14,8 @@ import { IPartService } from 'vs/workbench/services/part/common/partService';
 
 class ToggleZenMode extends Action {
 
-	public static readonly ID = 'workbench.action.toggleZenMode';
-	public static readonly LABEL = nls.localize('toggleZenMode', "Toggle Zen Mode");
+	static readonly ID = 'workbench.action.toggleZenMode';
+	static readonly LABEL = nls.localize('toggleZenMode', "Toggle Zen Mode");
 
 	constructor(
 		id: string,
@@ -26,7 +26,7 @@ class ToggleZenMode extends Action {
 		this.enabled = !!this.partService;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.partService.toggleZenMode();
 		return TPromise.as(null);
 	}
diff --git a/src/vs/workbench/browser/actions/workspaceActions.ts b/src/vs/workbench/browser/actions/workspaceActions.ts
index a916997520c..bf7b0adc209 100644
--- a/src/vs/workbench/browser/actions/workspaceActions.ts
+++ b/src/vs/workbench/browser/actions/workspaceActions.ts
@@ -93,7 +93,7 @@ export class AddRootFolderAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		return this.commandService.executeCommand(ADD_ROOT_FOLDER_COMMAND_ID);
 	}
 }
@@ -113,7 +113,7 @@ export class GlobalRemoveRootFolderAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const state = this.contextService.getWorkbenchState();
 
 		// Workspace / Folder
@@ -148,7 +148,7 @@ export class SaveWorkspaceAsAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		return this.getNewWorkspaceConfigPath().then(configPath => {
 			if (configPath) {
 				switch (this.contextService.getWorkbenchState()) {
@@ -192,15 +192,15 @@ export class OpenWorkspaceAction extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any, data?: ITelemetryData): TPromise<any> {
+	run(event?: any, data?: ITelemetryData): TPromise<any> {
 		return this.windowService.pickWorkspaceAndOpen({ telemetryExtraData: data, dialogOptions: { defaultPath: defaultWorkspacePath(this.contextService, this.historyService, this.environmentService) } });
 	}
 }
 
 export class OpenWorkspaceConfigFileAction extends Action {
 
-	public static readonly ID = 'workbench.action.openWorkspaceConfigFile';
-	public static readonly LABEL = nls.localize('openWorkspaceConfigFile', "Open Workspace Configuration File");
+	static readonly ID = 'workbench.action.openWorkspaceConfigFile';
+	static readonly LABEL = nls.localize('openWorkspaceConfigFile', "Open Workspace Configuration File");
 
 	constructor(
 		id: string,
@@ -213,15 +213,15 @@ export class OpenWorkspaceConfigFileAction extends Action {
 		this.enabled = !!this.workspaceContextService.getWorkspace().configuration;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		return this.editorService.openEditor({ resource: this.workspaceContextService.getWorkspace().configuration });
 	}
 }
 
 export class DuplicateWorkspaceInNewWindowAction extends Action {
 
-	public static readonly ID = 'workbench.action.duplicateWorkspaceInNewWindow';
-	public static readonly LABEL = nls.localize('duplicateWorkspaceInNewWindow', "Duplicate Workspace in New Window");
+	static readonly ID = 'workbench.action.duplicateWorkspaceInNewWindow';
+	static readonly LABEL = nls.localize('duplicateWorkspaceInNewWindow', "Duplicate Workspace in New Window");
 
 	constructor(
 		id: string,
@@ -234,7 +234,7 @@ export class DuplicateWorkspaceInNewWindowAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const folders = this.workspaceContextService.getWorkspace().folders;
 
 		return this.workspacesService.createWorkspace(folders).then(newWorkspace => {
diff --git a/src/vs/workbench/browser/composite.ts b/src/vs/workbench/browser/composite.ts
index 006fcc3c3a5..390f7f51b9d 100644
--- a/src/vs/workbench/browser/composite.ts
+++ b/src/vs/workbench/browser/composite.ts
@@ -12,8 +12,7 @@ import { IComposite, ICompositeControl } from 'vs/workbench/common/composite';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IConstructorSignature0, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IFocusTracker, trackFocus, Dimension } from 'vs/base/browser/dom';
+import { trackFocus, Dimension } from 'vs/base/browser/dom';
 
 /**
  * Composites are layed out in the sidebar and panel part of the workbench. At a time only one composite
@@ -26,17 +25,27 @@ import { IFocusTracker, trackFocus, Dimension } from 'vs/base/browser/dom';
  * layout and focus call, but only one create and dispose call.
  */
 export abstract class Composite extends Component implements IComposite {
-	private readonly _onTitleAreaUpdate: Emitter<void>;
-	private readonly _onDidFocus: Emitter<void>;
 
-	private _focusTracker?: IFocusTracker;
-	private _focusListenerDisposable?: IDisposable;
+	private readonly _onTitleAreaUpdate: Emitter<void> = this._register(new Emitter<void>());
+	get onTitleAreaUpdate(): Event<void> { return this._onTitleAreaUpdate.event; }
+
+	private _onDidFocus: Emitter<void>;
+	get onDidFocus(): Event<void> {
+		if (!this._onDidFocus) {
+			this._onDidFocus = this._register(new Emitter<void>());
+
+			const focusTracker = this._register(trackFocus(this.getContainer()));
+			this._register(focusTracker.onDidFocus(() => this._onDidFocus.fire()));
+		}
+
+		return this._onDidFocus.event;
+	}
+
+	protected actionRunner: IActionRunner;
 
 	private visible: boolean;
 	private parent: HTMLElement;
 
-	protected actionRunner: IActionRunner;
-
 	/**
 	 * Create a new composite with the given ID and context.
 	 */
@@ -48,11 +57,9 @@ export abstract class Composite extends Component implements IComposite {
 		super(id, themeService);
 
 		this.visible = false;
-		this._onTitleAreaUpdate = new Emitter<void>();
-		this._onDidFocus = new Emitter<void>();
 	}
 
-	public getTitle(): string {
+	getTitle(): string {
 		return null;
 	}
 
@@ -60,10 +67,6 @@ export abstract class Composite extends Component implements IComposite {
 		return this._telemetryService;
 	}
 
-	public get onTitleAreaUpdate(): Event<void> {
-		return this._onTitleAreaUpdate.event;
-	}
-
 	/**
 	 * Note: Clients should not call this method, the workbench calls this
 	 * method. Calling it otherwise may result in unexpected behavior.
@@ -73,31 +76,23 @@ export abstract class Composite extends Component implements IComposite {
 	 * Note that DOM-dependent calculations should be performed from the setVisible()
 	 * call. Only then the composite will be part of the DOM.
 	 */
-	public create(parent: HTMLElement): TPromise<void> {
+	create(parent: HTMLElement): TPromise<void> {
 		this.parent = parent;
 
 		return TPromise.as(null);
 	}
 
-	public updateStyles(): void {
+	updateStyles(): void {
 		super.updateStyles();
 	}
 
 	/**
 	 * Returns the container this composite is being build in.
 	 */
-	public getContainer(): HTMLElement {
+	getContainer(): HTMLElement {
 		return this.parent;
 	}
 
-	public get onDidFocus(): Event<any> {
-		this._focusTracker = trackFocus(this.getContainer());
-		this._focusListenerDisposable = this._focusTracker.onDidFocus(() => {
-			this._onDidFocus.fire();
-		});
-		return this._onDidFocus.event;
-	}
-
 	/**
 	 * Note: Clients should not call this method, the workbench calls this
 	 * method. Calling it otherwise may result in unexpected behavior.
@@ -110,7 +105,7 @@ export abstract class Composite extends Component implements IComposite {
 	 * to do a long running operation from this call. Typically this operation should be
 	 * fast though because setVisible might be called many times during a session.
 	 */
-	public setVisible(visible: boolean): TPromise<void> {
+	setVisible(visible: boolean): TPromise<void> {
 		this.visible = visible;
 
 		return TPromise.as(null);
@@ -119,19 +114,19 @@ export abstract class Composite extends Component implements IComposite {
 	/**
 	 * Called when this composite should receive keyboard focus.
 	 */
-	public focus(): void {
+	focus(): void {
 		// Subclasses can implement
 	}
 
 	/**
 	 * Layout the contents of this composite using the provided dimensions.
 	 */
-	public abstract layout(dimension: Dimension): void;
+	abstract layout(dimension: Dimension): void;
 
 	/**
 	 * Returns an array of actions to show in the action bar of the composite.
 	 */
-	public getActions(): IAction[] {
+	getActions(): IAction[] {
 		return [];
 	}
 
@@ -139,14 +134,14 @@ export abstract class Composite extends Component implements IComposite {
 	 * Returns an array of actions to show in the action bar of the composite
 	 * in a less prominent way then action from getActions.
 	 */
-	public getSecondaryActions(): IAction[] {
+	getSecondaryActions(): IAction[] {
 		return [];
 	}
 
 	/**
 	 * Returns an array of actions to show in the context menu of the composite
 	 */
-	public getContextMenuActions(): IAction[] {
+	getContextMenuActions(): IAction[] {
 		return [];
 	}
 
@@ -156,7 +151,7 @@ export abstract class Composite extends Component implements IComposite {
 	 * of an action. Returns null to indicate that the action is not rendered through
 	 * an action item.
 	 */
-	public getActionItem(action: IAction): IActionItem {
+	getActionItem(action: IAction): IActionItem {
 		return null;
 	}
 
@@ -164,7 +159,7 @@ export abstract class Composite extends Component implements IComposite {
 	 * Returns the instance of IActionRunner to use with this composite for the
 	 * composite tool bar.
 	 */
-	public getActionRunner(): IActionRunner {
+	getActionRunner(): IActionRunner {
 		if (!this.actionRunner) {
 			this.actionRunner = new ActionRunner();
 		}
@@ -185,43 +180,28 @@ export abstract class Composite extends Component implements IComposite {
 	/**
 	 * Returns true if this composite is currently visible and false otherwise.
 	 */
-	public isVisible(): boolean {
+	isVisible(): boolean {
 		return this.visible;
 	}
 
 	/**
 	 * Returns the underlying composite control or null if it is not accessible.
 	 */
-	public getControl(): ICompositeControl {
+	getControl(): ICompositeControl {
 		return null;
 	}
-
-	public dispose(): void {
-		this._onTitleAreaUpdate.dispose();
-		this._onDidFocus.dispose();
-
-		if (this._focusTracker) {
-			this._focusTracker.dispose();
-		}
-
-		if (this._focusListenerDisposable) {
-			this._focusListenerDisposable.dispose();
-		}
-
-		super.dispose();
-	}
 }
 
 /**
  * A composite descriptor is a leightweight descriptor of a composite in the workbench.
  */
 export abstract class CompositeDescriptor<T extends Composite> {
-	public id: string;
-	public name: string;
-	public cssClass: string;
-	public order: number;
-	public keybindingId: string;
-	public enabled: boolean;
+	id: string;
+	name: string;
+	cssClass: string;
+	order: number;
+	keybindingId: string;
+	enabled: boolean;
 
 	private ctor: IConstructorSignature0<T>;
 
@@ -235,7 +215,7 @@ export abstract class CompositeDescriptor<T extends Composite> {
 		this.keybindingId = keybindingId;
 	}
 
-	public instantiate(instantiationService: IInstantiationService): T {
+	instantiate(instantiationService: IInstantiationService): T {
 		return instantiationService.createInstance(this.ctor);
 	}
 }
@@ -243,13 +223,9 @@ export abstract class CompositeDescriptor<T extends Composite> {
 export abstract class CompositeRegistry<T extends Composite> {
 
 	private readonly _onDidRegister: Emitter<CompositeDescriptor<T>> = new Emitter<CompositeDescriptor<T>>();
-	readonly onDidRegister: Event<CompositeDescriptor<T>> = this._onDidRegister.event;
+	get onDidRegister(): Event<CompositeDescriptor<T>> { return this._onDidRegister.event; }
 
-	private composites: CompositeDescriptor<T>[];
-
-	constructor() {
-		this.composites = [];
-	}
+	private composites: CompositeDescriptor<T>[] = [];
 
 	protected registerComposite(descriptor: CompositeDescriptor<T>): void {
 		if (this.compositeById(descriptor.id) !== null) {
@@ -260,7 +236,7 @@ export abstract class CompositeRegistry<T extends Composite> {
 		this._onDidRegister.fire(descriptor);
 	}
 
-	public getComposite(id: string): CompositeDescriptor<T> {
+	getComposite(id: string): CompositeDescriptor<T> {
 		return this.compositeById(id);
 	}
 
diff --git a/src/vs/workbench/browser/editor.ts b/src/vs/workbench/browser/editor.ts
index 525a263c59f..0b3c009786a 100644
--- a/src/vs/workbench/browser/editor.ts
+++ b/src/vs/workbench/browser/editor.ts
@@ -66,19 +66,19 @@ export class EditorDescriptor implements IEditorDescriptor {
 		this.name = name;
 	}
 
-	public instantiate(instantiationService: IInstantiationService): BaseEditor {
+	instantiate(instantiationService: IInstantiationService): BaseEditor {
 		return instantiationService.createInstance(this.ctor);
 	}
 
-	public getId(): string {
+	getId(): string {
 		return this.id;
 	}
 
-	public getName(): string {
+	getName(): string {
 		return this.name;
 	}
 
-	public describes(obj: any): boolean {
+	describes(obj: any): boolean {
 		return obj instanceof BaseEditor && (<BaseEditor>obj).getId() === this.id;
 	}
 }
@@ -86,15 +86,11 @@ export class EditorDescriptor implements IEditorDescriptor {
 const INPUT_DESCRIPTORS_PROPERTY = '__$inputDescriptors';
 
 class EditorRegistry implements IEditorRegistry {
-	private editors: EditorDescriptor[];
+	private editors: EditorDescriptor[] = [];
 
-	constructor() {
-		this.editors = [];
-	}
-
-	public registerEditor(descriptor: EditorDescriptor, editorInputDescriptor: SyncDescriptor<EditorInput>): void;
-	public registerEditor(descriptor: EditorDescriptor, editorInputDescriptor: SyncDescriptor<EditorInput>[]): void;
-	public registerEditor(descriptor: EditorDescriptor, editorInputDescriptor: any): void {
+	registerEditor(descriptor: EditorDescriptor, editorInputDescriptor: SyncDescriptor<EditorInput>): void;
+	registerEditor(descriptor: EditorDescriptor, editorInputDescriptor: SyncDescriptor<EditorInput>[]): void;
+	registerEditor(descriptor: EditorDescriptor, editorInputDescriptor: any): void {
 
 		// Support both non-array and array parameter
 		let inputDescriptors: SyncDescriptor<EditorInput>[] = [];
@@ -109,7 +105,7 @@ class EditorRegistry implements IEditorRegistry {
 		this.editors.push(descriptor);
 	}
 
-	public getEditor(input: EditorInput): EditorDescriptor {
+	getEditor(input: EditorInput): EditorDescriptor {
 		const findEditorDescriptors = (input: EditorInput, byInstanceOf?: boolean): EditorDescriptor[] => {
 			const matchingDescriptors: EditorDescriptor[] = [];
 
@@ -161,7 +157,7 @@ class EditorRegistry implements IEditorRegistry {
 		return null;
 	}
 
-	public getEditorById(editorId: string): EditorDescriptor {
+	getEditorById(editorId: string): EditorDescriptor {
 		for (let i = 0; i < this.editors.length; i++) {
 			const editor = this.editors[i];
 			if (editor.getId() === editorId) {
@@ -172,15 +168,15 @@ class EditorRegistry implements IEditorRegistry {
 		return null;
 	}
 
-	public getEditors(): EditorDescriptor[] {
+	getEditors(): EditorDescriptor[] {
 		return this.editors.slice(0);
 	}
 
-	public setEditors(editorsToSet: EditorDescriptor[]): void {
+	setEditors(editorsToSet: EditorDescriptor[]): void {
 		this.editors = editorsToSet;
 	}
 
-	public getEditorInputs(): any[] {
+	getEditorInputs(): any[] {
 		const inputClasses: any[] = [];
 		for (let i = 0; i < this.editors.length; i++) {
 			const editor = this.editors[i];
diff --git a/src/vs/workbench/browser/labels.ts b/src/vs/workbench/browser/labels.ts
index b71f424b816..0db9f7aae65 100644
--- a/src/vs/workbench/browser/labels.ts
+++ b/src/vs/workbench/browser/labels.ts
@@ -15,7 +15,6 @@ import { getPathLabel, IWorkspaceFolderProvider } from 'vs/base/common/labels';
 import { PLAINTEXT_MODE_ID } from 'vs/editor/common/modes/modesRegistry';
 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 { IModelService } from 'vs/editor/common/services/modelService';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
@@ -40,16 +39,15 @@ export interface IResourceLabelOptions extends IIconLabelValueOptions {
 
 export class ResourceLabel extends IconLabel {
 
-	private toDispose: IDisposable[];
+	private _onDidRender = this._register(new Emitter<void>());
+	get onDidRender(): Event<void> { return this._onDidRender.event; }
+
 	private label: IResourceLabel;
 	private options: IResourceLabelOptions;
 	private computedIconClasses: string[];
 	private lastKnownConfiguredLangId: string;
 	private computedPathLabel: string;
 
-	private _onDidRender = new Emitter<void>();
-	readonly onDidRender: Event<void> = this._onDidRender.event;
-
 	constructor(
 		container: HTMLElement,
 		options: IIconLabelCreationOptions,
@@ -64,27 +62,25 @@ export class ResourceLabel extends IconLabel {
 	) {
 		super(container, options);
 
-		this.toDispose = [];
-
 		this.registerListeners();
 	}
 
 	private registerListeners(): void {
 
 		// update when extensions are registered with potentially new languages
-		this.toDispose.push(this.extensionService.onDidRegisterExtensions(() => this.render(true /* clear cache */)));
+		this._register(this.extensionService.onDidRegisterExtensions(() => this.render(true /* clear cache */)));
 
 		// react to model mode changes
-		this.toDispose.push(this.modelService.onModelModeChanged(e => this.onModelModeChanged(e)));
+		this._register(this.modelService.onModelModeChanged(e => this.onModelModeChanged(e)));
 
 		// react to file decoration changes
-		this.toDispose.push(this.decorationsService.onDidChangeDecorations(this.onFileDecorationsChanges, this));
+		this._register(this.decorationsService.onDidChangeDecorations(this.onFileDecorationsChanges, this));
 
 		// react to theme changes
-		this.toDispose.push(this.themeService.onThemeChange(() => this.render(false)));
+		this._register(this.themeService.onThemeChange(() => this.render(false)));
 
 		// react to files.associations changes
-		this.toDispose.push(this.configurationService.onDidChangeConfiguration(e => {
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(FILES_ASSOCIATIONS_CONFIG)) {
 				this.render(true /* clear cache */);
 			}
@@ -121,7 +117,7 @@ export class ResourceLabel extends IconLabel {
 		}
 	}
 
-	public setLabel(label: IResourceLabel, options?: IResourceLabelOptions): void {
+	setLabel(label: IResourceLabel, options?: IResourceLabelOptions): void {
 		const hasResourceChanged = this.hasResourceChanged(label, options);
 
 		this.label = label;
@@ -156,7 +152,7 @@ export class ResourceLabel extends IconLabel {
 		return true;
 	}
 
-	public clear(): void {
+	clear(): void {
 		this.label = void 0;
 		this.options = void 0;
 		this.lastKnownConfiguredLangId = void 0;
@@ -239,10 +235,9 @@ export class ResourceLabel extends IconLabel {
 		this._onDidRender.fire();
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		super.dispose();
 
-		this.toDispose = dispose(this.toDispose);
 		this.label = void 0;
 		this.options = void 0;
 		this.lastKnownConfiguredLangId = void 0;
@@ -253,7 +248,7 @@ export class ResourceLabel extends IconLabel {
 
 export class EditorLabel extends ResourceLabel {
 
-	public setEditor(editor: IEditorInput, options?: IResourceLabelOptions): void {
+	setEditor(editor: IEditorInput, options?: IResourceLabelOptions): void {
 		this.setLabel({
 			resource: toResource(editor, { supportSideBySide: true }),
 			name: editor.getName(),
@@ -286,7 +281,7 @@ export class FileLabel extends ResourceLabel {
 		super(container, options, extensionService, contextService, configurationService, modeService, modelService, environmentService, decorationsService, themeService);
 	}
 
-	public setFile(resource: uri, options?: IFileLabelOptions): void {
+	setFile(resource: uri, options?: IFileLabelOptions): void {
 		const hideLabel = options && options.hideLabel;
 		let name: string;
 		if (!hideLabel) {
diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index 6979382b238..01fe21c6a4c 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -219,7 +219,7 @@ export class WorkbenchLayout extends Disposable implements IVerticalSashLayoutPr
 	}
 
 	@memoize
-	private get partLayoutInfo() {
+	public get partLayoutInfo() {
 		return {
 			titlebar: {
 				height: TITLE_BAR_HEIGHT
diff --git a/src/vs/workbench/browser/panel.ts b/src/vs/workbench/browser/panel.ts
index 8b05f420b0b..f046282ca36 100644
--- a/src/vs/workbench/browser/panel.ts
+++ b/src/vs/workbench/browser/panel.ts
@@ -31,28 +31,28 @@ export class PanelRegistry extends CompositeRegistry<Panel> {
 	/**
 	 * Registers a panel to the platform.
 	 */
-	public registerPanel(descriptor: PanelDescriptor): void {
+	registerPanel(descriptor: PanelDescriptor): void {
 		super.registerComposite(descriptor);
 	}
 
 	/**
 	 * Returns an array of registered panels known to the platform.
 	 */
-	public getPanels(): PanelDescriptor[] {
+	getPanels(): PanelDescriptor[] {
 		return this.getComposites() as PanelDescriptor[];
 	}
 
 	/**
 	 * Sets the id of the panel that should open on startup by default.
 	 */
-	public setDefaultPanelId(id: string): void {
+	setDefaultPanelId(id: string): void {
 		this.defaultPanelId = id;
 	}
 
 	/**
 	 * Gets the id of the panel that should open on startup by default.
 	 */
-	public getDefaultPanelId(): string {
+	getDefaultPanelId(): string {
 		return this.defaultPanelId;
 	}
 }
@@ -76,7 +76,7 @@ export abstract class TogglePanelAction extends Action {
 		this.panelId = panelId;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 
 		if (this.isPanelShowing()) {
 			return this.partService.setPanelHidden(true);
diff --git a/src/vs/workbench/browser/part.ts b/src/vs/workbench/browser/part.ts
index 8f147ff99bc..a7ea04b455e 100644
--- a/src/vs/workbench/browser/part.ts
+++ b/src/vs/workbench/browser/part.ts
@@ -47,7 +47,7 @@ export abstract class Part extends Component {
 	 *
 	 * Called to create title and content area of the part.
 	 */
-	public create(parent: HTMLElement): void {
+	create(parent: HTMLElement): void {
 		this.parent = parent;
 		this.titleArea = this.createTitleArea(parent);
 		this.contentArea = this.createContentArea(parent);
@@ -60,7 +60,7 @@ export abstract class Part extends Component {
 	/**
 	 * Returns the overall part container.
 	 */
-	public getContainer(): HTMLElement {
+	getContainer(): HTMLElement {
 		return this.parent;
 	}
 
@@ -95,7 +95,7 @@ export abstract class Part extends Component {
 	/**
 	 * Layout title and content area in the given dimension.
 	 */
-	public layout(dimension: Dimension): Dimension[] {
+	layout(dimension: Dimension): Dimension[] {
 		return this.partLayout.layout(dimension);
 	}
 }
@@ -106,7 +106,7 @@ export class PartLayout {
 
 	constructor(container: HTMLElement, private options: IPartOptions, titleArea: HTMLElement, private contentArea: HTMLElement) { }
 
-	public layout(dimension: Dimension): Dimension[] {
+	layout(dimension: Dimension): Dimension[] {
 		const { width, height } = dimension;
 
 		// Return the applied sizes to title and content
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
index 366b81fe440..6d1fa885470 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
@@ -21,8 +21,9 @@ import { activeContrastBorder, focusBorder } from 'vs/platform/theme/common/colo
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ActivityAction, ActivityActionItem, ICompositeBarColors } from 'vs/workbench/browser/parts/compositebar/compositeBarActions';
+import { ActivityAction, ActivityActionItem, ICompositeBarColors, ToggleCompositePinnedAction, ICompositeBar } from 'vs/workbench/browser/parts/compositebar/compositeBarActions';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import URI from 'vs/base/common/uri';
 
 export class ViewletActivityAction extends ActivityAction {
 
@@ -39,7 +40,7 @@ export class ViewletActivityAction extends ActivityAction {
 		super(activity);
 	}
 
-	public run(event: any): TPromise<any> {
+	run(event: any): TPromise<any> {
 		if (event instanceof MouseEvent && event.button === 2) {
 			return TPromise.as(false); // do not run on right click
 		}
@@ -85,7 +86,7 @@ export class ToggleViewletAction extends Action {
 		super(_viewlet.id, _viewlet.name);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const sideBarVisible = this.partService.isVisible(Parts.SIDEBAR_PART);
 		const activeViewlet = this.viewletService.getActiveViewlet();
 
@@ -116,7 +117,7 @@ export class GlobalActivityActionItem extends ActivityActionItem {
 		super(action, { draggable: false, colors, icon: true }, themeService);
 	}
 
-	public render(container: HTMLElement): void {
+	render(container: HTMLElement): void {
 		super.render(container);
 
 		// Context menus are triggered on mouse down so that an item can be picked
@@ -158,6 +159,41 @@ export class GlobalActivityActionItem extends ActivityActionItem {
 	}
 }
 
+export class PlaceHolderViewletActivityAction extends ViewletActivityAction {
+
+	constructor(
+		id: string, iconUrl: URI,
+		@IViewletService viewletService: IViewletService,
+		@IPartService partService: IPartService,
+		@ITelemetryService telemetryService: ITelemetryService
+	) {
+		super({ id, name: id, cssClass: `extensionViewlet-placeholder-${id.replace(/\./g, '-')}` }, viewletService, partService, telemetryService);
+
+		const iconClass = `.monaco-workbench > .activitybar .monaco-action-bar .action-label.${this.class}`; // Generate Placeholder CSS to show the icon in the activity bar
+		DOM.createCSSRule(iconClass, `-webkit-mask: url('${iconUrl || ''}') no-repeat 50% 50%`);
+		this.enabled = false;
+	}
+
+	setActivity(activity: IActivity): void {
+		this.activity = activity;
+		this.enabled = true;
+	}
+}
+
+export class PlaceHolderToggleCompositePinnedAction extends ToggleCompositePinnedAction {
+
+	constructor(id: string, compositeBar: ICompositeBar) {
+		super({ id, name: id, cssClass: void 0 }, compositeBar);
+
+		this.enabled = false;
+	}
+
+	setActivity(activity: IActivity): void {
+		this.label = activity.name;
+		this.enabled = true;
+	}
+}
+
 registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 
 	// Styling with Outline color (e.g. high contrast theme)
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
index f2bfc53e344..13f5812793c 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -10,10 +10,10 @@ import * as nls from 'vs/nls';
 import { illegalArgument } from 'vs/base/common/errors';
 import { $ } from 'vs/base/browser/builder';
 import { ActionsOrientation, ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { GlobalActivityExtensions, IGlobalActivityRegistry, IActivity } from 'vs/workbench/common/activity';
+import { GlobalActivityExtensions, IGlobalActivityRegistry } from 'vs/workbench/common/activity';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Part } from 'vs/workbench/browser/part';
-import { GlobalActivityActionItem, GlobalActivityAction, ViewletActivityAction, ToggleViewletAction } from 'vs/workbench/browser/parts/activitybar/activitybarActions';
+import { GlobalActivityActionItem, GlobalActivityAction, ViewletActivityAction, ToggleViewletAction, PlaceHolderToggleCompositePinnedAction, PlaceHolderViewletActivityAction } from 'vs/workbench/browser/parts/activitybar/activitybarActions';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IBadge } from 'vs/workbench/services/activity/common/activity';
 import { IPartService, Parts, Position as SideBarPosition } from 'vs/workbench/services/part/common/partService';
@@ -24,12 +24,11 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { ACTIVITY_BAR_BACKGROUND, ACTIVITY_BAR_BORDER, ACTIVITY_BAR_FOREGROUND, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_DRAG_AND_DROP_BACKGROUND } from 'vs/workbench/common/theme';
 import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { CompositeBar } from 'vs/workbench/browser/parts/compositebar/compositeBar';
-import { ToggleCompositePinnedAction, ICompositeBar } from 'vs/workbench/browser/parts/compositebar/compositeBarActions';
+import { ToggleCompositePinnedAction } from 'vs/workbench/browser/parts/compositebar/compositeBarActions';
 import { ViewletDescriptor } from 'vs/workbench/browser/viewlet';
-import { Dimension, createCSSRule } from 'vs/base/browser/dom';
+import { Dimension } from 'vs/base/browser/dom';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import URI from 'vs/base/common/uri';
 
 interface IPlaceholderComposite {
@@ -39,6 +38,7 @@ interface IPlaceholderComposite {
 
 export class ActivitybarPart extends Part {
 
+	private static readonly ACTION_HEIGHT = 50;
 	private static readonly PINNED_VIEWLETS = 'workbench.activity.pinnedViewlets';
 	private static readonly PLACEHOLDER_VIEWLETS = 'workbench.activity.placeholderViewlets';
 	private static readonly COLORS = {
@@ -47,18 +47,15 @@ export class ActivitybarPart extends Part {
 		badgeForeground: ACTIVITY_BAR_BADGE_FOREGROUND,
 		dragAndDropBackground: ACTIVITY_BAR_DRAG_AND_DROP_BACKGROUND
 	};
-	private static readonly ACTION_HEIGHT = 50;
-
-	public _serviceBrand: any;
 
 	private dimension: Dimension;
 
 	private globalActionBar: ActionBar;
-	private globalActivityIdToActions: { [globalActivityId: string]: GlobalActivityAction; };
+	private globalActivityIdToActions: { [globalActivityId: string]: GlobalActivityAction; } = Object.create(null);
 
 	private placeholderComposites: IPlaceholderComposite[] = [];
 	private compositeBar: CompositeBar;
-	private compositeActions: { [compositeId: string]: { activityAction: ViewletActivityAction, pinnedAction: ToggleCompositePinnedAction } };
+	private compositeActions: { [compositeId: string]: { activityAction: ViewletActivityAction, pinnedAction: ToggleCompositePinnedAction } } = Object.create(null);
 
 	constructor(
 		id: string,
@@ -67,14 +64,11 @@ export class ActivitybarPart extends Part {
 		@IPartService private partService: IPartService,
 		@IThemeService themeService: IThemeService,
 		@IStorageService private storageService: IStorageService,
-		@IExtensionService extensionService: IExtensionService
+		@IExtensionService private extensionService: IExtensionService
 	) {
 		super(id, { hasTitle: false }, themeService);
 
-		this.globalActivityIdToActions = Object.create(null);
-
-		this.compositeActions = Object.create(null);
-		this.compositeBar = this.instantiationService.createInstance(CompositeBar, {
+		this.compositeBar = this._register(this.instantiationService.createInstance(CompositeBar, {
 			icon: true,
 			storageId: ActivitybarPart.PINNED_VIEWLETS,
 			orientation: ActionsOrientation.VERTICAL,
@@ -88,7 +82,8 @@ export class ActivitybarPart extends Part {
 			compositeSize: 50,
 			colors: ActivitybarPart.COLORS,
 			overflowActionSize: ActivitybarPart.ACTION_HEIGHT
-		});
+		}));
+
 		const previousState = this.storageService.get(ActivitybarPart.PLACEHOLDER_VIEWLETS, StorageScope.GLOBAL, void 0);
 		if (previousState) {
 			let parsedPreviousState = <IPlaceholderComposite[]>JSON.parse(previousState);
@@ -107,8 +102,25 @@ export class ActivitybarPart extends Part {
 		this.registerListeners();
 		this.updateCompositebar();
 		this.updatePlaceholderComposites();
+	}
 
-		extensionService.onDidRegisterExtensions(() => this.onDidRegisterExtensions());
+	private registerListeners(): void {
+		this._register(this.viewletService.onDidViewletRegister(() => this.updateCompositebar()));
+
+		// Activate viewlet action on opening of a viewlet
+		this._register(this.viewletService.onDidViewletOpen(viewlet => this.compositeBar.activateComposite(viewlet.getId())));
+
+		// Deactivate viewlet action on close
+		this._register(this.viewletService.onDidViewletClose(viewlet => this.compositeBar.deactivateComposite(viewlet.getId())));
+		this._register(this.viewletService.onDidViewletEnablementChange(({ id, enabled }) => {
+			if (enabled) {
+				this.compositeBar.addComposite(this.viewletService.getViewlet(id));
+			} else {
+				this.removeComposite(id);
+			}
+		}));
+
+		this._register(this.extensionService.onDidRegisterExtensions(() => this.onDidRegisterExtensions()));
 	}
 
 	private onDidRegisterExtensions(): void {
@@ -116,25 +128,7 @@ export class ActivitybarPart extends Part {
 		this.updateCompositebar();
 	}
 
-	private registerListeners(): void {
-
-		this.toUnbind.push(this.viewletService.onDidViewletRegister(() => this.updateCompositebar()));
-
-		// Activate viewlet action on opening of a viewlet
-		this.toUnbind.push(this.viewletService.onDidViewletOpen(viewlet => this.compositeBar.activateComposite(viewlet.getId())));
-
-		// Deactivate viewlet action on close
-		this.toUnbind.push(this.viewletService.onDidViewletClose(viewlet => this.compositeBar.deactivateComposite(viewlet.getId())));
-		this.toUnbind.push(this.viewletService.onDidViewletEnablementChange(({ id, enabled }) => {
-			if (enabled) {
-				this.compositeBar.addComposite(this.viewletService.getViewlet(id));
-			} else {
-				this.removeComposite(id);
-			}
-		}));
-	}
-
-	public showActivity(viewletOrActionId: string, badge: IBadge, clazz?: string, priority?: number): IDisposable {
+	showActivity(viewletOrActionId: string, badge: IBadge, clazz?: string, priority?: number): IDisposable {
 		if (this.viewletService.getViewlet(viewletOrActionId)) {
 			return this.compositeBar.showActivity(viewletOrActionId, badge, clazz, priority);
 		}
@@ -157,7 +151,7 @@ export class ActivitybarPart extends Part {
 		return toDisposable(() => action.setBadge(undefined));
 	}
 
-	public createContentArea(parent: HTMLElement): HTMLElement {
+	createContentArea(parent: HTMLElement): HTMLElement {
 		const $el = $(parent);
 		const $result = $('.content').appendTo($el);
 
@@ -170,7 +164,7 @@ export class ActivitybarPart extends Part {
 		return $result.getHTMLElement();
 	}
 
-	public updateStyles(): void {
+	updateStyles(): void {
 		super.updateStyles();
 
 		// Part container
@@ -196,13 +190,12 @@ export class ActivitybarPart extends Part {
 			.map(d => this.instantiationService.createInstance(d))
 			.map(a => new GlobalActivityAction(a));
 
-		this.globalActionBar = new ActionBar(container, {
+		this.globalActionBar = this._register(new ActionBar(container, {
 			actionItemProvider: a => this.instantiationService.createInstance(GlobalActivityActionItem, a, ActivitybarPart.COLORS),
 			orientation: ActionsOrientation.VERTICAL,
 			ariaLabel: nls.localize('globalActions', "Global Actions"),
 			animated: false
-		});
-		this.toUnbind.push(this.globalActionBar);
+		}));
 
 		actions.forEach(a => {
 			this.globalActivityIdToActions[a.id] = a;
@@ -226,8 +219,10 @@ export class ActivitybarPart extends Part {
 					pinnedAction: new PlaceHolderToggleCompositePinnedAction(compositeId, this.compositeBar)
 				};
 			}
+
 			this.compositeActions[compositeId] = compositeActions;
 		}
+
 		return compositeActions;
 	}
 
@@ -288,14 +283,11 @@ export class ActivitybarPart extends Part {
 		}
 	}
 
-	public getPinned(): string[] {
+	getPinned(): string[] {
 		return this.viewletService.getViewlets().map(v => v.id).filter(id => this.compositeBar.isPinned(id));
 	}
 
-	/**
-	 * Layout title, content and status area in the given dimension.
-	 */
-	public layout(dimension: Dimension): Dimension[] {
+	layout(dimension: Dimension): Dimension[] {
 		if (!this.partService.isVisible(Parts.ACTIVITYBAR_PART)) {
 			return [dimension];
 		}
@@ -315,61 +307,10 @@ export class ActivitybarPart extends Part {
 		return sizes;
 	}
 
-	public shutdown(): void {
+	shutdown(): void {
 		const state = this.viewletService.getViewlets().map(viewlet => ({ id: viewlet.id, iconUrl: viewlet.iconUrl }));
 		this.storageService.store(ActivitybarPart.PLACEHOLDER_VIEWLETS, JSON.stringify(state), StorageScope.GLOBAL);
+
 		super.shutdown();
 	}
-
-	public dispose(): void {
-		if (this.compositeBar) {
-			this.compositeBar.dispose();
-			this.compositeBar = null;
-		}
-
-		if (this.globalActionBar) {
-			this.globalActionBar.dispose();
-			this.globalActionBar = null;
-		}
-
-		super.dispose();
-	}
 }
-
-class PlaceHolderViewletActivityAction extends ViewletActivityAction {
-
-	constructor(
-		id: string, iconUrl: URI,
-		@IViewletService viewletService: IViewletService,
-		@IPartService partService: IPartService,
-		@ITelemetryService telemetryService: ITelemetryService
-	) {
-		super({ id, name: id, cssClass: `extensionViewlet-placeholder-${id.replace(/\./g, '-')}` }, viewletService, partService, telemetryService);
-		// Generate Placeholder CSS to show the icon in the activity bar
-		const iconClass = `.monaco-workbench > .activitybar .monaco-action-bar .action-label.${this.class}`;
-		createCSSRule(iconClass, `-webkit-mask: url('${iconUrl || ''}') no-repeat 50% 50%`);
-		this.enabled = false;
-	}
-
-	setActivity(activity: IActivity): void {
-		this.activity = activity;
-		this.enabled = true;
-	}
-
-}
-
-class PlaceHolderToggleCompositePinnedAction extends ToggleCompositePinnedAction {
-
-	constructor(
-		id: string, compositeBar: ICompositeBar
-	) {
-		super({ id, name: id, cssClass: void 0 }, compositeBar);
-		this.enabled = false;
-	}
-
-	setActivity(activity: IActivity): void {
-		this.label = activity.name;
-		this.enabled = true;
-	}
-
-}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/compositePart.ts b/src/vs/workbench/browser/parts/compositePart.ts
index 7eba9f60160..386e2981306 100644
--- a/src/vs/workbench/browser/parts/compositePart.ts
+++ b/src/vs/workbench/browser/parts/compositePart.ts
@@ -51,6 +51,12 @@ export interface ICompositeTitleLabel {
 }
 
 export abstract class CompositePart<T extends Composite> extends Part {
+
+	protected _onDidCompositeOpen = this._register(new Emitter<IComposite>());
+	protected _onDidCompositeClose = this._register(new Emitter<IComposite>());
+
+	protected toolBar: ToolBar;
+
 	private instantiatedCompositeListeners: IDisposable[];
 	private mapCompositeToCompositeContainer: { [compositeId: string]: Builder; };
 	private mapActionsBindingToComposite: { [compositeId: string]: () => void; };
@@ -59,13 +65,10 @@ export abstract class CompositePart<T extends Composite> extends Part {
 	private lastActiveCompositeId: string;
 	private instantiatedComposites: Composite[];
 	private titleLabel: ICompositeTitleLabel;
-	protected toolBar: ToolBar;
 	private progressBar: ProgressBar;
 	private contentAreaSize: Dimension;
 	private telemetryActionsListener: IDisposable;
 	private currentCompositeOpenToken: string;
-	protected _onDidCompositeOpen = new Emitter<IComposite>();
-	protected _onDidCompositeClose = new Emitter<IComposite>();
 
 	constructor(
 		private notificationService: INotificationService,
@@ -400,7 +403,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		});
 	}
 
-	public createTitleArea(parent: HTMLElement): HTMLElement {
+	createTitleArea(parent: HTMLElement): HTMLElement {
 
 		// Title Area Container
 		const titleArea = $(parent).div({
@@ -416,11 +419,11 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		}, div => {
 
 			// Toolbar
-			this.toolBar = new ToolBar(div.getHTMLElement(), this.contextMenuService, {
+			this.toolBar = this._register(new ToolBar(div.getHTMLElement(), this.contextMenuService, {
 				actionItemProvider: action => this.actionItemProvider(action as Action),
 				orientation: ActionsOrientation.HORIZONTAL,
 				getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id)
-			});
+			}));
 		});
 
 		return titleArea.getHTMLElement();
@@ -463,12 +466,12 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		return undefined;
 	}
 
-	public createContentArea(parent: HTMLElement): HTMLElement {
+	createContentArea(parent: HTMLElement): HTMLElement {
 		return $(parent).div({
 			'class': 'content'
 		}, div => {
-			this.progressBar = new ProgressBar(div.getHTMLElement());
-			this.toUnbind.push(attachProgressBarStyler(this.progressBar, this.themeService));
+			this.progressBar = this._register(new ProgressBar(div.getHTMLElement()));
+			this._register(attachProgressBarStyler(this.progressBar, this.themeService));
 			this.progressBar.hide();
 		}).getHTMLElement();
 	}
@@ -477,7 +480,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		this.notificationService.error(types.isString(error) ? new Error(error) : error);
 	}
 
-	public getProgressIndicator(id: string): IProgressService {
+	getProgressIndicator(id: string): IProgressService {
 		return this.mapProgressServiceToComposite[id];
 	}
 
@@ -489,7 +492,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		return [];
 	}
 
-	public layout(dimension: Dimension): Dimension[] {
+	layout(dimension: Dimension): Dimension[] {
 
 		// Pass to super
 		const sizes = super.layout(dimension);
@@ -503,13 +506,13 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		return sizes;
 	}
 
-	public shutdown(): void {
+	shutdown(): void {
 		this.instantiatedComposites.forEach(i => i.shutdown());
 
 		super.shutdown();
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.mapCompositeToCompositeContainer = null;
 		this.mapProgressServiceToComposite = null;
 		this.mapActionsBindingToComposite = null;
@@ -519,13 +522,8 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		}
 
 		this.instantiatedComposites = [];
-
 		this.instantiatedCompositeListeners = dispose(this.instantiatedCompositeListeners);
 
-		this.progressBar.dispose();
-		this.toolBar.dispose();
-
-		// Super Dispose
 		super.dispose();
 	}
 }
diff --git a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
index 54b7a6c74e0..54f2748037a 100644
--- a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
+++ b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
@@ -57,17 +57,18 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		@IContextMenuService private contextMenuService: IContextMenuService
 	) {
 		super();
+
 		this.model = new CompositeBarModel(options);
 		this.storedState = this.loadCompositeItemsFromStorage();
 		this.visibleComposites = [];
 		this.compositeSizeInBar = new Map<string, number>();
 	}
 
-	public getCompositesFromStorage(): string[] {
+	getCompositesFromStorage(): string[] {
 		return this.storedState.map(s => s.id);
 	}
 
-	public create(parent: HTMLElement): HTMLElement {
+	create(parent: HTMLElement): HTMLElement {
 		const actionBarDiv = parent.appendChild($('.composite-bar'));
 		this.compositeSwitcherBar = this._register(new ActionBar(actionBarDiv, {
 			actionItemProvider: (action: Action) => {
@@ -102,7 +103,7 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		return actionBarDiv;
 	}
 
-	public layout(dimension: Dimension): void {
+	layout(dimension: Dimension): void {
 		this.dimension = dimension;
 		if (dimension.height === 0 || dimension.width === 0) {
 			// Do not layout if not visible. Otherwise the size measurment would be computed wrongly
@@ -118,7 +119,7 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		this.updateCompositeSwitcher();
 	}
 
-	public addComposite({ id, name, order }: { id: string; name: string, order: number }): void {
+	addComposite({ id, name, order }: { id: string; name: string, order: number }): void {
 		const state = this.storedState.filter(s => s.id === id)[0];
 		const pinned = state ? state.pinned : true;
 		let index = order >= 0 ? order : this.model.items.length;
@@ -147,7 +148,7 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		}
 	}
 
-	public removeComposite(id: string): void {
+	removeComposite(id: string): void {
 
 		// If it pinned, unpin it first
 		if (this.isPinned(id)) {
@@ -160,7 +161,7 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		}
 	}
 
-	public activateComposite(id: string): void {
+	activateComposite(id: string): void {
 		const previousActiveItem = this.model.activeItem;
 		if (this.model.activate(id)) {
 			// Update if current composite is neither visible nor pinned
@@ -171,7 +172,7 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		}
 	}
 
-	public deactivateComposite(id: string): void {
+	deactivateComposite(id: string): void {
 		const previousActiveItem = this.model.activeItem;
 		if (this.model.deactivate()) {
 			if (previousActiveItem && !previousActiveItem.pinned) {
@@ -180,7 +181,7 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		}
 	}
 
-	public showActivity(compositeId: string, badge: IBadge, clazz?: string, priority?: number): IDisposable {
+	showActivity(compositeId: string, badge: IBadge, clazz?: string, priority?: number): IDisposable {
 		if (!badge) {
 			throw illegalArgument('badge');
 		}
@@ -194,7 +195,7 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		return toDisposable(() => this.model.removeActivity(compositeId, activity));
 	}
 
-	public pin(compositeId: string, open?: boolean): void {
+	pin(compositeId: string, open?: boolean): void {
 		if (this.model.setPinned(compositeId, true)) {
 			this.updateCompositeSwitcher();
 
@@ -205,7 +206,7 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		}
 	}
 
-	public unpin(compositeId: string): void {
+	unpin(compositeId: string): void {
 		if (this.model.setPinned(compositeId, false)) {
 
 			this.updateCompositeSwitcher();
@@ -238,24 +239,22 @@ export class CompositeBar extends Widget implements ICompositeBar {
 			else {
 				this.options.openComposite(this.visibleComposites.filter(cid => cid !== compositeId)[0]);
 			}
-
 		}
-
 	}
 
-	public isPinned(compositeId: string): boolean {
+	isPinned(compositeId: string): boolean {
 		const item = this.model.findItem(compositeId);
 		return item && item.pinned;
 	}
 
-	public move(compositeId: string, toCompositeId: string): void {
+	move(compositeId: string, toCompositeId: string): void {
 		if (this.model.move(compositeId, toCompositeId)) {
 			// timeout helps to prevent artifacts from showing up
 			setTimeout(() => this.updateCompositeSwitcher(), 0);
 		}
 	}
 
-	public getAction(compositeId): ActivityAction {
+	getAction(compositeId): ActivityAction {
 		const item = this.model.findItem(compositeId);
 		return item && item.activityAction;
 	}
diff --git a/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts b/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts
index 7beeddb156c..6d6647e8c5a 100644
--- a/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts
+++ b/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts
@@ -12,7 +12,7 @@ import * as dom from 'vs/base/browser/dom';
 import { Builder, $ } from 'vs/base/browser/builder';
 import { BaseActionItem, IBaseActionItemOptions, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { ICommandService } from 'vs/platform/commands/common/commands';
-import { dispose, IDisposable, empty, toDisposable } from 'vs/base/common/lifecycle';
+import { dispose, IDisposable, Disposable, toDisposable } from 'vs/base/common/lifecycle';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
 import { TextBadge, NumberBadge, IBadge, IconBadge, ProgressBadge } from 'vs/workbench/services/activity/common/activity';
@@ -52,10 +52,15 @@ export interface ICompositeBar {
 }
 
 export class ActivityAction extends Action {
+
+	private _onDidChangeActivity = new Emitter<this>();
+	get onDidChangeActivity(): Event<this> { return this._onDidChangeActivity.event; }
+
+	private _onDidChangeBadge = new Emitter<this>();
+	get onDidChangeBadge(): Event<this> { return this._onDidChangeBadge.event; }
+
 	private badge: IBadge;
 	private clazz: string | undefined;
-	private _onDidChangeActivity = new Emitter<this>();
-	private _onDidChangeBadge = new Emitter<this>();
 
 	constructor(private _activity: IActivity) {
 		super(_activity.id, _activity.name, _activity.cssClass);
@@ -63,48 +68,47 @@ export class ActivityAction extends Action {
 		this.badge = null;
 	}
 
-	public get activity(): IActivity {
+	get activity(): IActivity {
 		return this._activity;
 	}
 
-	public set activity(activity: IActivity) {
+	set activity(activity: IActivity) {
 		this._activity = activity;
 		this._onDidChangeActivity.fire(this);
 	}
 
-	public get onDidChangeActivity(): Event<this> {
-		return this._onDidChangeActivity.event;
-	}
-
-	public get onDidChangeBadge(): Event<this> {
-		return this._onDidChangeBadge.event;
-	}
-
-	public activate(): void {
+	activate(): void {
 		if (!this.checked) {
 			this._setChecked(true);
 		}
 	}
 
-	public deactivate(): void {
+	deactivate(): void {
 		if (this.checked) {
 			this._setChecked(false);
 		}
 	}
 
-	public getBadge(): IBadge {
+	getBadge(): IBadge {
 		return this.badge;
 	}
 
-	public getClass(): string | undefined {
+	getClass(): string | undefined {
 		return this.clazz;
 	}
 
-	public setBadge(badge: IBadge, clazz?: string): void {
+	setBadge(badge: IBadge, clazz?: string): void {
 		this.badge = badge;
 		this.clazz = clazz;
 		this._onDidChangeBadge.fire(this);
 	}
+
+	dispose(): void {
+		this._onDidChangeActivity.dispose();
+		this._onDidChangeBadge.dispose();
+
+		super.dispose();
+	}
 }
 
 export interface ICompositeBarColors {
@@ -126,7 +130,7 @@ export class ActivityActionItem extends BaseActionItem {
 	protected options: IActivityActionItemOptions;
 
 	private $badgeContent: Builder;
-	private badgeDisposable: IDisposable = empty;
+	private badgeDisposable: IDisposable = Disposable.None;
 	private mouseUpTimeout: number;
 
 	constructor(
@@ -170,7 +174,7 @@ export class ActivityActionItem extends BaseActionItem {
 		}
 	}
 
-	public render(container: HTMLElement): void {
+	render(container: HTMLElement): void {
 		super.render(container);
 
 		// Make the container tab-able for keyboard navigation
@@ -226,7 +230,7 @@ export class ActivityActionItem extends BaseActionItem {
 		const clazz = action.getClass();
 
 		this.badgeDisposable.dispose();
-		this.badgeDisposable = empty;
+		this.badgeDisposable = Disposable.None;
 
 		this.$badgeContent.empty();
 		this.$badge.hide();
@@ -301,7 +305,7 @@ export class ActivityActionItem extends BaseActionItem {
 		});
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		super.dispose();
 
 		if (this.mouseUpTimeout) {
@@ -324,7 +328,7 @@ export class CompositeOverflowActivityAction extends ActivityAction {
 		});
 	}
 
-	public run(event: any): TPromise<any> {
+	run(event: any): TPromise<any> {
 		this.showMenu();
 
 		return TPromise.as(true);
@@ -347,7 +351,7 @@ export class CompositeOverflowActivityActionItem extends ActivityActionItem {
 		super(action, { icon: true, colors }, themeService);
 	}
 
-	public showMenu(): void {
+	showMenu(): void {
 		if (this.actions) {
 			dispose(this.actions);
 		}
@@ -384,7 +388,7 @@ export class CompositeOverflowActivityActionItem extends ActivityActionItem {
 		});
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		super.dispose();
 
 		this.actions = dispose(this.actions);
@@ -399,7 +403,7 @@ class ManageExtensionAction extends Action {
 		super('activitybar.manage.extension', nls.localize('manageExtension', "Manage Extension"));
 	}
 
-	public run(id: string): TPromise<any> {
+	run(id: string): TPromise<any> {
 		return this.commandService.executeCommand('_extensions.manage', id);
 	}
 }
@@ -463,7 +467,7 @@ export class CompositeActionItem extends ActivityActionItem {
 		return null;
 	}
 
-	public render(container: HTMLElement): void {
+	render(container: HTMLElement): void {
 		super.render(container);
 
 		this._updateChecked();
@@ -548,7 +552,7 @@ export class CompositeActionItem extends ActivityActionItem {
 		element.style.backgroundColor = isDragging && dragBackground ? dragBackground.toString() : null;
 	}
 
-	public static getDraggedCompositeId(): string {
+	static getDraggedCompositeId(): string {
 		return CompositeActionItem.draggedCompositeId;
 	}
 
@@ -556,7 +560,7 @@ export class CompositeActionItem extends ActivityActionItem {
 		CompositeActionItem.draggedCompositeId = compositeId;
 	}
 
-	public static clearDraggedComposite(): void {
+	static clearDraggedComposite(): void {
 		CompositeActionItem.draggedCompositeId = void 0;
 	}
 
@@ -582,7 +586,7 @@ export class CompositeActionItem extends ActivityActionItem {
 		});
 	}
 
-	public focus(): void {
+	focus(): void {
 		this.$container.domFocus();
 	}
 
@@ -613,7 +617,7 @@ export class CompositeActionItem extends ActivityActionItem {
 		}
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		super.dispose();
 
 		CompositeActionItem.clearDraggedComposite();
@@ -633,7 +637,7 @@ export class ToggleCompositePinnedAction extends Action {
 		this.checked = this.activity && this.compositeBar.isPinned(this.activity.id);
 	}
 
-	public run(context: string): TPromise<any> {
+	run(context: string): TPromise<any> {
 		const id = this.activity ? this.activity.id : context;
 
 		if (this.compositeBar.isPinned(id)) {
diff --git a/src/vs/workbench/browser/parts/editor/baseEditor.ts b/src/vs/workbench/browser/parts/editor/baseEditor.ts
index 040f588de89..bda6dcf8f1c 100644
--- a/src/vs/workbench/browser/parts/editor/baseEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/baseEditor.ts
@@ -33,6 +33,8 @@ import { DEFAULT_EDITOR_MIN_DIMENSIONS, DEFAULT_EDITOR_MAX_DIMENSIONS } from 'vs
  */
 export abstract class BaseEditor extends Panel implements IEditor {
 
+	private static readonly EDITOR_MEMENTOS: Map<string, EditorMemento<any>> = new Map<string, EditorMemento<any>>();
+
 	readonly minimumWidth = DEFAULT_EDITOR_MIN_DIMENSIONS.width;
 	readonly maximumWidth = DEFAULT_EDITOR_MAX_DIMENSIONS.width;
 	readonly minimumHeight = DEFAULT_EDITOR_MIN_DIMENSIONS.height;
@@ -40,8 +42,6 @@ export abstract class BaseEditor extends Panel implements IEditor {
 
 	readonly onDidSizeConstraintsChange: Event<{ width: number; height: number; }> = Event.None;
 
-	private static readonly EDITOR_MEMENTOS: Map<string, EditorMemento<any>> = new Map<string, EditorMemento<any>>();
-
 	protected _input: EditorInput;
 
 	private _options: EditorOptions;
@@ -171,7 +171,6 @@ export abstract class BaseEditor extends Panel implements IEditor {
 		this._input = null;
 		this._options = null;
 
-		// Super Dispose
 		super.dispose();
 	}
 }
diff --git a/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts b/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts
index 8383ebf5b42..203fb0368aa 100644
--- a/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts
@@ -18,7 +18,7 @@ import { BaseBinaryResourceEditor } from 'vs/workbench/browser/parts/editor/bina
  */
 export class BinaryResourceDiffEditor extends SideBySideEditor {
 
-	public static readonly ID = BINARY_DIFF_EDITOR_ID;
+	static readonly ID = BINARY_DIFF_EDITOR_ID;
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -28,7 +28,7 @@ export class BinaryResourceDiffEditor extends SideBySideEditor {
 		super(telemetryService, instantiationService, themeService);
 	}
 
-	public getMetadata(): string {
+	getMetadata(): string {
 		const master = this.masterEditor;
 		const details = this.detailsEditor;
 
diff --git a/src/vs/workbench/browser/parts/editor/binaryEditor.ts b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
index 7a66f852922..3b662fff332 100644
--- a/src/vs/workbench/browser/parts/editor/binaryEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
@@ -32,7 +32,8 @@ export interface IOpenCallbacks {
  */
 export abstract class BaseBinaryResourceEditor extends BaseEditor {
 
-	private readonly _onMetadataChanged: Emitter<void>;
+	private readonly _onMetadataChanged: Emitter<void> = this._register(new Emitter<void>());
+	get onMetadataChanged(): Event<void> { return this._onMetadataChanged.event; }
 
 	private callbacks: IOpenCallbacks;
 	private metadata: string;
@@ -49,17 +50,10 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 	) {
 		super(id, telemetryService, themeService);
 
-		this._onMetadataChanged = new Emitter<void>();
-		this.toUnbind.push(this._onMetadataChanged);
-
 		this.callbacks = callbacks;
 	}
 
-	public get onMetadataChanged(): Event<void> {
-		return this._onMetadataChanged.event;
-	}
-
-	public getTitle(): string {
+	getTitle(): string {
 		return this.input ? this.input.getName() : nls.localize('binaryEditor', "Binary Viewer");
 	}
 
@@ -73,13 +67,13 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 		this.binaryContainer.tabindex(0); // enable focus support from the editor part (do not remove)
 
 		// Custom Scrollbars
-		this.scrollbar = new DomScrollableElement(binaryContainerElement, { horizontal: ScrollbarVisibility.Auto, vertical: ScrollbarVisibility.Auto });
+		this.scrollbar = this._register(new DomScrollableElement(binaryContainerElement, { horizontal: ScrollbarVisibility.Auto, vertical: ScrollbarVisibility.Auto }));
 		parent.appendChild(this.scrollbar.getDomNode());
 	}
 
-	public setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
 		return super.setInput(input, options, token).then(() => {
-			return input.resolve(true).then(model => {
+			return input.resolve().then(model => {
 
 				// Check for cancellation
 				if (token.isCancellationRequested) {
@@ -109,14 +103,15 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 
 	private handleMetadataChanged(meta: string): void {
 		this.metadata = meta;
+
 		this._onMetadataChanged.fire();
 	}
 
-	public getMetadata(): string {
+	getMetadata(): string {
 		return this.metadata;
 	}
 
-	public clearInput(): void {
+	clearInput(): void {
 
 		// Clear Meta
 		this.handleMetadataChanged(null);
@@ -127,7 +122,7 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 		super.clearInput();
 	}
 
-	public layout(dimension: Dimension): void {
+	layout(dimension: Dimension): void {
 
 		// Pass on to Binary Container
 		this.binaryContainer.size(dimension.width, dimension.height);
@@ -137,15 +132,14 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 		}
 	}
 
-	public focus(): void {
+	focus(): void {
 		this.binaryContainer.domFocus();
 	}
 
-	public dispose(): void {
+	dispose(): void {
 
 		// Destroy Container
 		this.binaryContainer.destroy();
-		this.scrollbar.dispose();
 
 		super.dispose();
 	}
diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
index 73c180588f7..f633777987f 100644
--- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts
+++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
@@ -109,10 +109,9 @@ class UntitledEditorInputFactory implements IEditorInputFactory {
 
 	constructor(
 		@ITextFileService private textFileService: ITextFileService
-	) {
-	}
+	) { }
 
-	public serialize(editorInput: EditorInput): string {
+	serialize(editorInput: EditorInput): string {
 		if (!this.textFileService.isHotExitEnabled) {
 			return null; // never restore untitled unless hot exit is enabled
 		}
@@ -121,7 +120,7 @@ class UntitledEditorInputFactory implements IEditorInputFactory {
 
 		let resource = untitledEditorInput.getResource();
 		if (untitledEditorInput.hasAssociatedFilePath) {
-			resource = URI.file(resource.fsPath); // untitled with associated file path use the file schema
+			resource = resource.with({ scheme: Schemas.file }); // untitled with associated file path use the file schema
 		}
 
 		const serialized: ISerializedUntitledEditorInput = {
@@ -134,7 +133,7 @@ class UntitledEditorInputFactory implements IEditorInputFactory {
 		return JSON.stringify(serialized);
 	}
 
-	public deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): UntitledEditorInput {
+	deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): UntitledEditorInput {
 		return instantiationService.invokeFunction<UntitledEditorInput>(accessor => {
 			const deserialized: ISerializedUntitledEditorInput = JSON.parse(serializedEditorInput);
 			const resource = !!deserialized.resourceJSON ? URI.revive(deserialized.resourceJSON) : URI.parse(deserialized.resource);
@@ -163,7 +162,7 @@ interface ISerializedSideBySideEditorInput {
 // Register Side by Side Editor Input Factory
 class SideBySideEditorInputFactory implements IEditorInputFactory {
 
-	public serialize(editorInput: EditorInput): string {
+	serialize(editorInput: EditorInput): string {
 		const input = <SideBySideEditorInput>editorInput;
 
 		if (input.details && input.master) {
@@ -191,7 +190,7 @@ class SideBySideEditorInputFactory implements IEditorInputFactory {
 		return null;
 	}
 
-	public deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): EditorInput {
+	deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): EditorInput {
 		const deserialized: ISerializedSideBySideEditorInput = JSON.parse(serializedEditorInput);
 
 		const registry = Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactories);
@@ -230,13 +229,13 @@ export class QuickOpenActionContributor extends ActionBarContributor {
 		super();
 	}
 
-	public hasActions(context: any): boolean {
+	hasActions(context: any): boolean {
 		const entry = this.getEntry(context);
 
 		return !!entry;
 	}
 
-	public getActions(context: any): IAction[] {
+	getActions(context: any): IAction[] {
 		const actions: Action[] = [];
 
 		const entry = this.getEntry(context);
diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts
index 184d01fe293..f1af1f2d54b 100644
--- a/src/vs/workbench/browser/parts/editor/editorActions.ts
+++ b/src/vs/workbench/browser/parts/editor/editorActions.ts
@@ -37,7 +37,7 @@ export class ExecuteCommandAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		return this.commandService.executeCommand(this.commandId, this.commandArgs);
 	}
 }
@@ -71,13 +71,13 @@ export class BaseSplitEditorAction extends Action {
 		}));
 	}
 
-	public run(context?: IEditorIdentifier): TPromise<any> {
+	run(context?: IEditorIdentifier): TPromise<any> {
 		splitEditor(this.editorGroupService, this.direction, context);
 
 		return TPromise.as(true);
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		super.dispose();
 
 		this.toDispose = dispose(this.toDispose);
@@ -86,8 +86,8 @@ export class BaseSplitEditorAction extends Action {
 
 export class SplitEditorAction extends BaseSplitEditorAction {
 
-	public static readonly ID = 'workbench.action.splitEditor';
-	public static readonly LABEL = nls.localize('splitEditor', "Split Editor");
+	static readonly ID = 'workbench.action.splitEditor';
+	static readonly LABEL = nls.localize('splitEditor', "Split Editor");
 
 	constructor(
 		id: string,
@@ -101,8 +101,8 @@ export class SplitEditorAction extends BaseSplitEditorAction {
 
 export class SplitEditorOrthogonalAction extends BaseSplitEditorAction {
 
-	public static readonly ID = 'workbench.action.splitEditorOrthogonal';
-	public static readonly LABEL = nls.localize('splitEditorOrthogonal', "Split Editor Orthogonal");
+	static readonly ID = 'workbench.action.splitEditorOrthogonal';
+	static readonly LABEL = nls.localize('splitEditorOrthogonal', "Split Editor Orthogonal");
 
 	constructor(
 		id: string,
@@ -122,8 +122,8 @@ export class SplitEditorOrthogonalAction extends BaseSplitEditorAction {
 
 export class SplitEditorLeftAction extends ExecuteCommandAction {
 
-	public static readonly ID = SPLIT_EDITOR_LEFT;
-	public static readonly LABEL = nls.localize('splitEditorGroupLeft', "Split Editor Left");
+	static readonly ID = SPLIT_EDITOR_LEFT;
+	static readonly LABEL = nls.localize('splitEditorGroupLeft', "Split Editor Left");
 
 	constructor(
 		id: string,
@@ -136,8 +136,8 @@ export class SplitEditorLeftAction extends ExecuteCommandAction {
 
 export class SplitEditorRightAction extends ExecuteCommandAction {
 
-	public static readonly ID = SPLIT_EDITOR_RIGHT;
-	public static readonly LABEL = nls.localize('splitEditorGroupRight', "Split Editor Right");
+	static readonly ID = SPLIT_EDITOR_RIGHT;
+	static readonly LABEL = nls.localize('splitEditorGroupRight', "Split Editor Right");
 
 	constructor(
 		id: string,
@@ -150,8 +150,8 @@ export class SplitEditorRightAction extends ExecuteCommandAction {
 
 export class SplitEditorUpAction extends ExecuteCommandAction {
 
-	public static readonly ID = SPLIT_EDITOR_UP;
-	public static readonly LABEL = nls.localize('splitEditorGroupUp', "Split Editor Up");
+	static readonly ID = SPLIT_EDITOR_UP;
+	static readonly LABEL = nls.localize('splitEditorGroupUp', "Split Editor Up");
 
 	constructor(
 		id: string,
@@ -164,8 +164,8 @@ export class SplitEditorUpAction extends ExecuteCommandAction {
 
 export class SplitEditorDownAction extends ExecuteCommandAction {
 
-	public static readonly ID = SPLIT_EDITOR_DOWN;
-	public static readonly LABEL = nls.localize('splitEditorGroupDown', "Split Editor Down");
+	static readonly ID = SPLIT_EDITOR_DOWN;
+	static readonly LABEL = nls.localize('splitEditorGroupDown', "Split Editor Down");
 
 	constructor(
 		id: string,
@@ -178,8 +178,8 @@ export class SplitEditorDownAction extends ExecuteCommandAction {
 
 export class JoinTwoGroupsAction extends Action {
 
-	public static readonly ID = 'workbench.action.joinTwoGroups';
-	public static readonly LABEL = nls.localize('joinTwoGroups', "Join Editor Group with Next Group");
+	static readonly ID = 'workbench.action.joinTwoGroups';
+	static readonly LABEL = nls.localize('joinTwoGroups', "Join Editor Group with Next Group");
 
 	constructor(
 		id: string,
@@ -189,7 +189,7 @@ export class JoinTwoGroupsAction extends Action {
 		super(id, label);
 	}
 
-	public run(context?: IEditorIdentifier): TPromise<any> {
+	run(context?: IEditorIdentifier): TPromise<any> {
 		let sourceGroup: IEditorGroup;
 		if (context && typeof context.groupId === 'number') {
 			sourceGroup = this.editorGroupService.getGroup(context.groupId);
@@ -213,8 +213,8 @@ export class JoinTwoGroupsAction extends Action {
 
 export class JoinAllGroupsAction extends Action {
 
-	public static readonly ID = 'workbench.action.joinAllGroups';
-	public static readonly LABEL = nls.localize('joinAllGroups', "Join All Editor Groups");
+	static readonly ID = 'workbench.action.joinAllGroups';
+	static readonly LABEL = nls.localize('joinAllGroups', "Join All Editor Groups");
 
 	constructor(
 		id: string,
@@ -224,7 +224,7 @@ export class JoinAllGroupsAction extends Action {
 		super(id, label);
 	}
 
-	public run(context?: IEditorIdentifier): TPromise<any> {
+	run(context?: IEditorIdentifier): TPromise<any> {
 		mergeAllGroups(this.editorGroupService);
 
 		return TPromise.as(true);
@@ -233,8 +233,8 @@ export class JoinAllGroupsAction extends Action {
 
 export class NavigateBetweenGroupsAction extends Action {
 
-	public static readonly ID = 'workbench.action.navigateEditorGroups';
-	public static readonly LABEL = nls.localize('navigateEditorGroups', "Navigate Between Editor Groups");
+	static readonly ID = 'workbench.action.navigateEditorGroups';
+	static readonly LABEL = nls.localize('navigateEditorGroups', "Navigate Between Editor Groups");
 
 	constructor(
 		id: string,
@@ -244,7 +244,7 @@ export class NavigateBetweenGroupsAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const nextGroup = this.editorGroupService.findGroup({ location: GroupLocation.NEXT }, this.editorGroupService.activeGroup, true);
 		nextGroup.focus();
 
@@ -254,8 +254,8 @@ export class NavigateBetweenGroupsAction extends Action {
 
 export class FocusActiveGroupAction extends Action {
 
-	public static readonly ID = 'workbench.action.focusActiveEditorGroup';
-	public static readonly LABEL = nls.localize('focusActiveEditorGroup', "Focus Active Editor Group");
+	static readonly ID = 'workbench.action.focusActiveEditorGroup';
+	static readonly LABEL = nls.localize('focusActiveEditorGroup', "Focus Active Editor Group");
 
 	constructor(
 		id: string,
@@ -265,7 +265,7 @@ export class FocusActiveGroupAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.editorGroupService.activeGroup.focus();
 
 		return TPromise.as(true);
@@ -283,7 +283,7 @@ export abstract class BaseFocusGroupAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const group = this.editorGroupService.findGroup(this.scope, this.editorGroupService.activeGroup, true);
 		if (group) {
 			group.focus();
@@ -295,8 +295,8 @@ export abstract class BaseFocusGroupAction extends Action {
 
 export class FocusFirstGroupAction extends BaseFocusGroupAction {
 
-	public static readonly ID = 'workbench.action.focusFirstEditorGroup';
-	public static readonly LABEL = nls.localize('focusFirstEditorGroup', "Focus First Editor Group");
+	static readonly ID = 'workbench.action.focusFirstEditorGroup';
+	static readonly LABEL = nls.localize('focusFirstEditorGroup', "Focus First Editor Group");
 
 	constructor(
 		id: string,
@@ -309,8 +309,8 @@ export class FocusFirstGroupAction extends BaseFocusGroupAction {
 
 export class FocusLastGroupAction extends BaseFocusGroupAction {
 
-	public static readonly ID = 'workbench.action.focusLastEditorGroup';
-	public static readonly LABEL = nls.localize('focusLastEditorGroup', "Focus Last Editor Group");
+	static readonly ID = 'workbench.action.focusLastEditorGroup';
+	static readonly LABEL = nls.localize('focusLastEditorGroup', "Focus Last Editor Group");
 
 	constructor(
 		id: string,
@@ -323,8 +323,8 @@ export class FocusLastGroupAction extends BaseFocusGroupAction {
 
 export class FocusNextGroup extends BaseFocusGroupAction {
 
-	public static readonly ID = 'workbench.action.focusNextGroup';
-	public static readonly LABEL = nls.localize('focusNextGroup', "Focus Next Editor Group");
+	static readonly ID = 'workbench.action.focusNextGroup';
+	static readonly LABEL = nls.localize('focusNextGroup', "Focus Next Editor Group");
 
 	constructor(
 		id: string,
@@ -337,8 +337,8 @@ export class FocusNextGroup extends BaseFocusGroupAction {
 
 export class FocusPreviousGroup extends BaseFocusGroupAction {
 
-	public static readonly ID = 'workbench.action.focusPreviousGroup';
-	public static readonly LABEL = nls.localize('focusPreviousGroup', "Focus Previous Editor Group");
+	static readonly ID = 'workbench.action.focusPreviousGroup';
+	static readonly LABEL = nls.localize('focusPreviousGroup', "Focus Previous Editor Group");
 
 	constructor(
 		id: string,
@@ -351,8 +351,8 @@ export class FocusPreviousGroup extends BaseFocusGroupAction {
 
 export class FocusLeftGroup extends BaseFocusGroupAction {
 
-	public static readonly ID = 'workbench.action.focusLeftGroup';
-	public static readonly LABEL = nls.localize('focusLeftGroup', "Focus Left Editor Group");
+	static readonly ID = 'workbench.action.focusLeftGroup';
+	static readonly LABEL = nls.localize('focusLeftGroup', "Focus Left Editor Group");
 
 	constructor(
 		id: string,
@@ -365,8 +365,8 @@ export class FocusLeftGroup extends BaseFocusGroupAction {
 
 export class FocusRightGroup extends BaseFocusGroupAction {
 
-	public static readonly ID = 'workbench.action.focusRightGroup';
-	public static readonly LABEL = nls.localize('focusRightGroup', "Focus Right Editor Group");
+	static readonly ID = 'workbench.action.focusRightGroup';
+	static readonly LABEL = nls.localize('focusRightGroup', "Focus Right Editor Group");
 
 	constructor(
 		id: string,
@@ -379,8 +379,8 @@ export class FocusRightGroup extends BaseFocusGroupAction {
 
 export class FocusAboveGroup extends BaseFocusGroupAction {
 
-	public static readonly ID = 'workbench.action.focusAboveGroup';
-	public static readonly LABEL = nls.localize('focusAboveGroup', "Focus Above Editor Group");
+	static readonly ID = 'workbench.action.focusAboveGroup';
+	static readonly LABEL = nls.localize('focusAboveGroup', "Focus Above Editor Group");
 
 	constructor(
 		id: string,
@@ -393,8 +393,8 @@ export class FocusAboveGroup extends BaseFocusGroupAction {
 
 export class FocusBelowGroup extends BaseFocusGroupAction {
 
-	public static readonly ID = 'workbench.action.focusBelowGroup';
-	public static readonly LABEL = nls.localize('focusBelowGroup', "Focus Below Editor Group");
+	static readonly ID = 'workbench.action.focusBelowGroup';
+	static readonly LABEL = nls.localize('focusBelowGroup', "Focus Below Editor Group");
 
 	constructor(
 		id: string,
@@ -407,8 +407,8 @@ export class FocusBelowGroup extends BaseFocusGroupAction {
 
 export class OpenToSideFromQuickOpenAction extends Action {
 
-	public static readonly OPEN_TO_SIDE_ID = 'workbench.action.openToSide';
-	public static readonly OPEN_TO_SIDE_LABEL = nls.localize('openToSide', "Open to the Side");
+	static readonly OPEN_TO_SIDE_ID = 'workbench.action.openToSide';
+	static readonly OPEN_TO_SIDE_LABEL = nls.localize('openToSide', "Open to the Side");
 
 	constructor(
 		@IEditorService private editorService: IEditorService,
@@ -419,13 +419,13 @@ export class OpenToSideFromQuickOpenAction extends Action {
 		this.updateClass();
 	}
 
-	public updateClass(): void {
+	updateClass(): void {
 		const preferredDirection = preferredSideBySideGroupDirection(this.configurationService);
 
 		this.class = (preferredDirection === GroupDirection.RIGHT) ? 'quick-open-sidebyside-vertical' : 'quick-open-sidebyside-horizontal';
 	}
 
-	public run(context: any): TPromise<any> {
+	run(context: any): TPromise<any> {
 		const entry = toEditorQuickOpenEntry(context);
 		if (entry) {
 			const input = entry.getInput();
@@ -463,8 +463,8 @@ export function toEditorQuickOpenEntry(element: any): IEditorQuickOpenEntry {
 
 export class CloseEditorAction extends Action {
 
-	public static readonly ID = 'workbench.action.closeActiveEditor';
-	public static readonly LABEL = nls.localize('closeEditor', "Close Editor");
+	static readonly ID = 'workbench.action.closeActiveEditor';
+	static readonly LABEL = nls.localize('closeEditor', "Close Editor");
 
 	constructor(
 		id: string,
@@ -474,15 +474,15 @@ export class CloseEditorAction extends Action {
 		super(id, label, 'close-editor-action');
 	}
 
-	public run(context?: IEditorCommandsContext): TPromise<any> {
+	run(context?: IEditorCommandsContext): TPromise<any> {
 		return this.commandService.executeCommand(CLOSE_EDITOR_COMMAND_ID, void 0, context);
 	}
 }
 
 export class CloseOneEditorAction extends Action {
 
-	public static readonly ID = 'workbench.action.closeActiveEditor';
-	public static readonly LABEL = nls.localize('closeOneEditor', "Close");
+	static readonly ID = 'workbench.action.closeActiveEditor';
+	static readonly LABEL = nls.localize('closeOneEditor', "Close");
 
 	constructor(
 		id: string,
@@ -492,7 +492,7 @@ export class CloseOneEditorAction extends Action {
 		super(id, label, 'close-editor-action');
 	}
 
-	public run(context?: IEditorCommandsContext): TPromise<any> {
+	run(context?: IEditorCommandsContext): TPromise<any> {
 		let group: IEditorGroup;
 		let editorIndex: number;
 		if (context) {
@@ -526,8 +526,8 @@ export class CloseOneEditorAction extends Action {
 
 export class RevertAndCloseEditorAction extends Action {
 
-	public static readonly ID = 'workbench.action.revertAndCloseActiveEditor';
-	public static readonly LABEL = nls.localize('revertAndCloseActiveEditor', "Revert and Close Editor");
+	static readonly ID = 'workbench.action.revertAndCloseActiveEditor';
+	static readonly LABEL = nls.localize('revertAndCloseActiveEditor', "Revert and Close Editor");
 
 	constructor(
 		id: string,
@@ -537,7 +537,7 @@ export class RevertAndCloseEditorAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const activeControl = this.editorService.activeControl;
 		if (activeControl) {
 			const editor = activeControl.input;
@@ -559,8 +559,8 @@ export class RevertAndCloseEditorAction extends Action {
 
 export class CloseLeftEditorsInGroupAction extends Action {
 
-	public static readonly ID = 'workbench.action.closeEditorsToTheLeft';
-	public static readonly LABEL = nls.localize('closeEditorsToTheLeft', "Close Editors to the Left in Group");
+	static readonly ID = 'workbench.action.closeEditorsToTheLeft';
+	static readonly LABEL = nls.localize('closeEditorsToTheLeft', "Close Editors to the Left in Group");
 
 	constructor(
 		id: string,
@@ -571,7 +571,7 @@ export class CloseLeftEditorsInGroupAction extends Action {
 		super(id, label);
 	}
 
-	public run(context?: IEditorIdentifier): TPromise<any> {
+	run(context?: IEditorIdentifier): TPromise<any> {
 		const { group, editor } = getTarget(this.editorService, this.editorGroupService, context);
 		if (group && editor) {
 			return group.closeEditors({ direction: CloseDirection.LEFT, except: editor });
@@ -616,7 +616,7 @@ export abstract class BaseCloseAllAction extends Action {
 		return groupsToClose;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 
 		// Just close all if there are no or one dirty editor
 		if (this.textFileService.getDirty().length < 2) {
@@ -651,8 +651,8 @@ export abstract class BaseCloseAllAction extends Action {
 
 export class CloseAllEditorsAction extends BaseCloseAllAction {
 
-	public static readonly ID = 'workbench.action.closeAllEditors';
-	public static readonly LABEL = nls.localize('closeAllEditors', "Close All Editors");
+	static readonly ID = 'workbench.action.closeAllEditors';
+	static readonly LABEL = nls.localize('closeAllEditors', "Close All Editors");
 
 	constructor(
 		id: string,
@@ -670,8 +670,8 @@ export class CloseAllEditorsAction extends BaseCloseAllAction {
 
 export class CloseAllEditorGroupsAction extends BaseCloseAllAction {
 
-	public static readonly ID = 'workbench.action.closeAllGroups';
-	public static readonly LABEL = nls.localize('closeAllGroups', "Close All Editor Groups");
+	static readonly ID = 'workbench.action.closeAllGroups';
+	static readonly LABEL = nls.localize('closeAllGroups', "Close All Editor Groups");
 
 	constructor(
 		id: string,
@@ -691,8 +691,8 @@ export class CloseAllEditorGroupsAction extends BaseCloseAllAction {
 
 export class CloseEditorsInOtherGroupsAction extends Action {
 
-	public static readonly ID = 'workbench.action.closeEditorsInOtherGroups';
-	public static readonly LABEL = nls.localize('closeEditorsInOtherGroups', "Close Editors in Other Groups");
+	static readonly ID = 'workbench.action.closeEditorsInOtherGroups';
+	static readonly LABEL = nls.localize('closeEditorsInOtherGroups', "Close Editors in Other Groups");
 
 	constructor(
 		id: string,
@@ -702,7 +702,7 @@ export class CloseEditorsInOtherGroupsAction extends Action {
 		super(id, label);
 	}
 
-	public run(context?: IEditorIdentifier): TPromise<any> {
+	run(context?: IEditorIdentifier): TPromise<any> {
 		const groupToSkip = context ? this.editorGroupService.getGroup(context.groupId) : this.editorGroupService.activeGroup;
 		return TPromise.join(this.editorGroupService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE).map(g => {
 			if (g.id === groupToSkip.id) {
@@ -725,7 +725,7 @@ export class BaseMoveGroupAction extends Action {
 		super(id, label);
 	}
 
-	public run(context?: IEditorIdentifier): TPromise<any> {
+	run(context?: IEditorIdentifier): TPromise<any> {
 		let sourceGroup: IEditorGroup;
 		if (context && typeof context.groupId === 'number') {
 			sourceGroup = this.editorGroupService.getGroup(context.groupId);
@@ -771,8 +771,8 @@ export class BaseMoveGroupAction extends Action {
 
 export class MoveGroupLeftAction extends BaseMoveGroupAction {
 
-	public static readonly ID = 'workbench.action.moveActiveEditorGroupLeft';
-	public static readonly LABEL = nls.localize('moveActiveGroupLeft', "Move Editor Group Left");
+	static readonly ID = 'workbench.action.moveActiveEditorGroupLeft';
+	static readonly LABEL = nls.localize('moveActiveGroupLeft', "Move Editor Group Left");
 
 	constructor(
 		id: string,
@@ -785,8 +785,8 @@ export class MoveGroupLeftAction extends BaseMoveGroupAction {
 
 export class MoveGroupRightAction extends BaseMoveGroupAction {
 
-	public static readonly ID = 'workbench.action.moveActiveEditorGroupRight';
-	public static readonly LABEL = nls.localize('moveActiveGroupRight', "Move Editor Group Right");
+	static readonly ID = 'workbench.action.moveActiveEditorGroupRight';
+	static readonly LABEL = nls.localize('moveActiveGroupRight', "Move Editor Group Right");
 
 	constructor(
 		id: string,
@@ -799,8 +799,8 @@ export class MoveGroupRightAction extends BaseMoveGroupAction {
 
 export class MoveGroupUpAction extends BaseMoveGroupAction {
 
-	public static readonly ID = 'workbench.action.moveActiveEditorGroupUp';
-	public static readonly LABEL = nls.localize('moveActiveGroupUp', "Move Editor Group Up");
+	static readonly ID = 'workbench.action.moveActiveEditorGroupUp';
+	static readonly LABEL = nls.localize('moveActiveGroupUp', "Move Editor Group Up");
 
 	constructor(
 		id: string,
@@ -813,8 +813,8 @@ export class MoveGroupUpAction extends BaseMoveGroupAction {
 
 export class MoveGroupDownAction extends BaseMoveGroupAction {
 
-	public static readonly ID = 'workbench.action.moveActiveEditorGroupDown';
-	public static readonly LABEL = nls.localize('moveActiveGroupDown', "Move Editor Group Down");
+	static readonly ID = 'workbench.action.moveActiveEditorGroupDown';
+	static readonly LABEL = nls.localize('moveActiveGroupDown', "Move Editor Group Down");
 
 	constructor(
 		id: string,
@@ -827,14 +827,14 @@ export class MoveGroupDownAction extends BaseMoveGroupAction {
 
 export class MinimizeOtherGroupsAction extends Action {
 
-	public static readonly ID = 'workbench.action.minimizeOtherEditors';
-	public static readonly LABEL = nls.localize('minimizeOtherEditorGroups', "Maximize Editor Group");
+	static readonly ID = 'workbench.action.minimizeOtherEditors';
+	static readonly LABEL = nls.localize('minimizeOtherEditorGroups', "Maximize Editor Group");
 
 	constructor(id: string, label: string, @IEditorGroupsService private editorGroupService: IEditorGroupsService) {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.editorGroupService.arrangeGroups(GroupsArrangement.MINIMIZE_OTHERS);
 
 		return TPromise.as(false);
@@ -843,14 +843,14 @@ export class MinimizeOtherGroupsAction extends Action {
 
 export class ResetGroupSizesAction extends Action {
 
-	public static readonly ID = 'workbench.action.evenEditorWidths';
-	public static readonly LABEL = nls.localize('evenEditorGroups', "Reset Editor Group Sizes");
+	static readonly ID = 'workbench.action.evenEditorWidths';
+	static readonly LABEL = nls.localize('evenEditorGroups', "Reset Editor Group Sizes");
 
 	constructor(id: string, label: string, @IEditorGroupsService private editorGroupService: IEditorGroupsService) {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.editorGroupService.arrangeGroups(GroupsArrangement.EVEN);
 
 		return TPromise.as(false);
@@ -859,8 +859,8 @@ export class ResetGroupSizesAction extends Action {
 
 export class MaximizeGroupAction extends Action {
 
-	public static readonly ID = 'workbench.action.maximizeEditor';
-	public static readonly LABEL = nls.localize('maximizeEditor', "Maximize Editor Group and Hide Sidebar");
+	static readonly ID = 'workbench.action.maximizeEditor';
+	static readonly LABEL = nls.localize('maximizeEditor', "Maximize Editor Group and Hide Sidebar");
 
 	constructor(
 		id: string,
@@ -872,7 +872,7 @@ export class MaximizeGroupAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		if (this.editorService.activeEditor) {
 			this.editorGroupService.arrangeGroups(GroupsArrangement.MINIMIZE_OTHERS);
 
@@ -894,7 +894,7 @@ export abstract class BaseNavigateEditorAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const result = this.navigate();
 		if (!result) {
 			return TPromise.as(false);
@@ -914,8 +914,8 @@ export abstract class BaseNavigateEditorAction extends Action {
 
 export class OpenNextEditor extends BaseNavigateEditorAction {
 
-	public static readonly ID = 'workbench.action.nextEditor';
-	public static readonly LABEL = nls.localize('openNextEditor', "Open Next Editor");
+	static readonly ID = 'workbench.action.nextEditor';
+	static readonly LABEL = nls.localize('openNextEditor', "Open Next Editor");
 
 	constructor(
 		id: string,
@@ -949,8 +949,8 @@ export class OpenNextEditor extends BaseNavigateEditorAction {
 
 export class OpenPreviousEditor extends BaseNavigateEditorAction {
 
-	public static readonly ID = 'workbench.action.previousEditor';
-	public static readonly LABEL = nls.localize('openPreviousEditor', "Open Previous Editor");
+	static readonly ID = 'workbench.action.previousEditor';
+	static readonly LABEL = nls.localize('openPreviousEditor', "Open Previous Editor");
 
 	constructor(
 		id: string,
@@ -984,8 +984,8 @@ export class OpenPreviousEditor extends BaseNavigateEditorAction {
 
 export class OpenNextEditorInGroup extends BaseNavigateEditorAction {
 
-	public static readonly ID = 'workbench.action.nextEditorInGroup';
-	public static readonly LABEL = nls.localize('nextEditorInGroup', "Open Next Editor in Group");
+	static readonly ID = 'workbench.action.nextEditorInGroup';
+	static readonly LABEL = nls.localize('nextEditorInGroup', "Open Next Editor in Group");
 
 	constructor(
 		id: string,
@@ -1007,8 +1007,8 @@ export class OpenNextEditorInGroup extends BaseNavigateEditorAction {
 
 export class OpenPreviousEditorInGroup extends BaseNavigateEditorAction {
 
-	public static readonly ID = 'workbench.action.previousEditorInGroup';
-	public static readonly LABEL = nls.localize('openPreviousEditorInGroup', "Open Previous Editor in Group");
+	static readonly ID = 'workbench.action.previousEditorInGroup';
+	static readonly LABEL = nls.localize('openPreviousEditorInGroup', "Open Previous Editor in Group");
 
 	constructor(
 		id: string,
@@ -1030,8 +1030,8 @@ export class OpenPreviousEditorInGroup extends BaseNavigateEditorAction {
 
 export class OpenFirstEditorInGroup extends BaseNavigateEditorAction {
 
-	public static readonly ID = 'workbench.action.firstEditorInGroup';
-	public static readonly LABEL = nls.localize('firstEditorInGroup', "Open First Editor in Group");
+	static readonly ID = 'workbench.action.firstEditorInGroup';
+	static readonly LABEL = nls.localize('firstEditorInGroup', "Open First Editor in Group");
 
 	constructor(
 		id: string,
@@ -1052,8 +1052,8 @@ export class OpenFirstEditorInGroup extends BaseNavigateEditorAction {
 
 export class OpenLastEditorInGroup extends BaseNavigateEditorAction {
 
-	public static readonly ID = 'workbench.action.lastEditorInGroup';
-	public static readonly LABEL = nls.localize('lastEditorInGroup', "Open Last Editor in Group");
+	static readonly ID = 'workbench.action.lastEditorInGroup';
+	static readonly LABEL = nls.localize('lastEditorInGroup', "Open Last Editor in Group");
 
 	constructor(
 		id: string,
@@ -1074,14 +1074,14 @@ export class OpenLastEditorInGroup extends BaseNavigateEditorAction {
 
 export class NavigateForwardAction extends Action {
 
-	public static readonly ID = 'workbench.action.navigateForward';
-	public static readonly LABEL = nls.localize('navigateNext', "Go Forward");
+	static readonly ID = 'workbench.action.navigateForward';
+	static readonly LABEL = nls.localize('navigateNext', "Go Forward");
 
 	constructor(id: string, label: string, @IHistoryService private historyService: IHistoryService) {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.historyService.forward();
 
 		return TPromise.as(null);
@@ -1090,14 +1090,14 @@ export class NavigateForwardAction extends Action {
 
 export class NavigateBackwardsAction extends Action {
 
-	public static readonly ID = 'workbench.action.navigateBack';
-	public static readonly LABEL = nls.localize('navigatePrevious', "Go Back");
+	static readonly ID = 'workbench.action.navigateBack';
+	static readonly LABEL = nls.localize('navigatePrevious', "Go Back");
 
 	constructor(id: string, label: string, @IHistoryService private historyService: IHistoryService) {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.historyService.back();
 
 		return TPromise.as(null);
@@ -1106,14 +1106,14 @@ export class NavigateBackwardsAction extends Action {
 
 export class NavigateLastAction extends Action {
 
-	public static readonly ID = 'workbench.action.navigateLast';
-	public static readonly LABEL = nls.localize('navigateLast', "Go Last");
+	static readonly ID = 'workbench.action.navigateLast';
+	static readonly LABEL = nls.localize('navigateLast', "Go Last");
 
 	constructor(id: string, label: string, @IHistoryService private historyService: IHistoryService) {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.historyService.last();
 
 		return TPromise.as(null);
@@ -1122,8 +1122,8 @@ export class NavigateLastAction extends Action {
 
 export class ReopenClosedEditorAction extends Action {
 
-	public static readonly ID = 'workbench.action.reopenClosedEditor';
-	public static readonly LABEL = nls.localize('reopenClosedEditor', "Reopen Closed Editor");
+	static readonly ID = 'workbench.action.reopenClosedEditor';
+	static readonly LABEL = nls.localize('reopenClosedEditor', "Reopen Closed Editor");
 
 	constructor(
 		id: string,
@@ -1133,7 +1133,7 @@ export class ReopenClosedEditorAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.historyService.reopenLastClosedEditor();
 
 		return TPromise.as(false);
@@ -1142,8 +1142,8 @@ export class ReopenClosedEditorAction extends Action {
 
 export class ClearRecentFilesAction extends Action {
 
-	public static readonly ID = 'workbench.action.clearRecentFiles';
-	public static readonly LABEL = nls.localize('clearRecentFiles', "Clear Recently Opened");
+	static readonly ID = 'workbench.action.clearRecentFiles';
+	static readonly LABEL = nls.localize('clearRecentFiles', "Clear Recently Opened");
 
 	constructor(
 		id: string,
@@ -1153,7 +1153,7 @@ export class ClearRecentFilesAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.windowsService.clearRecentlyOpened();
 
 		return TPromise.as(false);
@@ -1162,8 +1162,8 @@ export class ClearRecentFilesAction extends Action {
 
 export class ShowEditorsInActiveGroupAction extends QuickOpenAction {
 
-	public static readonly ID = 'workbench.action.showEditorsInActiveGroup';
-	public static readonly LABEL = nls.localize('showEditorsInActiveGroup', "Show Editors in Active Group");
+	static readonly ID = 'workbench.action.showEditorsInActiveGroup';
+	static readonly LABEL = nls.localize('showEditorsInActiveGroup', "Show Editors in Active Group");
 
 	constructor(
 		actionId: string,
@@ -1176,8 +1176,8 @@ export class ShowEditorsInActiveGroupAction extends QuickOpenAction {
 
 export class ShowAllEditorsAction extends QuickOpenAction {
 
-	public static readonly ID = 'workbench.action.showAllEditors';
-	public static readonly LABEL = nls.localize('showAllEditors', "Show All Editors");
+	static readonly ID = 'workbench.action.showAllEditors';
+	static readonly LABEL = nls.localize('showAllEditors', "Show All Editors");
 
 	constructor(actionId: string, actionLabel: string, @IQuickOpenService quickOpenService: IQuickOpenService) {
 		super(actionId, actionLabel, NAVIGATE_ALL_EDITORS_GROUP_PREFIX, quickOpenService);
@@ -1195,7 +1195,7 @@ export class BaseQuickOpenEditorInGroupAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const keys = this.keybindingService.lookupKeybindings(this.id);
 
 
@@ -1208,8 +1208,8 @@ export class BaseQuickOpenEditorInGroupAction extends Action {
 
 export class OpenPreviousRecentlyUsedEditorInGroupAction extends BaseQuickOpenEditorInGroupAction {
 
-	public static readonly ID = 'workbench.action.openPreviousRecentlyUsedEditorInGroup';
-	public static readonly LABEL = nls.localize('openPreviousRecentlyUsedEditorInGroup', "Open Previous Recently Used Editor in Group");
+	static readonly ID = 'workbench.action.openPreviousRecentlyUsedEditorInGroup';
+	static readonly LABEL = nls.localize('openPreviousRecentlyUsedEditorInGroup', "Open Previous Recently Used Editor in Group");
 
 	constructor(
 		id: string,
@@ -1223,8 +1223,8 @@ export class OpenPreviousRecentlyUsedEditorInGroupAction extends BaseQuickOpenEd
 
 export class OpenNextRecentlyUsedEditorInGroupAction extends BaseQuickOpenEditorInGroupAction {
 
-	public static readonly ID = 'workbench.action.openNextRecentlyUsedEditorInGroup';
-	public static readonly LABEL = nls.localize('openNextRecentlyUsedEditorInGroup', "Open Next Recently Used Editor in Group");
+	static readonly ID = 'workbench.action.openNextRecentlyUsedEditorInGroup';
+	static readonly LABEL = nls.localize('openNextRecentlyUsedEditorInGroup', "Open Next Recently Used Editor in Group");
 
 	constructor(
 		id: string,
@@ -1238,8 +1238,8 @@ export class OpenNextRecentlyUsedEditorInGroupAction extends BaseQuickOpenEditor
 
 export class OpenPreviousEditorFromHistoryAction extends Action {
 
-	public static readonly ID = 'workbench.action.openPreviousEditorFromHistory';
-	public static readonly LABEL = nls.localize('navigateEditorHistoryByInput', "Open Previous Editor from History");
+	static readonly ID = 'workbench.action.openPreviousEditorFromHistory';
+	static readonly LABEL = nls.localize('navigateEditorHistoryByInput', "Open Previous Editor from History");
 
 	constructor(
 		id: string,
@@ -1250,7 +1250,7 @@ export class OpenPreviousEditorFromHistoryAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const keys = this.keybindingService.lookupKeybindings(this.id);
 
 		this.quickOpenService.show(null, { quickNavigateConfiguration: { keybindings: keys } });
@@ -1261,14 +1261,14 @@ export class OpenPreviousEditorFromHistoryAction extends Action {
 
 export class OpenNextRecentlyUsedEditorAction extends Action {
 
-	public static readonly ID = 'workbench.action.openNextRecentlyUsedEditor';
-	public static readonly LABEL = nls.localize('openNextRecentlyUsedEditor', "Open Next Recently Used Editor");
+	static readonly ID = 'workbench.action.openNextRecentlyUsedEditor';
+	static readonly LABEL = nls.localize('openNextRecentlyUsedEditor', "Open Next Recently Used Editor");
 
 	constructor(id: string, label: string, @IHistoryService private historyService: IHistoryService) {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.historyService.forward(true);
 
 		return TPromise.as(null);
@@ -1277,14 +1277,14 @@ export class OpenNextRecentlyUsedEditorAction extends Action {
 
 export class OpenPreviousRecentlyUsedEditorAction extends Action {
 
-	public static readonly ID = 'workbench.action.openPreviousRecentlyUsedEditor';
-	public static readonly LABEL = nls.localize('openPreviousRecentlyUsedEditor', "Open Previous Recently Used Editor");
+	static readonly ID = 'workbench.action.openPreviousRecentlyUsedEditor';
+	static readonly LABEL = nls.localize('openPreviousRecentlyUsedEditor', "Open Previous Recently Used Editor");
 
 	constructor(id: string, label: string, @IHistoryService private historyService: IHistoryService) {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.historyService.back(true);
 
 		return TPromise.as(null);
@@ -1293,8 +1293,8 @@ export class OpenPreviousRecentlyUsedEditorAction extends Action {
 
 export class ClearEditorHistoryAction extends Action {
 
-	public static readonly ID = 'workbench.action.clearEditorHistory';
-	public static readonly LABEL = nls.localize('clearEditorHistory', "Clear Editor History");
+	static readonly ID = 'workbench.action.clearEditorHistory';
+	static readonly LABEL = nls.localize('clearEditorHistory', "Clear Editor History");
 
 	constructor(
 		id: string,
@@ -1304,7 +1304,7 @@ export class ClearEditorHistoryAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 
 		// Editor history
 		this.historyService.clear();
@@ -1315,8 +1315,8 @@ export class ClearEditorHistoryAction extends Action {
 
 export class MoveEditorLeftInGroupAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.moveEditorLeftInGroup';
-	public static readonly LABEL = nls.localize('moveEditorLeft', "Move Editor Left");
+	static readonly ID = 'workbench.action.moveEditorLeftInGroup';
+	static readonly LABEL = nls.localize('moveEditorLeft', "Move Editor Left");
 
 	constructor(
 		id: string,
@@ -1329,8 +1329,8 @@ export class MoveEditorLeftInGroupAction extends ExecuteCommandAction {
 
 export class MoveEditorRightInGroupAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.moveEditorRightInGroup';
-	public static readonly LABEL = nls.localize('moveEditorRight', "Move Editor Right");
+	static readonly ID = 'workbench.action.moveEditorRightInGroup';
+	static readonly LABEL = nls.localize('moveEditorRight', "Move Editor Right");
 
 	constructor(
 		id: string,
@@ -1343,8 +1343,8 @@ export class MoveEditorRightInGroupAction extends ExecuteCommandAction {
 
 export class MoveEditorToPreviousGroupAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.moveEditorToPreviousGroup';
-	public static readonly LABEL = nls.localize('moveEditorToPreviousGroup', "Move Editor into Previous Group");
+	static readonly ID = 'workbench.action.moveEditorToPreviousGroup';
+	static readonly LABEL = nls.localize('moveEditorToPreviousGroup', "Move Editor into Previous Group");
 
 	constructor(
 		id: string,
@@ -1357,8 +1357,8 @@ export class MoveEditorToPreviousGroupAction extends ExecuteCommandAction {
 
 export class MoveEditorToNextGroupAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.moveEditorToNextGroup';
-	public static readonly LABEL = nls.localize('moveEditorToNextGroup', "Move Editor into Next Group");
+	static readonly ID = 'workbench.action.moveEditorToNextGroup';
+	static readonly LABEL = nls.localize('moveEditorToNextGroup', "Move Editor into Next Group");
 
 	constructor(
 		id: string,
@@ -1371,8 +1371,8 @@ export class MoveEditorToNextGroupAction extends ExecuteCommandAction {
 
 export class MoveEditorToAboveGroupAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.moveEditorToAboveGroup';
-	public static readonly LABEL = nls.localize('moveEditorToAboveGroup', "Move Editor into Above Group");
+	static readonly ID = 'workbench.action.moveEditorToAboveGroup';
+	static readonly LABEL = nls.localize('moveEditorToAboveGroup', "Move Editor into Above Group");
 
 	constructor(
 		id: string,
@@ -1385,8 +1385,8 @@ export class MoveEditorToAboveGroupAction extends ExecuteCommandAction {
 
 export class MoveEditorToBelowGroupAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.moveEditorToBelowGroup';
-	public static readonly LABEL = nls.localize('moveEditorToBelowGroup', "Move Editor into Below Group");
+	static readonly ID = 'workbench.action.moveEditorToBelowGroup';
+	static readonly LABEL = nls.localize('moveEditorToBelowGroup', "Move Editor into Below Group");
 
 	constructor(
 		id: string,
@@ -1399,8 +1399,8 @@ export class MoveEditorToBelowGroupAction extends ExecuteCommandAction {
 
 export class MoveEditorToLeftGroupAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.moveEditorToLeftGroup';
-	public static readonly LABEL = nls.localize('moveEditorToLeftGroup', "Move Editor into Left Group");
+	static readonly ID = 'workbench.action.moveEditorToLeftGroup';
+	static readonly LABEL = nls.localize('moveEditorToLeftGroup', "Move Editor into Left Group");
 
 	constructor(
 		id: string,
@@ -1413,8 +1413,8 @@ export class MoveEditorToLeftGroupAction extends ExecuteCommandAction {
 
 export class MoveEditorToRightGroupAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.moveEditorToRightGroup';
-	public static readonly LABEL = nls.localize('moveEditorToRightGroup', "Move Editor into Right Group");
+	static readonly ID = 'workbench.action.moveEditorToRightGroup';
+	static readonly LABEL = nls.localize('moveEditorToRightGroup', "Move Editor into Right Group");
 
 	constructor(
 		id: string,
@@ -1427,8 +1427,8 @@ export class MoveEditorToRightGroupAction extends ExecuteCommandAction {
 
 export class MoveEditorToFirstGroupAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.moveEditorToFirstGroup';
-	public static readonly LABEL = nls.localize('moveEditorToFirstGroup', "Move Editor into First Group");
+	static readonly ID = 'workbench.action.moveEditorToFirstGroup';
+	static readonly LABEL = nls.localize('moveEditorToFirstGroup', "Move Editor into First Group");
 
 	constructor(
 		id: string,
@@ -1441,8 +1441,8 @@ export class MoveEditorToFirstGroupAction extends ExecuteCommandAction {
 
 export class MoveEditorToLastGroupAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.moveEditorToLastGroup';
-	public static readonly LABEL = nls.localize('moveEditorToLastGroup', "Move Editor into Last Group");
+	static readonly ID = 'workbench.action.moveEditorToLastGroup';
+	static readonly LABEL = nls.localize('moveEditorToLastGroup', "Move Editor into Last Group");
 
 	constructor(
 		id: string,
@@ -1455,8 +1455,8 @@ export class MoveEditorToLastGroupAction extends ExecuteCommandAction {
 
 export class EditorLayoutSingleAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.editorLayoutSingle';
-	public static readonly LABEL = nls.localize('editorLayoutSingle', "Single Column Editor Layout");
+	static readonly ID = 'workbench.action.editorLayoutSingle';
+	static readonly LABEL = nls.localize('editorLayoutSingle', "Single Column Editor Layout");
 
 	constructor(
 		id: string,
@@ -1469,8 +1469,8 @@ export class EditorLayoutSingleAction extends ExecuteCommandAction {
 
 export class EditorLayoutTwoColumnsAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.editorLayoutTwoColumns';
-	public static readonly LABEL = nls.localize('editorLayoutTwoColumns', "Two Columns Editor Layout");
+	static readonly ID = 'workbench.action.editorLayoutTwoColumns';
+	static readonly LABEL = nls.localize('editorLayoutTwoColumns', "Two Columns Editor Layout");
 
 	constructor(
 		id: string,
@@ -1483,8 +1483,8 @@ export class EditorLayoutTwoColumnsAction extends ExecuteCommandAction {
 
 export class EditorLayoutThreeColumnsAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.editorLayoutThreeColumns';
-	public static readonly LABEL = nls.localize('editorLayoutThreeColumns', "Three Columns Editor Layout");
+	static readonly ID = 'workbench.action.editorLayoutThreeColumns';
+	static readonly LABEL = nls.localize('editorLayoutThreeColumns', "Three Columns Editor Layout");
 
 	constructor(
 		id: string,
@@ -1497,8 +1497,8 @@ export class EditorLayoutThreeColumnsAction extends ExecuteCommandAction {
 
 export class EditorLayoutTwoRowsAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.editorLayoutTwoRows';
-	public static readonly LABEL = nls.localize('editorLayoutTwoRows', "Two Rows Editor Layout");
+	static readonly ID = 'workbench.action.editorLayoutTwoRows';
+	static readonly LABEL = nls.localize('editorLayoutTwoRows', "Two Rows Editor Layout");
 
 	constructor(
 		id: string,
@@ -1511,8 +1511,8 @@ export class EditorLayoutTwoRowsAction extends ExecuteCommandAction {
 
 export class EditorLayoutThreeRowsAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.editorLayoutThreeRows';
-	public static readonly LABEL = nls.localize('editorLayoutThreeRows', "Three Rows Editor Layout");
+	static readonly ID = 'workbench.action.editorLayoutThreeRows';
+	static readonly LABEL = nls.localize('editorLayoutThreeRows', "Three Rows Editor Layout");
 
 	constructor(
 		id: string,
@@ -1525,8 +1525,8 @@ export class EditorLayoutThreeRowsAction extends ExecuteCommandAction {
 
 export class EditorLayoutTwoByTwoGridAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.editorLayoutTwoByTwoGrid';
-	public static readonly LABEL = nls.localize('editorLayoutTwoByTwoGrid', "Grid Editor Layout (2x2)");
+	static readonly ID = 'workbench.action.editorLayoutTwoByTwoGrid';
+	static readonly LABEL = nls.localize('editorLayoutTwoByTwoGrid', "Grid Editor Layout (2x2)");
 
 	constructor(
 		id: string,
@@ -1539,8 +1539,8 @@ export class EditorLayoutTwoByTwoGridAction extends ExecuteCommandAction {
 
 export class EditorLayoutTwoColumnsBottomAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.editorLayoutTwoColumnsBottom';
-	public static readonly LABEL = nls.localize('editorLayoutTwoColumnsBottom', "Two Columns Bottom Editor Layout");
+	static readonly ID = 'workbench.action.editorLayoutTwoColumnsBottom';
+	static readonly LABEL = nls.localize('editorLayoutTwoColumnsBottom', "Two Columns Bottom Editor Layout");
 
 	constructor(
 		id: string,
@@ -1553,8 +1553,8 @@ export class EditorLayoutTwoColumnsBottomAction extends ExecuteCommandAction {
 
 export class EditorLayoutTwoColumnsRightAction extends ExecuteCommandAction {
 
-	public static readonly ID = 'workbench.action.editorLayoutTwoColumnsRight';
-	public static readonly LABEL = nls.localize('editorLayoutTwoColumnsRight', "Two Columns Right Editor Layout");
+	static readonly ID = 'workbench.action.editorLayoutTwoColumnsRight';
+	static readonly LABEL = nls.localize('editorLayoutTwoColumnsRight', "Two Columns Right Editor Layout");
 
 	constructor(
 		id: string,
@@ -1576,7 +1576,7 @@ export class BaseCreateEditorGroupAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this.editorGroupService.addGroup(this.editorGroupService.activeGroup, this.direction, { activate: true });
 
 		return TPromise.as(true);
@@ -1585,8 +1585,8 @@ export class BaseCreateEditorGroupAction extends Action {
 
 export class NewEditorGroupLeftAction extends BaseCreateEditorGroupAction {
 
-	public static readonly ID = 'workbench.action.newGroupLeft';
-	public static readonly LABEL = nls.localize('newEditorLeft', "New Editor Group to the Left");
+	static readonly ID = 'workbench.action.newGroupLeft';
+	static readonly LABEL = nls.localize('newEditorLeft', "New Editor Group to the Left");
 
 	constructor(
 		id: string,
@@ -1599,8 +1599,8 @@ export class NewEditorGroupLeftAction extends BaseCreateEditorGroupAction {
 
 export class NewEditorGroupRightAction extends BaseCreateEditorGroupAction {
 
-	public static readonly ID = 'workbench.action.newGroupRight';
-	public static readonly LABEL = nls.localize('newEditorRight', "New Editor Group to the Right");
+	static readonly ID = 'workbench.action.newGroupRight';
+	static readonly LABEL = nls.localize('newEditorRight', "New Editor Group to the Right");
 
 	constructor(
 		id: string,
@@ -1613,8 +1613,8 @@ export class NewEditorGroupRightAction extends BaseCreateEditorGroupAction {
 
 export class NewEditorGroupAboveAction extends BaseCreateEditorGroupAction {
 
-	public static readonly ID = 'workbench.action.newGroupAbove';
-	public static readonly LABEL = nls.localize('newEditorAbove', "New Editor Group Above");
+	static readonly ID = 'workbench.action.newGroupAbove';
+	static readonly LABEL = nls.localize('newEditorAbove', "New Editor Group Above");
 
 	constructor(
 		id: string,
@@ -1627,8 +1627,8 @@ export class NewEditorGroupAboveAction extends BaseCreateEditorGroupAction {
 
 export class NewEditorGroupBelowAction extends BaseCreateEditorGroupAction {
 
-	public static readonly ID = 'workbench.action.newGroupBelow';
-	public static readonly LABEL = nls.localize('newEditorBelow', "New Editor Group Below");
+	static readonly ID = 'workbench.action.newGroupBelow';
+	static readonly LABEL = nls.localize('newEditorBelow', "New Editor Group Below");
 
 	constructor(
 		id: string,
diff --git a/src/vs/workbench/browser/parts/editor/editorControl.ts b/src/vs/workbench/browser/parts/editor/editorControl.ts
index 039e66bd4fd..4d99ce5d284 100644
--- a/src/vs/workbench/browser/parts/editor/editorControl.ts
+++ b/src/vs/workbench/browser/parts/editor/editorControl.ts
@@ -153,9 +153,9 @@ export class EditorControl extends Disposable {
 
 		// If the input did not change, return early and only apply the options
 		// unless the options instruct us to force open it even if it is the same
-		const forceOpen = options && options.forceOpen;
+		const forceReload = options && options.forceReload;
 		const inputMatches = control.input && control.input.matches(editor);
-		if (inputMatches && !forceOpen) {
+		if (inputMatches && !forceReload) {
 
 			// Forward options
 			control.setOptions(options);
diff --git a/src/vs/workbench/browser/parts/editor/editorDropTarget.ts b/src/vs/workbench/browser/parts/editor/editorDropTarget.ts
index d2dafc0cfe3..2772e4746ca 100644
--- a/src/vs/workbench/browser/parts/editor/editorDropTarget.ts
+++ b/src/vs/workbench/browser/parts/editor/editorDropTarget.ts
@@ -57,8 +57,14 @@ class DropOverlay extends Themable {
 		this.container = document.createElement('div');
 		this.container.id = DropOverlay.OVERLAY_ID;
 		this.container.style.top = `${overlayOffsetHeight}px`;
+
+		// Parent
 		this.groupView.element.appendChild(this.container);
-		this._register(toDisposable(() => this.groupView.element.removeChild(this.container)));
+		addClass(this.groupView.element, 'dragged-over');
+		this._register(toDisposable(() => {
+			this.groupView.element.removeChild(this.container);
+			removeClass(this.groupView.element, 'dragged-over');
+		}));
 
 		// Overlay
 		this.overlay = document.createElement('div');
@@ -111,7 +117,7 @@ class DropOverlay extends Themable {
 				}
 
 				// Position overlay
-				this.positionOverlay(e.offsetX, e.offsetY);
+				this.positionOverlay(e.offsetX, e.offsetY, isDraggingGroup);
 			},
 
 			onDragLeave: e => this.dispose(),
@@ -248,21 +254,46 @@ class DropOverlay extends Themable {
 		return (e.ctrlKey && !isMacintosh) || (e.altKey && isMacintosh);
 	}
 
-	private positionOverlay(mousePosX: number, mousePosY: number): void {
-		const groupViewWidth = this.groupView.element.clientWidth;
-		const groupViewHeight = this.groupView.element.clientHeight;
+	private positionOverlay(mousePosX: number, mousePosY: number, isDraggingGroup: boolean): void {
+		const preferSplitVertically = this.accessor.partOptions.openSideBySideDirection === 'right';
 
-		const edgeWidthThreshold = groupViewWidth * 0.2; 	// offer to split 20% around center width
-		const edgeHeightThreshold = groupViewHeight * 0.2; 	// offer to split 20% around center height
+		const editorControlWidth = this.groupView.element.clientWidth;
+		const editorControlHeight = this.groupView.element.clientHeight - this.getOverlayOffsetHeight();
 
-		const splitWidthThreshold = groupViewWidth / 3;		// offer to split left/right at 33%
-		const splitHeightThreshold = groupViewHeight / 3;	// offer to split up/down at 33%
+		let edgeWidthThresholdFactor: number;
+		if (isDraggingGroup) {
+			edgeWidthThresholdFactor = preferSplitVertically ? 0.3 : 0.1; // give larger threshold when dragging group depending on preferred split direction
+		} else {
+			edgeWidthThresholdFactor = 0.1; // 10% threshold to split if dragging editors
+		}
+
+		let edgeHeightThresholdFactor: number;
+		if (isDraggingGroup) {
+			edgeHeightThresholdFactor = preferSplitVertically ? 0.1 : 0.3; // give larger threshold when dragging group depending on preferred split direction
+		} else {
+			edgeHeightThresholdFactor = 0.1; // 10% threshold to split if dragging editors
+		}
+
+		const edgeWidthThreshold = editorControlWidth * edgeWidthThresholdFactor;
+		const edgeHeightThreshold = editorControlHeight * edgeHeightThresholdFactor;
+
+		const splitWidthThreshold = editorControlWidth / 3;		// offer to split left/right at 33%
+		const splitHeightThreshold = editorControlHeight / 3;	// offer to split up/down at 33%
+
+		// Enable to debug the drop threshold square
+		// let child = this.overlay.children.item(0) as HTMLElement || this.overlay.appendChild(document.createElement('div'));
+		// child.style.backgroundColor = 'red';
+		// child.style.position = 'absolute';
+		// child.style.width = (groupViewWidth - (2 * edgeWidthThreshold)) + 'px';
+		// child.style.height = (groupViewHeight - (2 * edgeHeightThreshold)) + 'px';
+		// child.style.left = edgeWidthThreshold + 'px';
+		// child.style.top = edgeHeightThreshold + 'px';
 
 		// No split if mouse is above certain threshold in the center of the view
 		let splitDirection: GroupDirection;
 		if (
-			mousePosX > edgeWidthThreshold && mousePosX < groupViewWidth - edgeWidthThreshold &&
-			mousePosY > edgeHeightThreshold && mousePosY < groupViewHeight - edgeHeightThreshold
+			mousePosX > edgeWidthThreshold && mousePosX < editorControlWidth - edgeWidthThreshold &&
+			mousePosY > edgeHeightThreshold && mousePosY < editorControlHeight - edgeHeightThreshold
 		) {
 			splitDirection = void 0;
 		}
@@ -279,13 +310,12 @@ class DropOverlay extends Themable {
 			// | LEFT	|-----------------------|	RIGHT	|
 			// |		|		SPLIT DOWN		|			|
 			// ----------------------------------------------
-			const preferSplitVertically = this.accessor.partOptions.openSideBySideDirection === 'right';
 			if (preferSplitVertically) {
 				if (mousePosX < splitWidthThreshold) {
 					splitDirection = GroupDirection.LEFT;
 				} else if (mousePosX > splitWidthThreshold * 2) {
 					splitDirection = GroupDirection.RIGHT;
-				} else if (mousePosY < groupViewHeight / 2) {
+				} else if (mousePosY < editorControlHeight / 2) {
 					splitDirection = GroupDirection.UP;
 				} else {
 					splitDirection = GroupDirection.DOWN;
@@ -306,7 +336,7 @@ class DropOverlay extends Themable {
 					splitDirection = GroupDirection.UP;
 				} else if (mousePosY > splitHeightThreshold * 2) {
 					splitDirection = GroupDirection.DOWN;
-				} else if (mousePosX < groupViewWidth / 2) {
+				} else if (mousePosX < editorControlWidth / 2) {
 					splitDirection = GroupDirection.LEFT;
 				} else {
 					splitDirection = GroupDirection.RIGHT;
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupView.ts b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
index 012077d6b2d..23253584873 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupView.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
@@ -1278,14 +1278,15 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 		if (activeReplacement) {
 
 			// Open replacement as active editor
-			return this.doOpenEditor(activeReplacement.replacement, activeReplacement.options).then(() => {
+			const openEditorResult = this.doOpenEditor(activeReplacement.replacement, activeReplacement.options);
 
-				// Close previous active editor
-				this.doCloseInactiveEditor(activeReplacement.editor);
+			// Close previous active editor
+			this.doCloseInactiveEditor(activeReplacement.editor);
 
-				// Forward to title control
-				this.titleAreaControl.closeEditor(activeReplacement.editor);
-			});
+			// Forward to title control
+			this.titleAreaControl.closeEditor(activeReplacement.editor);
+
+			return openEditorResult;
 		}
 
 		return TPromise.as(void 0);
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index 412afb3d2da..e5631a42a10 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -28,14 +28,11 @@ import { Scope } from 'vs/workbench/common/memento';
 import { ISerializedEditorGroup, isSerializedEditorGroup } from 'vs/workbench/common/editor/editorGroup';
 import { TValueCallback, TPromise } from 'vs/base/common/winjs.base';
 import { always } from 'vs/base/common/async';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { IWindowService } from 'vs/platform/windows/common/windows';
-import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { EditorDropTarget } from 'vs/workbench/browser/parts/editor/editorDropTarget';
 import { localize } from 'vs/nls';
 import { Color } from 'vs/base/common/color';
 import { CenteredViewLayout } from 'vs/base/browser/ui/centered/centeredViewLayout';
-import { IView } from 'vs/base/browser/ui/grid/gridview';
+import { IView, orthogonal } from 'vs/base/browser/ui/grid/gridview';
 
 interface IEditorPartUIState {
 	serializedGrid: ISerializedGrid;
@@ -144,18 +141,13 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 	private _whenRestored: TPromise<void>;
 	private whenRestoredComplete: TValueCallback<void>;
 
-	private previousUIState: IEditorPartUIState;
-
 	constructor(
 		id: string,
 		private restorePreviousState: boolean,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IThemeService themeService: IThemeService,
 		@IConfigurationService private configurationService: IConfigurationService,
-		@IStorageService private storageService: IStorageService,
-		@INotificationService private notificationService: INotificationService,
-		@IWindowService private windowService: IWindowService,
-		@ILifecycleService private lifecycleService: ILifecycleService
+		@IStorageService private storageService: IStorageService
 	) {
 		super(id, { hasTitle: false }, themeService);
 
@@ -412,7 +404,12 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 
 		// Prepare grid descriptor to create new grid from
 		const gridDescriptor = createSerializedGrid({
-			orientation: this.toGridViewOrientation(layout.orientation, this.gridWidget.orientation),
+			orientation: this.toGridViewOrientation(
+				layout.orientation,
+				this.isTwoDimensionalGrid() ?
+					this.gridWidget.orientation :			// preserve original orientation for 2-dimensional grids
+					orthogonal(this.gridWidget.orientation) // otherwise flip (fix https://github.com/Microsoft/vscode/issues/52975)
+			),
 			groups: layout.groups
 		});
 
@@ -441,6 +438,17 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 		}
 	}
 
+	private isTwoDimensionalGrid(): boolean {
+		const views = this.gridWidget.getViews();
+		if (isGridBranchNode(views)) {
+			// the grid is 2-dimensional if any children
+			// of the grid is a branch node
+			return views.children.some(child => isGridBranchNode(child));
+		}
+
+		return false;
+	}
+
 	addGroup(location: IEditorGroupView | GroupIdentifier, direction: GroupDirection, options?: IAddGroupOptions): IEditorGroupView {
 		const locationView = this.assertGroupView(location);
 
@@ -728,10 +736,10 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 
 	//#region Part
 
-	get minimumWidth(): number { return this.gridWidget ? this.gridWidget.minimumWidth : 0; }
-	get maximumWidth(): number { return this.gridWidget ? this.gridWidget.maximumWidth : Number.POSITIVE_INFINITY; }
-	get minimumHeight(): number { return this.gridWidget ? this.gridWidget.minimumHeight : 0; }
-	get maximumHeight(): number { return this.gridWidget ? this.gridWidget.maximumHeight : Number.POSITIVE_INFINITY; }
+	get minimumWidth(): number { return this.centeredLayoutWidget.minimumWidth; }
+	get maximumWidth(): number { return this.centeredLayoutWidget.maximumWidth; }
+	get minimumHeight(): number { return this.centeredLayoutWidget.minimumHeight; }
+	get maximumHeight(): number { return this.centeredLayoutWidget.maximumHeight; }
 
 	get preferredSize(): Dimension {
 		if (!this._preferredSize) {
@@ -814,29 +822,15 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 	private doCreateGridControlWithPreviousState(): void {
 		const uiState = this.doGetPreviousState();
 		if (uiState && uiState.serializedGrid) {
-			try {
-				this.previousUIState = uiState;
 
-				// MRU
-				this.mostRecentActiveGroups = uiState.mostRecentActiveGroups;
+			// MRU
+			this.mostRecentActiveGroups = uiState.mostRecentActiveGroups;
 
-				// Grid Widget
-				this.doCreateGridControlWithState(uiState.serializedGrid, uiState.activeGroup);
+			// Grid Widget
+			this.doCreateGridControlWithState(uiState.serializedGrid, uiState.activeGroup);
 
-				// Ensure last active group has focus
-				this._activeGroup.focus();
-			} catch (error) {
-				if (this.gridWidget) {
-					this.doSetGridWidget();
-				}
-
-				this.groupViews.forEach(group => group.dispose());
-				this.groupViews.clear();
-				this._activeGroup = void 0;
-				this.mostRecentActiveGroups = [];
-
-				this.gridError(error); // TODO@ben remove this safe guard once the grid is stable
-			}
+			// Ensure last active group has focus
+			this._activeGroup.focus();
 		}
 	}
 
@@ -1012,19 +1006,6 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 		return this.groupViews.size === 1 && this._activeGroup.isEmpty();
 	}
 
-	// TODO@ben this should be removed once the gridwidget is stable
-	private gridError(error: Error): void {
-		console.error(error);
-
-		if (this.previousUIState) {
-			console.error('Serialized Grid State: ', this.previousUIState);
-		}
-
-		this.lifecycleService.when(LifecyclePhase.Running).then(() => {
-			this.notificationService.prompt(Severity.Error, `Grid Issue: ${error}. Please report this error stack with reproducible steps.`, [{ label: 'Open DevTools', run: () => this.windowService.openDevTools() }]);
-		});
-	}
-
 	layout(dimension: Dimension): Dimension[] {
 		const sizes = super.layout(dimension);
 
@@ -1037,11 +1018,7 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
 		this.dimension = dimension;
 
 		// Layout Grid
-		try {
-			this.centeredLayoutWidget.layout(this.dimension.width, this.dimension.height);
-		} catch (error) {
-			this.gridError(error);
-		}
+		this.centeredLayoutWidget.layout(this.dimension.width, this.dimension.height);
 
 		// Event
 		this._onDidLayout.fire(dimension);
diff --git a/src/vs/workbench/browser/parts/editor/editorPicker.ts b/src/vs/workbench/browser/parts/editor/editorPicker.ts
index a1b7a48374d..edbf302a694 100644
--- a/src/vs/workbench/browser/parts/editor/editorPicker.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPicker.ts
@@ -32,38 +32,38 @@ export class EditorPickerEntry extends QuickOpenEntryGroup {
 		super();
 	}
 
-	public getLabelOptions(): IIconLabelValueOptions {
+	getLabelOptions(): IIconLabelValueOptions {
 		return {
 			extraClasses: getIconClasses(this.modelService, this.modeService, this.getResource()),
 			italic: !this._group.isPinned(this.editor)
 		};
 	}
 
-	public getLabel(): string {
+	getLabel(): string {
 		return this.editor.getName();
 	}
 
-	public getIcon(): string {
+	getIcon(): string {
 		return this.editor.isDirty() ? 'dirty' : '';
 	}
 
-	public get group(): IEditorGroup {
+	get group(): IEditorGroup {
 		return this._group;
 	}
 
-	public getResource(): URI {
+	getResource(): URI {
 		return toResource(this.editor, { supportSideBySide: true });
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return nls.localize('entryAriaLabel', "{0}, editor group picker", this.getLabel());
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.editor.getDescription();
 	}
 
-	public run(mode: Mode, context: IEntryRunContext): boolean {
+	run(mode: Mode, context: IEntryRunContext): boolean {
 		if (mode === Mode.OPEN) {
 			return this.runOpen(context);
 		}
@@ -91,7 +91,7 @@ export abstract class BaseEditorPicker extends QuickOpenHandler {
 		this.scorerCache = Object.create(null);
 	}
 
-	public getResults(searchValue: string): TPromise<QuickOpenModel> {
+	getResults(searchValue: string): TPromise<QuickOpenModel> {
 		const editorEntries = this.getEditorEntries();
 		if (!editorEntries.length) {
 			return TPromise.as(null);
@@ -142,7 +142,7 @@ export abstract class BaseEditorPicker extends QuickOpenHandler {
 		return TPromise.as(new QuickOpenModel(entries));
 	}
 
-	public onClose(canceled: boolean): void {
+	onClose(canceled: boolean): void {
 		this.scorerCache = Object.create(null);
 	}
 
@@ -151,7 +151,7 @@ export abstract class BaseEditorPicker extends QuickOpenHandler {
 
 export class ActiveEditorGroupPicker extends BaseEditorPicker {
 
-	public static readonly ID = 'workbench.picker.activeEditors';
+	static readonly ID = 'workbench.picker.activeEditors';
 
 	protected getEditorEntries(): EditorPickerEntry[] {
 		return this.group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).map((editor, index) => this.instantiationService.createInstance(EditorPickerEntry, editor, this.group));
@@ -161,7 +161,7 @@ export class ActiveEditorGroupPicker extends BaseEditorPicker {
 		return this.editorGroupService.activeGroup;
 	}
 
-	public getEmptyLabel(searchString: string): string {
+	getEmptyLabel(searchString: string): string {
 		if (searchString) {
 			return nls.localize('noResultsFoundInGroup', "No matching opened editor found in group");
 		}
@@ -169,7 +169,7 @@ export class ActiveEditorGroupPicker extends BaseEditorPicker {
 		return nls.localize('noOpenedEditors', "List of opened editors is currently empty in group");
 	}
 
-	public getAutoFocus(searchValue: string, context: { model: IModel<QuickOpenEntry>, quickNavigateConfiguration?: IQuickNavigateConfiguration }): IAutoFocus {
+	getAutoFocus(searchValue: string, context: { model: IModel<QuickOpenEntry>, quickNavigateConfiguration?: IQuickNavigateConfiguration }): IAutoFocus {
 		if (searchValue || !context.quickNavigateConfiguration) {
 			return {
 				autoFocusFirstEntry: true
@@ -201,7 +201,7 @@ export class ActiveEditorGroupPicker extends BaseEditorPicker {
 
 export class AllEditorsPicker extends BaseEditorPicker {
 
-	public static readonly ID = 'workbench.picker.editors';
+	static readonly ID = 'workbench.picker.editors';
 
 	protected getEditorEntries(): EditorPickerEntry[] {
 		const entries: EditorPickerEntry[] = [];
@@ -215,7 +215,7 @@ export class AllEditorsPicker extends BaseEditorPicker {
 		return entries;
 	}
 
-	public getEmptyLabel(searchString: string): string {
+	getEmptyLabel(searchString: string): string {
 		if (searchString) {
 			return nls.localize('noResultsFound', "No matching opened editor found");
 		}
@@ -223,7 +223,7 @@ export class AllEditorsPicker extends BaseEditorPicker {
 		return nls.localize('noOpenedEditorsAllGroups', "List of opened editors is currently empty");
 	}
 
-	public getAutoFocus(searchValue: string, context: { model: IModel<QuickOpenEntry>, quickNavigateConfiguration?: IQuickNavigateConfiguration }): IAutoFocus {
+	getAutoFocus(searchValue: string, context: { model: IModel<QuickOpenEntry>, quickNavigateConfiguration?: IQuickNavigateConfiguration }): IAutoFocus {
 		if (searchValue) {
 			return {
 				autoFocusFirstEntry: true
diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index 525764c38fa..7b24eca3f73 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -62,11 +62,11 @@ import { IPreferencesService } from 'vs/workbench/services/preferences/common/pr
 class SideBySideEditorEncodingSupport implements IEncodingSupport {
 	constructor(private master: IEncodingSupport, private details: IEncodingSupport) { }
 
-	public getEncoding(): string {
+	getEncoding(): string {
 		return this.master.getEncoding(); // always report from modified (right hand) side
 	}
 
-	public setEncoding(encoding: string, mode: EncodingMode): void {
+	setEncoding(encoding: string, mode: EncodingMode): void {
 		[this.master, this.details].forEach(s => s.setEncoding(encoding, mode));
 	}
 }
@@ -128,7 +128,7 @@ class StateChange {
 		this.metadata = false;
 	}
 
-	public combine(other: StateChange) {
+	combine(other: StateChange) {
 		this.indentation = this.indentation || other.indentation;
 		this.selectionStatus = this.selectionStatus || other.selectionStatus;
 		this.mode = this.mode || other.mode;
@@ -153,28 +153,28 @@ interface StateDelta {
 
 class State {
 	private _selectionStatus: string;
-	public get selectionStatus(): string { return this._selectionStatus; }
+	get selectionStatus(): string { return this._selectionStatus; }
 
 	private _mode: string;
-	public get mode(): string { return this._mode; }
+	get mode(): string { return this._mode; }
 
 	private _encoding: string;
-	public get encoding(): string { return this._encoding; }
+	get encoding(): string { return this._encoding; }
 
 	private _EOL: string;
-	public get EOL(): string { return this._EOL; }
+	get EOL(): string { return this._EOL; }
 
 	private _indentation: string;
-	public get indentation(): string { return this._indentation; }
+	get indentation(): string { return this._indentation; }
 
 	private _tabFocusMode: boolean;
-	public get tabFocusMode(): boolean { return this._tabFocusMode; }
+	get tabFocusMode(): boolean { return this._tabFocusMode; }
 
 	private _screenReaderMode: boolean;
-	public get screenReaderMode(): boolean { return this._screenReaderMode; }
+	get screenReaderMode(): boolean { return this._screenReaderMode; }
 
 	private _metadata: string;
-	public get metadata(): string { return this._metadata; }
+	get metadata(): string { return this._metadata; }
 
 	constructor() {
 		this._selectionStatus = null;
@@ -186,7 +186,7 @@ class State {
 		this._metadata = null;
 	}
 
-	public update(update: StateDelta): StateChange {
+	update(update: StateDelta): StateChange {
 		const e = new StateChange();
 		let somethingChanged = false;
 
@@ -277,7 +277,6 @@ function hide(el: HTMLElement): void {
 }
 
 export class EditorStatus implements IStatusbarItem {
-
 	private state: State;
 	private element: HTMLElement;
 	private tabFocusModeElement: HTMLElement;
@@ -308,7 +307,7 @@ export class EditorStatus implements IStatusbarItem {
 		this.state = new State();
 	}
 
-	public render(container: HTMLElement): IDisposable {
+	render(container: HTMLElement): IDisposable {
 		this.element = append(container, $('.editor-statusbar-item'));
 
 		this.tabFocusModeElement = append(this.element, $('a.editor-status-tabfocusmode.status-bar-info'));
@@ -824,8 +823,8 @@ export class ShowLanguageExtensionsAction extends Action {
 
 export class ChangeModeAction extends Action {
 
-	public static readonly ID = 'workbench.action.editor.changeLanguageMode';
-	public static readonly LABEL = nls.localize('changeMode', "Change Language Mode");
+	static readonly ID = 'workbench.action.editor.changeLanguageMode';
+	static readonly LABEL = nls.localize('changeMode', "Change Language Mode");
 
 	constructor(
 		actionId: string,
@@ -842,7 +841,7 @@ export class ChangeModeAction extends Action {
 		super(actionId, actionLabel);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const activeTextEditorWidget = getCodeEditor(this.editorService.activeTextEditorWidget);
 		if (!activeTextEditorWidget) {
 			return this.quickOpenService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
@@ -1037,8 +1036,8 @@ export interface IChangeEOLEntry extends IPickOpenEntry {
 
 class ChangeIndentationAction extends Action {
 
-	public static readonly ID = 'workbench.action.editor.changeIndentation';
-	public static readonly LABEL = nls.localize('changeIndentation', "Change Indentation");
+	static readonly ID = 'workbench.action.editor.changeIndentation';
+	static readonly LABEL = nls.localize('changeIndentation', "Change Indentation");
 
 	constructor(
 		actionId: string,
@@ -1049,7 +1048,7 @@ class ChangeIndentationAction extends Action {
 		super(actionId, actionLabel);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const activeTextEditorWidget = getCodeEditor(this.editorService.activeTextEditorWidget);
 		if (!activeTextEditorWidget) {
 			return this.quickOpenService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
@@ -1087,8 +1086,8 @@ class ChangeIndentationAction extends Action {
 
 export class ChangeEOLAction extends Action {
 
-	public static readonly ID = 'workbench.action.editor.changeEOL';
-	public static readonly LABEL = nls.localize('changeEndOfLine', "Change End of Line Sequence");
+	static readonly ID = 'workbench.action.editor.changeEOL';
+	static readonly LABEL = nls.localize('changeEndOfLine', "Change End of Line Sequence");
 
 	constructor(
 		actionId: string,
@@ -1099,7 +1098,7 @@ export class ChangeEOLAction extends Action {
 		super(actionId, actionLabel);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const activeTextEditorWidget = getCodeEditor(this.editorService.activeTextEditorWidget);
 		if (!activeTextEditorWidget) {
 			return this.quickOpenService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
@@ -1132,8 +1131,8 @@ export class ChangeEOLAction extends Action {
 
 export class ChangeEncodingAction extends Action {
 
-	public static readonly ID = 'workbench.action.editor.changeEncoding';
-	public static readonly LABEL = nls.localize('changeEncoding', "Change File Encoding");
+	static readonly ID = 'workbench.action.editor.changeEncoding';
+	static readonly LABEL = nls.localize('changeEncoding', "Change File Encoding");
 
 	constructor(
 		actionId: string,
@@ -1146,7 +1145,7 @@ export class ChangeEncodingAction extends Action {
 		super(actionId, actionLabel);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		if (!getCodeEditor(this.editorService.activeTextEditorWidget)) {
 			return this.quickOpenService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
 		}
@@ -1264,7 +1263,7 @@ class ScreenReaderDetectedExplanation extends Themable {
 		super(themeService);
 	}
 
-	public get visible(): boolean {
+	get visible(): boolean {
 		return this._visible;
 	}
 
@@ -1284,7 +1283,7 @@ class ScreenReaderDetectedExplanation extends Themable {
 		}
 	}
 
-	public show(anchorElement: HTMLElement): void {
+	show(anchorElement: HTMLElement): void {
 		this._visible = true;
 
 		this.contextViewService.showContextView({
@@ -1308,7 +1307,7 @@ class ScreenReaderDetectedExplanation extends Themable {
 		});
 	}
 
-	public hide(): void {
+	hide(): void {
 		this.contextViewService.hideContextView();
 	}
 
diff --git a/src/vs/workbench/browser/parts/editor/media/editorgroupview.css b/src/vs/workbench/browser/parts/editor/media/editorgroupview.css
index 262514ee87a..e7abc5b7357 100644
--- a/src/vs/workbench/browser/parts/editor/media/editorgroupview.css
+++ b/src/vs/workbench/browser/parts/editor/media/editorgroupview.css
@@ -13,8 +13,9 @@
 	opacity: 0.5; /* dimmed to indicate inactive state */
 }
 
-.monaco-workbench > .part.editor > .content .editor-group-container.empty.active {
-	opacity: 1; /* indicate active group through undimmed state */
+.monaco-workbench > .part.editor > .content .editor-group-container.empty.active,
+.monaco-workbench > .part.editor > .content .editor-group-container.empty.dragged-over {
+	opacity: 1; /* indicate active/dragged-over group through undimmed state */
 }
 
 /* Letterpress */
diff --git a/src/vs/workbench/browser/parts/editor/rangeDecorations.ts b/src/vs/workbench/browser/parts/editor/rangeDecorations.ts
index 6924bfb1f12..7265beb3523 100644
--- a/src/vs/workbench/browser/parts/editor/rangeDecorations.ts
+++ b/src/vs/workbench/browser/parts/editor/rangeDecorations.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
 import URI from 'vs/base/common/uri';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -19,27 +19,29 @@ export interface IRangeHighlightDecoration {
 	isWholeLine?: boolean;
 }
 
-export class RangeHighlightDecorations implements IDisposable {
+export class RangeHighlightDecorations extends Disposable {
 
 	private rangeHighlightDecorationId: string = null;
 	private editor: ICodeEditor = null;
 	private editorDisposables: IDisposable[] = [];
 
-	private readonly _onHighlightRemoved: Emitter<void> = new Emitter<void>();
-	public readonly onHighlghtRemoved: Event<void> = this._onHighlightRemoved.event;
+	private readonly _onHighlightRemoved: Emitter<void> = this._register(new Emitter<void>());
+	get onHighlghtRemoved(): Event<void> { return this._onHighlightRemoved.event; }
 
 	constructor(@IEditorService private editorService: IEditorService) {
+		super();
 	}
 
-	public removeHighlightRange() {
+	removeHighlightRange() {
 		if (this.editor && this.editor.getModel() && this.rangeHighlightDecorationId) {
 			this.editor.deltaDecorations([this.rangeHighlightDecorationId], []);
 			this._onHighlightRemoved.fire();
 		}
+
 		this.rangeHighlightDecorationId = null;
 	}
 
-	public highlightRange(range: IRangeHighlightDecoration, editor?: ICodeEditor) {
+	highlightRange(range: IRangeHighlightDecoration, editor?: ICodeEditor) {
 		editor = editor ? editor : this.getEditor(range);
 		if (editor) {
 			this.doHighlightRange(editor, range);
@@ -48,9 +50,11 @@ export class RangeHighlightDecorations implements IDisposable {
 
 	private doHighlightRange(editor: ICodeEditor, selectionRange: IRangeHighlightDecoration) {
 		this.removeHighlightRange();
+
 		editor.changeDecorations((changeAccessor: IModelDecorationsChangeAccessor) => {
 			this.rangeHighlightDecorationId = changeAccessor.addDecoration(selectionRange.range, this.createRangeHighlightDecoration(selectionRange.isWholeLine));
 		});
+
 		this.setEditor(editor);
 	}
 
@@ -62,6 +66,7 @@ export class RangeHighlightDecorations implements IDisposable {
 				return this.editorService.activeTextEditorWidget as ICodeEditor;
 			}
 		}
+
 		return null;
 	}
 
@@ -107,7 +112,9 @@ export class RangeHighlightDecorations implements IDisposable {
 		return (isWholeLine ? RangeHighlightDecorations._WHOLE_LINE_RANGE_HIGHLIGHT : RangeHighlightDecorations._RANGE_HIGHLIGHT);
 	}
 
-	public dispose() {
+	dispose() {
+		super.dispose();
+
 		if (this.editor && this.editor.getModel()) {
 			this.removeHighlightRange();
 			this.disposeEditorListeners();
diff --git a/src/vs/workbench/browser/parts/editor/resourceViewer.ts b/src/vs/workbench/browser/parts/editor/resourceViewer.ts
index b7962916769..61c35f3f786 100644
--- a/src/vs/workbench/browser/parts/editor/resourceViewer.ts
+++ b/src/vs/workbench/browser/parts/editor/resourceViewer.ts
@@ -35,12 +35,12 @@ export interface IResourceDescriptor {
 }
 
 class BinarySize {
-	public static readonly KB = 1024;
-	public static readonly MB = BinarySize.KB * BinarySize.KB;
-	public static readonly GB = BinarySize.MB * BinarySize.KB;
-	public static readonly TB = BinarySize.GB * BinarySize.KB;
+	static readonly KB = 1024;
+	static readonly MB = BinarySize.KB * BinarySize.KB;
+	static readonly GB = BinarySize.MB * BinarySize.KB;
+	static readonly TB = BinarySize.GB * BinarySize.KB;
 
-	public static formatSize(size: number): string {
+	static formatSize(size: number): string {
 		if (size < BinarySize.KB) {
 			return nls.localize('sizeB', "{0}B", size);
 		}
@@ -73,7 +73,7 @@ export class ResourceViewer {
 
 	private static readonly MAX_OPEN_INTERNAL_SIZE = BinarySize.MB * 200; // max size until we offer an action to open internally
 
-	public static show(
+	static show(
 		descriptor: IResourceDescriptor,
 		fileService: IFileService,
 		container: HTMLElement,
@@ -115,7 +115,7 @@ class ImageView {
 	private static readonly MAX_IMAGE_SIZE = BinarySize.MB; // showing images inline is memory intense, so we have a limit
 	private static readonly BASE64_MARKER = 'base64,';
 
-	public static create(
+	static create(
 		container: HTMLElement,
 		descriptor: IResourceDescriptor,
 		fileService: IFileService,
@@ -153,7 +153,7 @@ class ImageView {
 }
 
 class LargeImageView {
-	public static create(
+	static create(
 		container: HTMLElement,
 		descriptor: IResourceDescriptor,
 		openExternalClb: (uri: URI) => void
@@ -179,7 +179,7 @@ class LargeImageView {
 }
 
 class FileTooLargeFileView {
-	public static create(
+	static create(
 		container: HTMLElement,
 		descriptor: IResourceDescriptor,
 		scrollbar: DomScrollableElement,
@@ -202,7 +202,7 @@ class FileTooLargeFileView {
 }
 
 class FileSeemsBinaryFileView {
-	public static create(
+	static create(
 		container: HTMLElement,
 		descriptor: IResourceDescriptor,
 		scrollbar: DomScrollableElement,
@@ -236,11 +236,12 @@ class FileSeemsBinaryFileView {
 type Scale = number | 'fit';
 
 class ZoomStatusbarItem extends Themable implements IStatusbarItem {
+
+	static instance: ZoomStatusbarItem;
+
 	showTimeout: number;
-	public static instance: ZoomStatusbarItem;
 
 	private statusBarItem: HTMLElement;
-
 	private onSelectScale?: (scale: Scale) => void;
 
 	constructor(
@@ -249,8 +250,10 @@ class ZoomStatusbarItem extends Themable implements IStatusbarItem {
 		@IThemeService themeService: IThemeService
 	) {
 		super(themeService);
+
 		ZoomStatusbarItem.instance = this;
-		this.toUnbind.push(editorService.onDidActiveEditorChange(() => this.onActiveEditorChanged()));
+
+		this._register(editorService.onDidActiveEditorChange(() => this.onActiveEditorChanged()));
 	}
 
 	private onActiveEditorChanged(): void {
@@ -258,7 +261,7 @@ class ZoomStatusbarItem extends Themable implements IStatusbarItem {
 		this.onSelectScale = void 0;
 	}
 
-	public show(scale: Scale, onSelectScale: (scale: number) => void) {
+	show(scale: Scale, onSelectScale: (scale: number) => void) {
 		clearTimeout(this.showTimeout);
 		this.showTimeout = setTimeout(() => {
 			this.onSelectScale = onSelectScale;
@@ -267,11 +270,11 @@ class ZoomStatusbarItem extends Themable implements IStatusbarItem {
 		}, 0);
 	}
 
-	public hide() {
+	hide() {
 		this.statusBarItem.style.display = 'none';
 	}
 
-	public render(container: HTMLElement): IDisposable {
+	render(container: HTMLElement): IDisposable {
 		if (!this.statusBarItem && container) {
 			this.statusBarItem = $(container).a()
 				.addClass('.zoom-statusbar-item')
@@ -358,7 +361,7 @@ class InlineImageView {
 	 */
 	private static readonly imageStateCache = new LRUCache<string, ImageState>(100);
 
-	public static create(
+	static create(
 		container: HTMLElement,
 		descriptor: IResourceDescriptor,
 		fileService: IFileService,
@@ -563,6 +566,7 @@ class InlineImageView {
 
 		return fileService.resolveContent(descriptor.resource, { encoding: 'base64' }).then(data => {
 			const mime = getMime(descriptor);
+
 			return `data:${mime};base64,${data.value}`;
 		});
 	}
diff --git a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
index 48230a73d7b..b262ab1f852 100644
--- a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
@@ -44,9 +44,9 @@ export class SideBySideEditor extends BaseEditor {
 	get maximumHeight() { return this.maximumMasterHeight + this.maximumDetailsHeight; }
 
 	protected masterEditor: BaseEditor;
-	private masterEditorContainer: HTMLElement;
-
 	protected detailsEditor: BaseEditor;
+
+	private masterEditorContainer: HTMLElement;
 	private detailsEditorContainer: HTMLElement;
 
 	private splitview: SplitView;
@@ -54,7 +54,7 @@ export class SideBySideEditor extends BaseEditor {
 
 	private onDidCreateEditors = this._register(new Emitter<{ width: number; height: number; }>());
 	private _onDidSizeConstraintsChange = this._register(new Relay<{ width: number; height: number; }>());
-	readonly onDidSizeConstraintsChange: Event<{ width: number; height: number; }> = anyEvent(this.onDidCreateEditors.event, this._onDidSizeConstraintsChange.event);
+	get onDidSizeConstraintsChange(): Event<{ width: number; height: number; }> { return anyEvent(this.onDidCreateEditors.event, this._onDidSizeConstraintsChange.event); }
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -67,8 +67,7 @@ export class SideBySideEditor extends BaseEditor {
 	protected createEditor(parent: HTMLElement): void {
 		DOM.addClass(parent, 'side-by-side-editor');
 
-		this.splitview = new SplitView(parent, { orientation: Orientation.HORIZONTAL });
-		this._register(this.splitview);
+		this.splitview = this._register(new SplitView(parent, { orientation: Orientation.HORIZONTAL }));
 		this._register(this.splitview.onDidSashReset(() => this.splitview.distributeViewSizes()));
 
 		this.detailsEditorContainer = DOM.$('.details-editor-container');
@@ -158,9 +157,9 @@ export class SideBySideEditor extends BaseEditor {
 			}
 
 			return this.setNewInput(newInput, options, token);
-		} else {
-			return TPromise.join([this.detailsEditor.setInput(newInput.details, null, token), this.masterEditor.setInput(newInput.master, options, token)]).then(() => void 0);
 		}
+
+		return TPromise.join([this.detailsEditor.setInput(newInput.details, null, token), this.masterEditor.setInput(newInput.master, options, token)]).then(() => void 0);
 	}
 
 	private setNewInput(newInput: SideBySideEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
diff --git a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
index 79e99140767..f59bae6f10b 100644
--- a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
@@ -43,7 +43,7 @@ import { EditorMemento } from 'vs/workbench/browser/parts/editor/baseEditor';
  */
 export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 
-	public static readonly ID = TEXT_DIFF_EDITOR_ID;
+	static readonly ID = TEXT_DIFF_EDITOR_ID;
 
 	private diffNavigator: DiffNavigator;
 	private diffNavigatorDisposables: IDisposable[] = [];
@@ -64,7 +64,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 	) {
 		super(TextDiffEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorService, editorGroupService);
 
-		this.toUnbind.push(this._actualConfigurationService.onDidChangeConfiguration((e) => {
+		this._register(this._actualConfigurationService.onDidChangeConfiguration((e) => {
 			if (e.affectsConfiguration('diffEditor.ignoreTrimWhitespace')) {
 				this.updateIgnoreTrimWhitespaceAction();
 			}
@@ -75,7 +75,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		return new EditorMemento(this.getId(), key, Object.create(null), limit, editorGroupService); // do not persist in storage as diff editors are never persisted
 	}
 
-	public getTitle(): string {
+	getTitle(): string {
 		if (this.input) {
 			return this.input.getName();
 		}
@@ -83,7 +83,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		return nls.localize('textDiffEditor', "Text Diff Editor");
 	}
 
-	public createEditorControl(parent: HTMLElement, configuration: ICodeEditorOptions): IDiffEditor {
+	createEditorControl(parent: HTMLElement, configuration: ICodeEditorOptions): IDiffEditor {
 
 		// Actions
 		this.nextDiffAction = new NavigateAction(this, true);
@@ -94,7 +94,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		return this.instantiationService.createInstance(DiffEditorWidget, parent, configuration);
 	}
 
-	public setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
 
 		// Dispose previous diff navigator
 		this.diffNavigatorDisposables = dispose(this.diffNavigatorDisposables);
@@ -104,7 +104,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 
 		// Set input and resolve
 		return super.setInput(input, options, token).then(() => {
-			return input.resolve(true).then(resolvedModel => {
+			return input.resolve().then(resolvedModel => {
 
 				// Check for cancellation
 				if (token.isCancellationRequested) {
@@ -162,7 +162,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		});
 	}
 
-	public setOptions(options: EditorOptions): void {
+	setOptions(options: EditorOptions): void {
 		const textOptions = <TextEditorOptions>options;
 		if (textOptions && types.isFunction(textOptions.apply)) {
 			textOptions.apply(this.getControl(), ScrollType.Smooth);
@@ -270,7 +270,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		return (<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_IS_BINARY;
 	}
 
-	public clearInput(): void {
+	clearInput(): void {
 
 		// Dispose previous diff navigator
 		this.diffNavigatorDisposables = dispose(this.diffNavigatorDisposables);
@@ -285,11 +285,11 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		super.clearInput();
 	}
 
-	public getDiffNavigator(): DiffNavigator {
+	getDiffNavigator(): DiffNavigator {
 		return this.diffNavigator;
 	}
 
-	public getActions(): IAction[] {
+	getActions(): IAction[] {
 		return [
 			this.toggleIgnoreTrimWhitespaceAction,
 			this.previousDiffAction,
@@ -297,7 +297,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		];
 	}
 
-	public getControl(): IDiffEditor {
+	getControl(): IDiffEditor {
 		return super.getControl() as IDiffEditor;
 	}
 
@@ -374,7 +374,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
 		return URI.from({ scheme: 'diff', path: `${btoa(original.toString())}${btoa(modified.toString())}` });
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.diffNavigatorDisposables = dispose(this.diffNavigatorDisposables);
 
 		super.dispose();
@@ -399,7 +399,7 @@ class NavigateAction extends Action {
 		this.enabled = false;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		if (this.next) {
 			this.editor.getDiffNavigator().next();
 		} else {
@@ -409,7 +409,7 @@ class NavigateAction extends Action {
 		return null;
 	}
 
-	public updateEnablement(): void {
+	updateEnablement(): void {
 		this.enabled = this.editor.getDiffNavigator().canNavigate();
 	}
 }
@@ -426,12 +426,12 @@ class ToggleIgnoreTrimWhitespaceAction extends Action {
 		this.label = nls.localize('toggleIgnoreTrimWhitespace.label', "Ignore Trim Whitespace");
 	}
 
-	public updateClassName(ignoreTrimWhitespace: boolean): void {
+	updateClassName(ignoreTrimWhitespace: boolean): void {
 		this._isChecked = ignoreTrimWhitespace;
 		this.class = `textdiff-editor-action toggleIgnoreTrimWhitespace${this._isChecked ? ' is-checked' : ''}`;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		this._configurationService.updateValue(`diffEditor.ignoreTrimWhitespace`, !this._isChecked);
 		return null;
 	}
diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts
index 2e95f5f50db..50ff252902e 100644
--- a/src/vs/workbench/browser/parts/editor/textEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textEditor.ts
@@ -60,7 +60,7 @@ export abstract class BaseTextEditor extends BaseEditor implements ITextEditor {
 
 		this.editorMemento = this.getEditorMemento<IEditorViewState>(storageService, editorGroupService, TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY, 100);
 
-		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => this.handleConfigurationChangeEvent(this.configurationService.getValue<IEditorConfiguration>(this.getResource()))));
+		this._register(this.configurationService.onDidChangeConfiguration(e => this.handleConfigurationChangeEvent(this.configurationService.getValue<IEditorConfiguration>(this.getResource()))));
 	}
 
 	protected get instantiationService(): IInstantiationService {
@@ -130,25 +130,25 @@ export abstract class BaseTextEditor extends BaseEditor implements ITextEditor {
 
 		// Editor for Text
 		this._editorContainer = parent;
-		this.editorControl = this.createEditorControl(parent, this.computeConfiguration(this.configurationService.getValue<IEditorConfiguration>(this.getResource())));
+		this.editorControl = this._register(this.createEditorControl(parent, this.computeConfiguration(this.configurationService.getValue<IEditorConfiguration>(this.getResource()))));
 
 		// Model & Language changes
 		const codeEditor = getCodeEditor(this.editorControl);
 		if (codeEditor) {
-			this.toUnbind.push(codeEditor.onDidChangeModelLanguage(e => this.updateEditorConfiguration()));
-			this.toUnbind.push(codeEditor.onDidChangeModel(e => this.updateEditorConfiguration()));
+			this._register(codeEditor.onDidChangeModelLanguage(e => this.updateEditorConfiguration()));
+			this._register(codeEditor.onDidChangeModel(e => this.updateEditorConfiguration()));
 		}
 
 		// Application & Editor focus change to respect auto save settings
 		if (isCodeEditor(this.editorControl)) {
-			this.toUnbind.push(this.editorControl.onDidBlurEditorWidget(() => this.onEditorFocusLost()));
+			this._register(this.editorControl.onDidBlurEditorWidget(() => this.onEditorFocusLost()));
 		} else if (isDiffEditor(this.editorControl)) {
-			this.toUnbind.push(this.editorControl.getOriginalEditor().onDidBlurEditorWidget(() => this.onEditorFocusLost()));
-			this.toUnbind.push(this.editorControl.getModifiedEditor().onDidBlurEditorWidget(() => this.onEditorFocusLost()));
+			this._register(this.editorControl.getOriginalEditor().onDidBlurEditorWidget(() => this.onEditorFocusLost()));
+			this._register(this.editorControl.getModifiedEditor().onDidBlurEditorWidget(() => this.onEditorFocusLost()));
 		}
 
-		this.toUnbind.push(this.editorService.onDidActiveEditorChange(() => this.onEditorFocusLost()));
-		this.toUnbind.push(DOM.addDisposableListener(window, DOM.EventType.BLUR, () => this.onWindowFocusLost()));
+		this._register(this.editorService.onDidActiveEditorChange(() => this.onEditorFocusLost()));
+		this._register(DOM.addDisposableListener(window, DOM.EventType.BLUR, () => this.onWindowFocusLost()));
 	}
 
 	private onEditorFocusLost(): void {
@@ -186,7 +186,7 @@ export abstract class BaseTextEditor extends BaseEditor implements ITextEditor {
 		return this.instantiationService.createInstance(CodeEditorWidget, parent, configuration, {});
 	}
 
-	public setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
 		return super.setInput(input, options, token).then(() => {
 
 			// Update editor options after having set the input. We do this because there can be
@@ -209,17 +209,17 @@ export abstract class BaseTextEditor extends BaseEditor implements ITextEditor {
 		super.setEditorVisible(visible, group);
 	}
 
-	public focus(): void {
+	focus(): void {
 		this.editorControl.focus();
 	}
 
-	public layout(dimension: DOM.Dimension): void {
+	layout(dimension: DOM.Dimension): void {
 
 		// Pass on to Editor
 		this.editorControl.layout(dimension);
 	}
 
-	public getControl(): IEditor {
+	getControl(): IEditor {
 		return this.editorControl;
 	}
 
@@ -309,9 +309,8 @@ export abstract class BaseTextEditor extends BaseEditor implements ITextEditor {
 
 	protected abstract getAriaLabel(): string;
 
-	public dispose(): void {
+	dispose(): void {
 		this.lastAppliedEditorOptions = void 0;
-		this.editorControl.dispose();
 
 		super.dispose();
 	}
diff --git a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
index e58de5a1c6e..0c0d212617b 100644
--- a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
@@ -46,7 +46,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 		super(id, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorService, editorGroupService);
 	}
 
-	public getTitle(): string {
+	getTitle(): string {
 		if (this.input) {
 			return this.input.getName();
 		}
@@ -54,14 +54,14 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 		return nls.localize('textEditor', "Text Editor");
 	}
 
-	public setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
 
 		// Remember view settings if input changes
 		this.saveTextResourceEditorViewState(this.input);
 
 		// Set input and resolve
 		return super.setInput(input, options, token).then(() => {
-			return input.resolve(true).then((resolvedModel: EditorModel) => {
+			return input.resolve().then((resolvedModel: EditorModel) => {
 
 				// Check for cancellation
 				if (token.isCancellationRequested) {
@@ -104,7 +104,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 		}
 	}
 
-	public setOptions(options: EditorOptions): void {
+	setOptions(options: EditorOptions): void {
 		const textOptions = <TextEditorOptions>options;
 		if (textOptions && types.isFunction(textOptions.apply)) {
 			textOptions.apply(this.getControl(), ScrollType.Smooth);
@@ -140,7 +140,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 	 * This allows users to click on the output panel to stop scrolling when they see something of interest.
 	 * To resume, they should scroll to the end of the output panel again.
 	 */
-	public revealLastLine(smart: boolean): void {
+	revealLastLine(smart: boolean): void {
 		const codeEditor = <ICodeEditor>this.getControl();
 		const model = codeEditor.getModel();
 
@@ -152,7 +152,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 		}
 	}
 
-	public clearInput(): void {
+	clearInput(): void {
 
 		// Keep editor view state in settings to restore when coming back
 		this.saveTextResourceEditorViewState(this.input);
@@ -163,7 +163,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 		super.clearInput();
 	}
 
-	public shutdown(): void {
+	shutdown(): void {
 
 		// Save View State (only for untitled)
 		if (this.input instanceof UntitledEditorInput) {
@@ -200,7 +200,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 
 export class TextResourceEditor extends AbstractTextResourceEditor {
 
-	public static readonly ID = 'workbench.editors.textResourceEditor';
+	static readonly ID = 'workbench.editors.textResourceEditor';
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
diff --git a/src/vs/workbench/browser/parts/menubar/media/menubarpart.css b/src/vs/workbench/browser/parts/menubar/media/menubarpart.css
index 1fb3533853f..62b8c849063 100644
--- a/src/vs/workbench/browser/parts/menubar/media/menubarpart.css
+++ b/src/vs/workbench/browser/parts/menubar/media/menubarpart.css
@@ -8,7 +8,7 @@
 	position: absolute;
 	font-size: 12px;
 	box-sizing: border-box;
-	padding-left: 30px;
+	padding-left: 35px;
 	padding-right: 138px;
 	height: 30px;
 }
@@ -25,10 +25,9 @@
 	flex-shrink: 0;
 	align-items: center;
 	box-sizing: border-box;
-	padding: 0px 5px;
+	padding: 0px 8px;
 	position: relative;
-	z-index: 10;
-	cursor: pointer;
+	cursor: default;
 	-webkit-app-region: no-drag;
 	zoom: 1;
 }
diff --git a/src/vs/workbench/browser/parts/menubar/menubar.contribution.ts b/src/vs/workbench/browser/parts/menubar/menubar.contribution.ts
index b551e1158cb..8d877ddba77 100644
--- a/src/vs/workbench/browser/parts/menubar/menubar.contribution.ts
+++ b/src/vs/workbench/browser/parts/menubar/menubar.contribution.ts
@@ -4,21 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from 'vs/nls';
-import * as menubarCommands from 'vs/workbench/browser/parts/menubar/menubarCommands';
 import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { isMacintosh } from 'vs/base/common/platform';
 
-// TODO: Add submenu support to remove layout, preferences, and recent top level
-menubarCommands.setup();
+recentMenuRegistration();
 fileMenuRegistration();
 editMenuRegistration();
-recentMenuRegistration();
 selectionMenuRegistration();
 viewMenuRegistration();
 layoutMenuRegistration();
 goMenuRegistration();
 debugMenuRegistration();
 tasksMenuRegistration();
+terminalMenuRegistration();
 
 if (isMacintosh) {
 	windowMenuRegistration();
@@ -74,6 +72,13 @@ function fileMenuRegistration() {
 		order: 3
 	});
 
+	MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+		title: nls.localize({ key: 'miOpenRecent', comment: ['&& denotes a mnemonic'] }, "Open &&Recent"),
+		submenu: MenuId.MenubarRecentMenu,
+		group: '2_open',
+		order: 4
+	});
+
 	MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
 		group: '3_workspace',
 		command: {
@@ -128,6 +133,13 @@ function fileMenuRegistration() {
 		order: 1
 	});
 
+	MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+		title: nls.localize({ key: 'miPreferences', comment: ['&& denotes a mnemonic'] }, "&&Preferences"),
+		submenu: MenuId.MenubarPreferencesMenu,
+		group: '5_autosave',
+		order: 2
+	});
+
 	MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
 		group: '6_close',
 		command: {
@@ -603,6 +615,13 @@ function viewMenuRegistration() {
 	});
 
 	// TODO: Editor Layout Submenu
+	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+		title: nls.localize({ key: 'miEditorLayout', comment: ['&& denotes a mnemonic'] }, "Editor &&Layout"),
+		submenu: MenuId.MenubarLayoutMenu,
+		group: '5_layout',
+		order: 1
+	});
+
 
 	// Workbench Layout
 	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
@@ -1356,7 +1375,7 @@ function helpMenuRegistration() {
 	MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
 		group: '1_welcome',
 		command: {
-			id: 'workbench.action.showCurrentReleaseNotes',
+			id: 'update.showCurrentReleaseNotes',
 			title: nls.localize({ key: 'miReleaseNotes', comment: ['&& denotes a mnemonic'] }, "&&Release Notes")
 		},
 		order: 4
@@ -1394,7 +1413,7 @@ function helpMenuRegistration() {
 	MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
 		group: '3_feedback',
 		command: {
-			id: 'openTwitterUrl',
+			id: 'workbench.action.openTwitterUrl',
 			title: nls.localize({ key: 'miTwitter', comment: ['&& denotes a mnemonic'] }, "&&Join us on Twitter")
 		},
 		order: 1
@@ -1403,7 +1422,7 @@ function helpMenuRegistration() {
 	MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
 		group: '3_feedback',
 		command: {
-			id: 'openUserVoiceUrl',
+			id: 'workbench.action.openRequestFeatureUrl',
 			title: nls.localize({ key: 'miUserVoice', comment: ['&& denotes a mnemonic'] }, "&&Search Feature Requests")
 		},
 		order: 2
@@ -1412,7 +1431,7 @@ function helpMenuRegistration() {
 	MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
 		group: '3_feedback',
 		command: {
-			id: 'openReportIssues',
+			id: 'workbench.action.openIssueReporter',
 			title: nls.localize({ key: 'miReportIssue', comment: ['&& denotes a mnemonic', 'Translate this to "Report Issue in English" in all languages please!'] }, "Report &&Issue")
 		},
 		order: 3
@@ -1422,7 +1441,7 @@ function helpMenuRegistration() {
 	MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
 		group: '4_legal',
 		command: {
-			id: 'openLicenseUrl',
+			id: 'workbench.action.openLicenseUrl',
 			title: nls.localize({ key: 'miLicense', comment: ['&& denotes a mnemonic'] }, "View &&License")
 		},
 		order: 1
@@ -1431,7 +1450,7 @@ function helpMenuRegistration() {
 	MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
 		group: '4_legal',
 		command: {
-			id: 'openPrivacyStatement',
+			id: 'workbench.action.openPrivacyStatementUrl',
 			title: nls.localize({ key: 'miPrivacyStatement', comment: ['&& denotes a mnemonic'] }, "&&Privacy Statement")
 		},
 		order: 2
@@ -1459,7 +1478,7 @@ function helpMenuRegistration() {
 	MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
 		group: '5_tools',
 		command: {
-			id: 'accessibilityOptions',
+			id: 'workbench.action.showAccessibilityOptions',
 			title: nls.localize({ key: 'miAccessibilityOptions', comment: ['&& denotes a mnemonic'] }, "Accessibility &&Options")
 		},
 		order: 3
@@ -1475,3 +1494,102 @@ function helpMenuRegistration() {
 		order: 1
 	});
 }
+
+function terminalMenuRegistration() {
+
+	// Manage
+
+	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+		group: '1_manage',
+		command: {
+			id: 'workbench.action.terminal.new',
+			title: nls.localize({ key: 'miNewTerminal', comment: ['&& denotes a mnemonic'] }, "&&New Terminal")
+		},
+		order: 1
+	});
+
+	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+		group: '1_manage',
+		command: {
+			id: 'workbench.action.terminal.split',
+			title: nls.localize({ key: 'miSplitTerminal', comment: ['&& denotes a mnemonic'] }, "&&Split Terminal")
+		},
+		order: 2
+	});
+
+	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+		group: '1_manage',
+		command: {
+			id: 'workbench.action.terminal.kill',
+			title: nls.localize({ key: 'miKillTerminal', comment: ['&& denotes a mnemonic'] }, "&&Kill Terminal")
+		},
+		order: 3
+	});
+
+	// Run
+
+	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+		group: '2_run',
+		command: {
+			id: 'workbench.action.terminal.clear',
+			title: nls.localize({ key: 'miClear', comment: ['&& denotes a mnemonic'] }, "&&Clear")
+		},
+		order: 1
+	});
+
+	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+		group: '2_run',
+		command: {
+			id: 'workbench.action.terminal.runActiveFile',
+			title: nls.localize({ key: 'miRunActiveFile', comment: ['&& denotes a mnemonic'] }, "Run &&Active File")
+		},
+		order: 2
+	});
+
+	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+		group: '2_run',
+		command: {
+			id: 'workbench.action.terminal.runSelectedFile',
+			title: nls.localize({ key: 'miRunSelectedText', comment: ['&& denotes a mnemonic'] }, "Run &&Selected Text")
+		},
+		order: 3
+	});
+
+	// Selection
+
+	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+		group: '3_selection',
+		command: {
+			id: 'workbench.action.terminal.scrollToPreviousCommand',
+			title: nls.localize({ key: 'miScrollToPreviousCommand', comment: ['&& denotes a mnemonic'] }, "Scroll To Previous Command")
+		},
+		order: 1
+	});
+
+	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+		group: '3_selection',
+		command: {
+			id: 'workbench.action.terminal.scrollToNextCommand',
+			title: nls.localize({ key: 'miScrollToNextCommand', comment: ['&& denotes a mnemonic'] }, "Scroll To Next Command")
+		},
+		order: 2
+	});
+
+	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+		group: '3_selection',
+		command: {
+			id: 'workbench.action.terminal.selectToPreviousCommand',
+			title: nls.localize({ key: 'miSelectToPreviousCommand', comment: ['&& denotes a mnemonic'] }, "Select To Previous Command")
+		},
+		order: 3
+	});
+
+	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
+		group: '3_selection',
+		command: {
+			id: 'workbench.action.terminal.selectToNextCommand',
+			title: nls.localize({ key: 'miSelectToNextCommand', comment: ['&& denotes a mnemonic'] }, "Select To Next Command")
+		},
+		order: 4
+	});
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/menubar/menubarCommands.ts b/src/vs/workbench/browser/parts/menubar/menubarCommands.ts
deleted file mode 100644
index 5ed13583759..00000000000
--- a/src/vs/workbench/browser/parts/menubar/menubarCommands.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import URI from 'vs/base/common/uri';
-
-export const FILE_MENU_FAKE_OPEN_FILE_COMMAND_ID = 'workbench.action.fakeOpenFile';
-
-export function setup(): void {
-	registerMenubarCommands();
-}
-
-function registerMenubarCommands() {
-	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: FILE_MENU_FAKE_OPEN_FILE_COMMAND_ID,
-		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
-		when: void 0,
-		primary: KeyMod.CtrlCmd | KeyCode.F6,
-		win: { primary: KeyMod.CtrlCmd | KeyCode.F6 },
-		handler: (accessor, resource: URI | object) => {
-			alert('fake open successful');
-			console.log('fake open triggered');
-		}
-	});
-}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/menubar/menubarPart.ts b/src/vs/workbench/browser/parts/menubar/menubarPart.ts
index 6ecc50082dc..31c84306e65 100644
--- a/src/vs/workbench/browser/parts/menubar/menubarPart.ts
+++ b/src/vs/workbench/browser/parts/menubar/menubarPart.ts
@@ -11,18 +11,18 @@ import * as nls from 'vs/nls';
 import * as browser from 'vs/base/browser/browser';
 import { Part } from 'vs/workbench/browser/part';
 import { IMenubarService, IMenubarMenu, IMenubarMenuItemAction, IMenubarData } from 'vs/platform/menubar/common/menubar';
-import { IMenuService, MenuId, IMenu } from 'vs/platform/actions/common/actions';
+import { IMenuService, MenuId, IMenu, SubmenuItemAction } from 'vs/platform/actions/common/actions';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IWindowService, MenuBarVisibility } from 'vs/platform/windows/common/windows';
+import { IWindowService, MenuBarVisibility, IWindowsService } from 'vs/platform/windows/common/windows';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ActionRunner, IActionRunner, IAction } from 'vs/base/common/actions';
+import { ActionRunner, IActionRunner, IAction, Action } from 'vs/base/common/actions';
 import { Builder, $ } from 'vs/base/browser/builder';
-import { Separator, ActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
+import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { EventType, Dimension, toggleClass } from 'vs/base/browser/dom';
 import { TITLE_BAR_ACTIVE_BACKGROUND, TITLE_BAR_ACTIVE_FOREGROUND } from 'vs/workbench/common/theme';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { isWindows, isMacintosh } from 'vs/base/common/platform';
-import { Menu, IMenuOptions } from 'vs/base/browser/ui/menu/menu';
+import { Menu, IMenuOptions, SubmenuAction } from 'vs/base/browser/ui/menu/menu';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
@@ -30,6 +30,10 @@ import { Color } from 'vs/base/common/color';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { domEvent } from 'vs/base/browser/event';
+import { IRecentlyOpened } from 'vs/platform/history/common/history';
+import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, getWorkspaceLabel } from 'vs/platform/workspaces/common/workspaces';
+import { getPathLabel } from 'vs/base/common/labels';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
 interface CustomMenu {
 	title: string;
@@ -53,15 +57,13 @@ export class MenubarPart extends Part {
 	private topLevelMenus: {
 		'File': IMenu;
 		'Edit': IMenu;
-		'Recent': IMenu;
 		'Selection': IMenu;
 		'View': IMenu;
-		'Layout': IMenu;
 		'Go': IMenu;
+		'Terminal': IMenu;
 		'Debug': IMenu;
 		'Tasks': IMenu;
 		'Window'?: IMenu;
-		'Preferences': IMenu;
 		'Help': IMenu;
 		[index: string]: IMenu;
 	};
@@ -69,21 +71,15 @@ export class MenubarPart extends Part {
 	private topLevelTitles = {
 		'File': nls.localize({ key: 'mFile', comment: ['&& denotes a mnemonic'] }, "&&File"),
 		'Edit': nls.localize({ key: 'mEdit', comment: ['&& denotes a mnemonic'] }, "&&Edit"),
-		'Recent': nls.localize({ key: 'mRecent', comment: ['&& denotes a mnemonic'] }, "&&Recent"),
 		'Selection': nls.localize({ key: 'mSelection', comment: ['&& denotes a mnemonic'] }, "&&Selection"),
 		'View': nls.localize({ key: 'mView', comment: ['&& denotes a mnemonic'] }, "&&View"),
-		'Layout': nls.localize({ key: 'mLayout', comment: ['&& denotes a mnemonic'] }, "&&Layout"),
 		'Go': nls.localize({ key: 'mGoto', comment: ['&& denotes a mnemonic'] }, "&&Go"),
+		'Terminal': nls.localize({ key: 'mTerminal', comment: ['&& denotes a mnemonic'] }, "&&Terminal"),
 		'Debug': nls.localize({ key: 'mDebug', comment: ['&& denotes a mnemonic'] }, "&&Debug"),
 		'Tasks': nls.localize({ key: 'mTasks', comment: ['&& denotes a mnemonic'] }, "&&Tasks"),
-		'Preferences': nls.localize({ key: 'mPreferences', comment: ['&& denotes a mnemonic'] }, "&&Preferences"),
 		'Help': nls.localize({ key: 'mHelp', comment: ['&& denotes a mnemonic'] }, "&&Help")
 	};
 
-	private mnemonics: {
-		[index: number]: number;
-	} = {};
-
 	private focusedMenu: {
 		index: number;
 		holder: Builder;
@@ -94,6 +90,8 @@ export class MenubarPart extends Part {
 
 	private actionRunner: IActionRunner;
 	private container: Builder;
+	private recentlyOpened: IRecentlyOpened;
+	private _modifierKeyStatus: IModifierKeyStatus;
 	private _isFocused: boolean;
 	private _onVisibilityChange: Emitter<Dimension>;
 
@@ -105,54 +103,60 @@ export class MenubarPart extends Part {
 		menubarFontSize?: number;
 	} = {};
 
+	private static MAX_MENU_RECENT_ENTRIES = 5;
+
 	constructor(
 		id: string,
 		@IThemeService themeService: IThemeService,
 		@IMenubarService private menubarService: IMenubarService,
 		@IMenuService private menuService: IMenuService,
 		@IWindowService private windowService: IWindowService,
+		@IWindowsService private windowsService: IWindowsService,
 		@IContextKeyService private contextKeyService: IContextKeyService,
 		@IKeybindingService private keybindingService: IKeybindingService,
-		@IConfigurationService private configurationService: IConfigurationService
+		@IConfigurationService private configurationService: IConfigurationService,
+		@IEnvironmentService private environmentService: IEnvironmentService
 	) {
 		super(id, { hasTitle: false }, themeService);
 
 		this.topLevelMenus = {
-			'File': this.menuService.createMenu(MenuId.MenubarFileMenu, this.contextKeyService),
-			'Edit': this.menuService.createMenu(MenuId.MenubarEditMenu, this.contextKeyService),
-			'Recent': this.menuService.createMenu(MenuId.MenubarRecentMenu, this.contextKeyService),
-			'Selection': this.menuService.createMenu(MenuId.MenubarSelectionMenu, this.contextKeyService),
-			'View': this.menuService.createMenu(MenuId.MenubarViewMenu, this.contextKeyService),
-			'Layout': this.menuService.createMenu(MenuId.MenubarLayoutMenu, this.contextKeyService),
-			'Go': this.menuService.createMenu(MenuId.MenubarGoMenu, this.contextKeyService),
-			'Debug': this.menuService.createMenu(MenuId.MenubarDebugMenu, this.contextKeyService),
-			'Tasks': this.menuService.createMenu(MenuId.MenubarTasksMenu, this.contextKeyService),
-			'Preferences': this.menuService.createMenu(MenuId.MenubarPreferencesMenu, this.contextKeyService),
-			'Help': this.menuService.createMenu(MenuId.MenubarHelpMenu, this.contextKeyService)
+			'File': this._register(this.menuService.createMenu(MenuId.MenubarFileMenu, this.contextKeyService)),
+			'Edit': this._register(this.menuService.createMenu(MenuId.MenubarEditMenu, this.contextKeyService)),
+			'Selection': this._register(this.menuService.createMenu(MenuId.MenubarSelectionMenu, this.contextKeyService)),
+			'View': this._register(this.menuService.createMenu(MenuId.MenubarViewMenu, this.contextKeyService)),
+			'Go': this._register(this.menuService.createMenu(MenuId.MenubarGoMenu, this.contextKeyService)),
+			'Terminal': this._register(this.menuService.createMenu(MenuId.MenubarTerminalMenu, this.contextKeyService)),
+			'Debug': this._register(this.menuService.createMenu(MenuId.MenubarDebugMenu, this.contextKeyService)),
+			'Tasks': this._register(this.menuService.createMenu(MenuId.MenubarTasksMenu, this.contextKeyService)),
+			'Help': this._register(this.menuService.createMenu(MenuId.MenubarHelpMenu, this.contextKeyService))
 		};
 
 		if (isMacintosh) {
-			this.topLevelMenus['Window'] = this.menuService.createMenu(MenuId.MenubarWindowMenu, this.contextKeyService);
+			this.topLevelMenus['Window'] = this._register(this.menuService.createMenu(MenuId.MenubarWindowMenu, this.contextKeyService));
 		}
 
-		this.actionRunner = new ActionRunner();
-		this.actionRunner.onDidBeforeRun(() => {
+		this.actionRunner = this._register(new ActionRunner());
+		this._register(this.actionRunner.onDidBeforeRun(() => {
 			if (this.focusedMenu && this.focusedMenu.holder) {
 				this.focusedMenu.holder.hide();
 			}
-		});
+		}));
 
-		this._onVisibilityChange = new Emitter<Dimension>();
+		this._onVisibilityChange = this._register(new Emitter<Dimension>());
 
 		if (isMacintosh || this.currentTitlebarStyleSetting !== 'custom') {
 			for (let topLevelMenuName of Object.keys(this.topLevelMenus)) {
-				this.topLevelMenus[topLevelMenuName].onDidChange(() => this.setupMenubar());
+				this._register(this.topLevelMenus[topLevelMenuName].onDidChange(() => this.setupMenubar()));
 			}
 			this.setupMenubar();
 		}
 
 		this.isFocused = false;
 
+		this.windowService.getRecentlyOpened().then((recentlyOpened) => {
+			this.recentlyOpened = recentlyOpened;
+		});
+
 		this.registerListeners();
 	}
 
@@ -237,41 +241,54 @@ export class MenubarPart extends Part {
 		this.container.style('visibility', null);
 	}
 
-	private onAltKeyToggled(altKeyDown: boolean): void {
+	private onModifierKeyToggled(modiferKeyStatus: IModifierKeyStatus): void {
 		if (this.currentMenubarVisibility === 'toggle') {
-			if (altKeyDown) {
+			const altKeyPressed = (!this._modifierKeyStatus || !this._modifierKeyStatus.altKey) && modiferKeyStatus.altKey;
+			if (altKeyPressed && !modiferKeyStatus.ctrlKey && !modiferKeyStatus.shiftKey) {
 				this.showMenubar();
 			} else if (!this.isFocused) {
 				this.hideMenubar();
 			}
 		}
 
+		this._modifierKeyStatus = modiferKeyStatus;
+
 		if (this.currentEnableMenuBarMnemonics && this.customMenus) {
 			this.customMenus.forEach(customMenu => {
 				let child = customMenu.titleElement.child();
 				if (child) {
 					let grandChild = child.child();
 					if (grandChild) {
-						grandChild.style('text-decoration', altKeyDown ? 'underline' : null);
+						grandChild.style('text-decoration', modiferKeyStatus.altKey ? 'underline' : null);
 					}
 				}
 			});
 		}
 	}
 
+	private onRecentlyOpenedChange(): void {
+		this.windowService.getRecentlyOpened().then(recentlyOpened => {
+			this.recentlyOpened = recentlyOpened;
+			this.setupMenubar();
+		});
+	}
+
 	private registerListeners(): void {
-		browser.onDidChangeFullscreen(() => this.onDidChangeFullscreen());
+		this._register(browser.onDidChangeFullscreen(() => this.onDidChangeFullscreen()));
 
 		// Update when config changes
-		this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(e));
+		this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(e)));
 
 		// Listen to update service
 		// this.updateService.onStateChange(() => this.setupMenubar());
 
-		// Listen to keybindings change
-		this.keybindingService.onDidUpdateKeybindings(() => this.setupMenubar());
+		// Listen for changes in recently opened menu
+		this._register(this.windowsService.onRecentlyOpenedChange(() => { this.onRecentlyOpenedChange(); }));
 
-		AlternativeKeyEmitter.getInstance().event(this.onAltKeyToggled, this);
+		// Listen to keybindings change
+		this._register(this.keybindingService.onDidUpdateKeybindings(() => this.setupMenubar()));
+
+		this._register(ModifierKeyEmitter.getInstance().event(this.onModifierKeyToggled, this));
 	}
 
 	private setupMenubar(): void {
@@ -348,6 +365,68 @@ export class MenubarPart extends Part {
 		return this.currentEnableMenuBarMnemonics ? label : label.replace(/&&(.)/g, '$1');
 	}
 
+	private createOpenRecentMenuAction(workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | string, commandId: string, isFile: boolean): IAction {
+
+		let label: string;
+		let path: string;
+
+		if (isSingleFolderWorkspaceIdentifier(workspace) || typeof workspace === 'string') {
+			label = getPathLabel(workspace, this.environmentService);
+			path = workspace;
+		} else {
+			label = getWorkspaceLabel(workspace, this.environmentService, { verbose: true });
+			path = workspace.configPath;
+		}
+
+		return new Action(commandId, label, undefined, undefined, (event) => {
+			const openInNewWindow = event && ((!isMacintosh && (event.ctrlKey || event.shiftKey)) || (isMacintosh && (event.metaKey || event.altKey)));
+
+			return this.windowService.openWindow([path], {
+				forceNewWindow: openInNewWindow,
+				forceOpenWorkspaceAsFile: isFile
+			});
+		});
+	}
+
+	private getOpenRecentActions(): IAction[] {
+		if (!this.recentlyOpened) {
+			return [];
+		}
+
+		const { workspaces, files } = this.recentlyOpened;
+
+		const result: IAction[] = [];
+
+		if (workspaces.length > 0) {
+			for (let i = 0; i < MenubarPart.MAX_MENU_RECENT_ENTRIES && i < workspaces.length; i++) {
+				result.push(this.createOpenRecentMenuAction(workspaces[i], 'openRecentWorkspace', false));
+			}
+
+			result.push(new Separator());
+		}
+
+		if (files.length > 0) {
+			for (let i = 0; i < MenubarPart.MAX_MENU_RECENT_ENTRIES && i < files.length; i++) {
+				result.push(this.createOpenRecentMenuAction(files[i], 'openRecentFile', false));
+			}
+
+			result.push(new Separator());
+		}
+
+		return result;
+	}
+
+	private insertActionsBefore(nextAction: IAction, target: IAction[]): void {
+		switch (nextAction.id) {
+			case 'workbench.action.openRecent':
+				target.push(...this.getOpenRecentActions());
+				break;
+
+			default:
+				break;
+		}
+	}
+
 	private setupCustomMenubar(): void {
 		this.container.empty();
 		this.container.attr('role', 'menubar');
@@ -368,9 +447,11 @@ export class MenubarPart extends Part {
 			titleElement.attr('aria-label', legibleTitle);
 			titleElement.attr('role', 'menu');
 
-			let mnemonic = (/&&(.)/g).exec(this.topLevelTitles[menuTitle])[1];
-			if (mnemonic && this.currentEnableMenuBarMnemonics) {
-				this.registerMnemonic(titleElement.getHTMLElement(), mnemonic);
+			if (this.currentEnableMenuBarMnemonics) {
+				let mnemonic = (/&&(.)/g).exec(this.topLevelTitles[menuTitle]);
+				if (mnemonic && mnemonic[1]) {
+					this.registerMnemonic(titleElement.getHTMLElement(), mnemonic[1]);
+				}
 			}
 
 			this.customMenus.push({
@@ -378,48 +459,60 @@ export class MenubarPart extends Part {
 				titleElement: titleElement
 			});
 
-			// Update cached actions array for CustomMenus
-			const updateActions = () => {
-				this.customMenus[menuIndex].actions = [];
+			const updateActions = (menu: IMenu, target: IAction[]) => {
+				target.splice(0);
 				let groups = menu.getActions();
 				for (let group of groups) {
 					const [, actions] = group;
 
-					actions.map((action: IAction) => {
-						action.label = this.calculateActionLabel(action);
-						this.setCheckedStatus(action);
-					});
+					for (let action of actions) {
+						this.insertActionsBefore(action, target);
+						if (action instanceof SubmenuItemAction) {
+							const submenu = this.menuService.createMenu(action.item.submenu, this.contextKeyService);
+							const submenuActions = [];
+							updateActions(submenu, submenuActions);
+							target.push(new SubmenuAction(action.label, submenuActions));
+						} else {
+							action.label = this.calculateActionLabel(action);
+							this.setCheckedStatus(action);
+							target.push(action);
+						}
+					}
 
-					this.customMenus[menuIndex].actions.push(...actions);
-					this.customMenus[menuIndex].actions.push(new Separator());
+					target.push(new Separator());
 				}
 
-				this.customMenus[menuIndex].actions.pop();
+				target.pop();
 			};
 
-			menu.onDidChange(updateActions);
-			updateActions();
+			this.customMenus[menuIndex].actions = [];
+			this._register(menu.onDidChange(() => updateActions(menu, this.customMenus[menuIndex].actions)));
+			updateActions(menu, this.customMenus[menuIndex].actions);
+
+			this.customMenus[menuIndex].titleElement.on(EventType.CLICK, () => {
+				if (this._modifierKeyStatus && (this._modifierKeyStatus.shiftKey || this._modifierKeyStatus.ctrlKey)) {
+					return; // supress keyboard shortcuts that shouldn't conflict
+				}
 
-			this.customMenus[menuIndex].titleElement.on(EventType.CLICK, (event) => {
 				this.toggleCustomMenu(menuIndex);
 				this.isFocused = !this.isFocused;
 			});
 
-			this.customMenus[menuIndex].titleElement.getHTMLElement().onmouseenter = () => {
+			this.customMenus[menuIndex].titleElement.on(EventType.MOUSE_ENTER, () => {
 				if (this.isFocused && !this.isCurrentMenu(menuIndex)) {
 					this.toggleCustomMenu(menuIndex);
 				}
-			};
+			});
 
-			this.customMenus[menuIndex].titleElement.getHTMLElement().onmouseleave = () => {
+			this.customMenus[menuIndex].titleElement.on(EventType.MOUSE_LEAVE, () => {
 				if (!this.isFocused) {
 					this.cleanupCustomMenu();
 				}
-			};
+			});
 
-			this.customMenus[menuIndex].titleElement.getHTMLElement().onblur = () => {
+			this.customMenus[menuIndex].titleElement.on(EventType.BLUR, () => {
 				this.cleanupCustomMenu();
-			};
+			});
 		}
 
 		this.container.off(EventType.KEY_DOWN);
@@ -427,12 +520,10 @@ export class MenubarPart extends Part {
 			let event = new StandardKeyboardEvent(e as KeyboardEvent);
 			let eventHandled = true;
 
-			if (event.equals(KeyCode.LeftArrow)) {
+			if (event.equals(KeyCode.LeftArrow) || (event.shiftKey && event.keyCode === KeyCode.Tab)) {
 				this.focusPrevious();
-			} else if (event.equals(KeyCode.RightArrow)) {
+			} else if (event.equals(KeyCode.RightArrow) || event.equals(KeyCode.Tab)) {
 				this.focusNext();
-			} else if (event.altKey && event.keyCode && this.mnemonics[event.keyCode] !== undefined && !this.focusedMenu) {
-				this.toggleCustomMenu(this.mnemonics[event.keyCode]);
 			} else {
 				eventHandled = false;
 			}
@@ -537,14 +628,6 @@ export class MenubarPart extends Part {
 		this.toggleCustomMenu(0);
 	}
 
-	private _getActionItem(action: IAction): ActionItem {
-		const keybinding = this.keybindingService.lookupKeybinding(action.id);
-		if (keybinding) {
-			return new ActionItem(action, action, { label: true, keybinding: keybinding.getLabel(), isMenu: true });
-		}
-		return null;
-	}
-
 	private toggleCustomMenu(menuIndex: number): void {
 		const customMenu = this.customMenus[menuIndex];
 
@@ -573,24 +656,25 @@ export class MenubarPart extends Part {
 		});
 
 		let menuOptions: IMenuOptions = {
+			getKeyBinding: (action) => this.keybindingService.lookupKeybinding(action.id),
 			actionRunner: this.actionRunner,
-			ariaLabel: 'File',
-			actionItemProvider: (action) => { return this._getActionItem(action); }
+			// ariaLabel: 'File'
+			// actionItemProvider: (action) => { return this._getActionItem(action); }
 		};
 
-		let menuWidget = new Menu(menuHolder.getHTMLElement(), customMenu.actions, menuOptions);
+		let menuWidget = this._register(new Menu(menuHolder.getHTMLElement(), customMenu.actions, menuOptions));
 
-		menuWidget.onDidCancel(() => {
+		this._register(menuWidget.onDidCancel(() => {
 			this.cleanupCustomMenu();
 			this.isFocused = false;
-		});
+		}));
 
-		menuWidget.onDidBlur(() => {
+		this._register(menuWidget.onDidBlur(() => {
 			setTimeout(() => {
 				this.cleanupCustomMenu();
 				this.isFocused = false;
 			}, 100);
-		});
+		}));
 
 		menuWidget.focus();
 
@@ -696,65 +780,82 @@ export class MenubarPart extends Part {
 	}
 }
 
-class AlternativeKeyEmitter extends Emitter<boolean> {
+interface IModifierKeyStatus {
+	altKey: boolean;
+	shiftKey: boolean;
+	ctrlKey: boolean;
+}
+
+class ModifierKeyEmitter extends Emitter<IModifierKeyStatus> {
 
 	private _subscriptions: IDisposable[] = [];
-	private _isPressed: boolean;
-	private static instance: AlternativeKeyEmitter;
-	private _suppressAltKeyUp: boolean = false;
+	private _isPressed: IModifierKeyStatus;
+	private static instance: ModifierKeyEmitter;
 
 	private constructor() {
 		super();
 
+		this._isPressed = {
+			altKey: false,
+			shiftKey: false,
+			ctrlKey: false
+		};
+
 		this._subscriptions.push(domEvent(document.body, 'keydown')(e => {
-			if (e.altKey) {
-				this.isPressed = true;
+			if (e.altKey || e.shiftKey || e.ctrlKey) {
+				this.isPressed = {
+					altKey: e.altKey,
+					ctrlKey: e.ctrlKey,
+					shiftKey: e.shiftKey
+				};
 			}
 		}));
 		this._subscriptions.push(domEvent(document.body, 'keyup')(e => {
-			if (this.isPressed && !e.altKey) {
-				if (this._suppressAltKeyUp) {
-					e.preventDefault();
-				}
+			if ((!e.altKey && this.isPressed.altKey) ||
+				(!e.shiftKey && this.isPressed.shiftKey) ||
+				(!e.ctrlKey && this.isPressed.ctrlKey)
+			) {
 
-				this._suppressAltKeyUp = false;
-				this.isPressed = false;
-			}
-		}));
-		this._subscriptions.push(domEvent(document.body, 'mouseleave')(e => {
-			if (this.isPressed) {
-				this.isPressed = false;
+				this.isPressed = {
+					altKey: e.altKey,
+					shiftKey: e.shiftKey,
+					ctrlKey: e.ctrlKey
+				};
 			}
 		}));
 
 		this._subscriptions.push(domEvent(document.body, 'blur')(e => {
-			if (this.isPressed) {
-				this.isPressed = false;
+			if (this.isPressed.altKey || this.isPressed.shiftKey || this.isPressed.ctrlKey) {
+				this.isPressed = {
+					altKey: false,
+					shiftKey: false,
+					ctrlKey: false
+				};
 			}
 		}));
 	}
 
-	get isPressed(): boolean {
+	get isPressed(): IModifierKeyStatus {
 		return this._isPressed;
 	}
 
-	set isPressed(value: boolean) {
+	set isPressed(value: IModifierKeyStatus) {
+		if (this._isPressed.altKey === value.altKey &&
+			this._isPressed.shiftKey === value.shiftKey &&
+			this._isPressed.ctrlKey === value.ctrlKey) {
+			return;
+		}
+
 		this._isPressed = value;
 		this.fire(this._isPressed);
 	}
 
-	suppressAltKeyUp() {
-		// Sometimes the native alt behavior needs to be suppresed since the alt was already used as an alternative key
-		// Example: windows behavior to toggle tha top level menu #44396
-		this._suppressAltKeyUp = true;
-	}
-
 	static getInstance() {
-		if (!AlternativeKeyEmitter.instance) {
-			AlternativeKeyEmitter.instance = new AlternativeKeyEmitter();
+		if (!ModifierKeyEmitter.instance) {
+			ModifierKeyEmitter.instance = new ModifierKeyEmitter();
 		}
 
-		return AlternativeKeyEmitter.instance;
+		return ModifierKeyEmitter.instance;
 	}
 
 	dispose() {
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsActions.ts b/src/vs/workbench/browser/parts/notifications/notificationsActions.ts
index 71923117b10..926b168f6a6 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsActions.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsActions.ts
@@ -18,8 +18,8 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService
 
 export class ClearNotificationAction extends Action {
 
-	public static readonly ID = CLEAR_NOTIFICATION;
-	public static readonly LABEL = localize('clearNotification', "Clear Notification");
+	static readonly ID = CLEAR_NOTIFICATION;
+	static readonly LABEL = localize('clearNotification', "Clear Notification");
 
 	constructor(
 		id: string,
@@ -29,7 +29,7 @@ export class ClearNotificationAction extends Action {
 		super(id, label, 'clear-notification-action');
 	}
 
-	public run(notification: INotificationViewItem): TPromise<any> {
+	run(notification: INotificationViewItem): TPromise<any> {
 		this.commandService.executeCommand(CLEAR_NOTIFICATION, notification);
 
 		return TPromise.as(void 0);
@@ -38,8 +38,8 @@ export class ClearNotificationAction extends Action {
 
 export class ClearAllNotificationsAction extends Action {
 
-	public static readonly ID = CLEAR_ALL_NOTIFICATIONS;
-	public static readonly LABEL = localize('clearNotifications', "Clear All Notifications");
+	static readonly ID = CLEAR_ALL_NOTIFICATIONS;
+	static readonly LABEL = localize('clearNotifications', "Clear All Notifications");
 
 	constructor(
 		id: string,
@@ -49,7 +49,7 @@ export class ClearAllNotificationsAction extends Action {
 		super(id, label, 'clear-all-notifications-action');
 	}
 
-	public run(notification: INotificationViewItem): TPromise<any> {
+	run(notification: INotificationViewItem): TPromise<any> {
 		this.commandService.executeCommand(CLEAR_ALL_NOTIFICATIONS);
 
 		return TPromise.as(void 0);
@@ -58,8 +58,8 @@ export class ClearAllNotificationsAction extends Action {
 
 export class HideNotificationsCenterAction extends Action {
 
-	public static readonly ID = HIDE_NOTIFICATIONS_CENTER;
-	public static readonly LABEL = localize('hideNotificationsCenter', "Hide Notifications");
+	static readonly ID = HIDE_NOTIFICATIONS_CENTER;
+	static readonly LABEL = localize('hideNotificationsCenter', "Hide Notifications");
 
 	constructor(
 		id: string,
@@ -69,7 +69,7 @@ export class HideNotificationsCenterAction extends Action {
 		super(id, label, 'hide-all-notifications-action');
 	}
 
-	public run(notification: INotificationViewItem): TPromise<any> {
+	run(notification: INotificationViewItem): TPromise<any> {
 		this.commandService.executeCommand(HIDE_NOTIFICATIONS_CENTER);
 
 		return TPromise.as(void 0);
@@ -78,8 +78,8 @@ export class HideNotificationsCenterAction extends Action {
 
 export class ExpandNotificationAction extends Action {
 
-	public static readonly ID = EXPAND_NOTIFICATION;
-	public static readonly LABEL = localize('expandNotification', "Expand Notification");
+	static readonly ID = EXPAND_NOTIFICATION;
+	static readonly LABEL = localize('expandNotification', "Expand Notification");
 
 	constructor(
 		id: string,
@@ -89,7 +89,7 @@ export class ExpandNotificationAction extends Action {
 		super(id, label, 'expand-notification-action');
 	}
 
-	public run(notification: INotificationViewItem): TPromise<any> {
+	run(notification: INotificationViewItem): TPromise<any> {
 		this.commandService.executeCommand(EXPAND_NOTIFICATION, notification);
 
 		return TPromise.as(void 0);
@@ -98,8 +98,8 @@ export class ExpandNotificationAction extends Action {
 
 export class CollapseNotificationAction extends Action {
 
-	public static readonly ID = COLLAPSE_NOTIFICATION;
-	public static readonly LABEL = localize('collapseNotification', "Collapse Notification");
+	static readonly ID = COLLAPSE_NOTIFICATION;
+	static readonly LABEL = localize('collapseNotification', "Collapse Notification");
 
 	constructor(
 		id: string,
@@ -109,7 +109,7 @@ export class CollapseNotificationAction extends Action {
 		super(id, label, 'collapse-notification-action');
 	}
 
-	public run(notification: INotificationViewItem): TPromise<any> {
+	run(notification: INotificationViewItem): TPromise<any> {
 		this.commandService.executeCommand(COLLAPSE_NOTIFICATION, notification);
 
 		return TPromise.as(void 0);
@@ -118,8 +118,8 @@ export class CollapseNotificationAction extends Action {
 
 export class ConfigureNotificationAction extends Action {
 
-	public static readonly ID = 'workbench.action.configureNotification';
-	public static readonly LABEL = localize('configureNotification', "Configure Notification");
+	static readonly ID = 'workbench.action.configureNotification';
+	static readonly LABEL = localize('configureNotification', "Configure Notification");
 
 	constructor(
 		id: string,
@@ -129,15 +129,15 @@ export class ConfigureNotificationAction extends Action {
 		super(id, label, 'configure-notification-action');
 	}
 
-	public get configurationActions(): IAction[] {
+	get configurationActions(): IAction[] {
 		return this._configurationActions;
 	}
 }
 
 export class CopyNotificationMessageAction extends Action {
 
-	public static readonly ID = 'workbench.action.copyNotificationMessage';
-	public static readonly LABEL = localize('copyNotification', "Copy Text");
+	static readonly ID = 'workbench.action.copyNotificationMessage';
+	static readonly LABEL = localize('copyNotification', "Copy Text");
 
 	constructor(
 		id: string,
@@ -147,7 +147,7 @@ export class CopyNotificationMessageAction extends Action {
 		super(id, label);
 	}
 
-	public run(notification: INotificationViewItem): TPromise<any> {
+	run(notification: INotificationViewItem): TPromise<any> {
 		this.clipboardService.writeText(notification.message.raw);
 
 		return TPromise.as(void 0);
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsAlerts.ts b/src/vs/workbench/browser/parts/notifications/notificationsAlerts.ts
index 9d7e25af5ab..f6c6d6379f3 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsAlerts.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsAlerts.ts
@@ -8,15 +8,14 @@
 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 { Disposable } 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[];
+export class NotificationsAlerts extends Disposable {
 
 	constructor(private model: INotificationsModel) {
-		this.toDispose = [];
+		super();
 
 		// Alert initial notifications if any
 		model.notifications.forEach(n => this.ariaAlert(n));
@@ -25,7 +24,7 @@ export class NotificationsAlerts {
 	}
 
 	private registerListeners(): void {
-		this.toDispose.push(this.model.onDidNotificationChange(e => this.onDidNotificationChange(e)));
+		this._register(this.model.onDidNotificationChange(e => this.onDidNotificationChange(e)));
 	}
 
 	private onDidNotificationChange(e: INotificationChangeEvent): void {
@@ -57,8 +56,4 @@ export class NotificationsAlerts {
 
 		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
index 750aeb9764f..fd3ecd2e007 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
@@ -29,13 +29,15 @@ export class NotificationsCenter extends Themable {
 
 	private static MAX_DIMENSIONS = new Dimension(450, 400);
 
+	private readonly _onDidChangeVisibility: Emitter<void> = this._register(new Emitter<void>());
+	get onDidChangeVisibility(): Event<void> { return this._onDidChangeVisibility.event; }
+
 	private notificationsCenterContainer: HTMLElement;
 	private notificationsCenterHeader: HTMLElement;
 	private notificationsCenterTitle: HTMLSpanElement;
 	private notificationsList: NotificationsList;
 	private _isVisible: boolean;
 	private workbenchDimensions: Dimension;
-	private readonly _onDidChangeVisibility: Emitter<void>;
 	private notificationsCenterVisibleContextKey: IContextKey<boolean>;
 
 	constructor(
@@ -50,27 +52,20 @@ export class NotificationsCenter extends Themable {
 	) {
 		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)));
+		this._register(this.model.onDidNotificationChange(e => this.onDidNotificationChange(e)));
 	}
 
-	public get onDidChangeVisibility(): Event<void> {
-		return this._onDidChangeVisibility.event;
-	}
-
-	public get isVisible(): boolean {
+	get isVisible(): boolean {
 		return this._isVisible;
 	}
 
-	public show(): void {
+	show(): void {
 		if (this._isVisible) {
 			this.notificationsList.show(true /* focus */);
 
@@ -138,21 +133,17 @@ export class NotificationsCenter extends Themable {
 		addClass(toolbarContainer, 'notifications-center-header-toolbar');
 		this.notificationsCenterHeader.appendChild(toolbarContainer);
 
-		const actionRunner = this.instantiationService.createInstance(NotificationActionRunner);
-		this.toUnbind.push(actionRunner);
+		const actionRunner = this._register(this.instantiationService.createInstance(NotificationActionRunner));
 
-		const notificationsToolBar = new ActionBar(toolbarContainer, {
+		const notificationsToolBar = this._register(new ActionBar(toolbarContainer, {
 			ariaLabel: localize('notificationsToolbar', "Notification Center Actions"),
 			actionRunner
-		});
-		this.toUnbind.push(notificationsToolBar);
+		}));
 
-		const hideAllAction = this.instantiationService.createInstance(HideNotificationsCenterAction, HideNotificationsCenterAction.ID, HideNotificationsCenterAction.LABEL);
-		this.toUnbind.push(hideAllAction);
+		const hideAllAction = this._register(this.instantiationService.createInstance(HideNotificationsCenterAction, HideNotificationsCenterAction.ID, HideNotificationsCenterAction.LABEL));
 		notificationsToolBar.push(hideAllAction, { icon: true, label: false, keybinding: this.getKeybindingLabel(hideAllAction) });
 
-		const clearAllAction = this.instantiationService.createInstance(ClearAllNotificationsAction, ClearAllNotificationsAction.ID, ClearAllNotificationsAction.LABEL);
-		this.toUnbind.push(clearAllAction);
+		const clearAllAction = this._register(this.instantiationService.createInstance(ClearAllNotificationsAction, ClearAllNotificationsAction.ID, ClearAllNotificationsAction.LABEL));
 		notificationsToolBar.push(clearAllAction, { icon: true, label: false, keybinding: this.getKeybindingLabel(clearAllAction) });
 
 		// Notifications List
@@ -204,7 +195,7 @@ export class NotificationsCenter extends Themable {
 		}
 	}
 
-	public hide(): void {
+	hide(): void {
 		if (!this._isVisible || !this.notificationsCenterContainer) {
 			return; // already hidden
 		}
@@ -244,7 +235,7 @@ export class NotificationsCenter extends Themable {
 		}
 	}
 
-	public layout(dimension: Dimension): void {
+	layout(dimension: Dimension): void {
 		this.workbenchDimensions = dimension;
 
 		if (this._isVisible && this.notificationsCenterContainer) {
@@ -278,7 +269,7 @@ export class NotificationsCenter extends Themable {
 		}
 	}
 
-	public clearAll(): void {
+	clearAll(): void {
 
 		// Hide notifications center first
 		this.hide();
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsList.ts b/src/vs/workbench/browser/parts/notifications/notificationsList.ts
index 3f4cb3ad968..094a62f91fd 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsList.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsList.ts
@@ -38,7 +38,7 @@ export class NotificationsList extends Themable {
 		this.viewModel = [];
 	}
 
-	public show(focus?: boolean): void {
+	show(focus?: boolean): void {
 		if (this.isVisible) {
 			if (focus) {
 				this.list.domFocus();
@@ -67,47 +67,43 @@ export class NotificationsList extends Themable {
 		this.listContainer = document.createElement('div');
 		addClass(this.listContainer, 'notifications-list-container');
 
-		const actionRunner = this.instantiationService.createInstance(NotificationActionRunner);
-		this.toUnbind.push(actionRunner);
+		const actionRunner = this._register(this.instantiationService.createInstance(NotificationActionRunner));
 
 		// Notification Renderer
 		const renderer = this.instantiationService.createInstance(NotificationRenderer, actionRunner);
 
 		// List
-		this.list = <WorkbenchList<INotificationViewItem>>this.instantiationService.createInstance(
+		this.list = this._register(<WorkbenchList<INotificationViewItem>>this.instantiationService.createInstance(
 			WorkbenchList,
 			this.listContainer,
 			new NotificationsListDelegate(this.listContainer),
 			[renderer],
 			this.options
-		);
-		this.toUnbind.push(this.list);
+		));
 
 		// Context menu to copy message
-		const copyAction = this.instantiationService.createInstance(CopyNotificationMessageAction, CopyNotificationMessageAction.ID, CopyNotificationMessageAction.LABEL);
-		this.toUnbind.push(copyAction);
-		this.toUnbind.push(this.list.onContextMenu(e => {
+		const copyAction = this._register(this.instantiationService.createInstance(CopyNotificationMessageAction, CopyNotificationMessageAction.ID, CopyNotificationMessageAction.LABEL));
+		this._register((this.list.onContextMenu(e => {
 			this.contextMenuService.showContextMenu({
 				getAnchor: () => e.anchor,
 				getActions: () => TPromise.as([copyAction]),
 				getActionsContext: () => e.element,
 				actionRunner
 			});
-		}));
+		})));
 
 		// Toggle on double click
-		this.toUnbind.push(this.list.onMouseDblClick(event => (event.element as INotificationViewItem).toggle()));
+		this._register((this.list.onMouseDblClick(event => (event.element as INotificationViewItem).toggle())));
 
 		// Clear focus when DOM focus moves out
 		// Use document.hasFocus() to not clear the focus when the entire window lost focus
 		// This ensures that when the focus comes back, the notifciation is still focused
-		const listFocusTracker = trackFocus(this.list.getHTMLElement());
-		listFocusTracker.onDidBlur(() => {
+		const listFocusTracker = this._register(trackFocus(this.list.getHTMLElement()));
+		this._register(listFocusTracker.onDidBlur(() => {
 			if (document.hasFocus()) {
 				this.list.setFocus([]);
 			}
-		});
-		this.toUnbind.push(listFocusTracker);
+		}));
 
 		// Context key
 		NotificationFocusedContext.bindTo(this.list.contextKeyService);
@@ -115,7 +111,7 @@ export class NotificationsList extends Themable {
 		// 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 => {
+		this._register(this.list.onSelectionChange(e => {
 			if (e.indexes.length > 0) {
 				this.list.setSelection([]);
 			}
@@ -126,7 +122,7 @@ export class NotificationsList extends Themable {
 		this.updateStyles();
 	}
 
-	public updateNotificationsList(start: number, deleteCount: number, items: INotificationViewItem[] = []) {
+	updateNotificationsList(start: number, deleteCount: number, items: INotificationViewItem[] = []) {
 		const listHasDOMFocus = isAncestor(document.activeElement, this.listContainer);
 
 		// Remember focus and relative top of that item
@@ -177,7 +173,7 @@ export class NotificationsList extends Themable {
 		}
 	}
 
-	public hide(): void {
+	hide(): void {
 		if (!this.isVisible || !this.list) {
 			return; // already hidden
 		}
@@ -192,7 +188,7 @@ export class NotificationsList extends Themable {
 		this.viewModel = [];
 	}
 
-	public focusFirst(): void {
+	focusFirst(): void {
 		if (!this.isVisible || !this.list) {
 			return; // hidden
 		}
@@ -201,7 +197,7 @@ export class NotificationsList extends Themable {
 		this.list.domFocus();
 	}
 
-	public hasFocus(): boolean {
+	hasFocus(): boolean {
 		if (!this.isVisible || !this.list) {
 			return false; // hidden
 		}
@@ -222,7 +218,7 @@ export class NotificationsList extends Themable {
 		}
 	}
 
-	public layout(width: number, maxHeight?: number): void {
+	layout(width: number, maxHeight?: number): void {
 		if (this.list) {
 			this.listContainer.style.width = `${width}px`;
 
@@ -234,7 +230,7 @@ export class NotificationsList extends Themable {
 		}
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.hide();
 
 		super.dispose();
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsStatus.ts b/src/vs/workbench/browser/parts/notifications/notificationsStatus.ts
index 32f884d0fc6..fe7e047fc1b 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsStatus.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsStatus.ts
@@ -7,13 +7,12 @@
 
 import { INotificationsModel, INotificationChangeEvent, NotificationChangeType, INotificationViewItem } from 'vs/workbench/common/notifications';
 import { IStatusbarService, StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { HIDE_NOTIFICATIONS_CENTER, SHOW_NOTIFICATIONS_CENTER } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
 import { localize } from 'vs/nls';
 
-export class NotificationsStatus {
+export class NotificationsStatus extends Disposable {
 	private statusItem: IDisposable;
-	private toDispose: IDisposable[];
 	private isNotificationsCenterVisible: boolean;
 	private _counter: Set<INotificationViewItem>;
 
@@ -21,7 +20,8 @@ export class NotificationsStatus {
 		private model: INotificationsModel,
 		@IStatusbarService private statusbarService: IStatusbarService
 	) {
-		this.toDispose = [];
+		super();
+
 		this._counter = new Set<INotificationViewItem>();
 
 		this.updateNotificationsStatusItem();
@@ -33,7 +33,7 @@ export class NotificationsStatus {
 		return this._counter.size;
 	}
 
-	public update(isCenterVisible: boolean): void {
+	update(isCenterVisible: boolean): void {
 		if (this.isNotificationsCenterVisible !== isCenterVisible) {
 			this.isNotificationsCenterVisible = isCenterVisible;
 
@@ -44,7 +44,7 @@ export class NotificationsStatus {
 	}
 
 	private registerListeners(): void {
-		this.toDispose.push(this.model.onDidNotificationChange(e => this.onDidNotificationChange(e)));
+		this._register(this.model.onDidNotificationChange(e => this.onDidNotificationChange(e)));
 	}
 
 	private onDidNotificationChange(e: INotificationChangeEvent): void {
@@ -101,8 +101,8 @@ export class NotificationsStatus {
 		return localize('notifications', "{0} New Notifications", this.count);
 	}
 
-	public dispose() {
-		this.toDispose = dispose(this.toDispose);
+	dispose() {
+		super.dispose();
 
 		if (this.statusItem) {
 			this.statusItem.dispose();
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
index 123c9e5c974..17eb959b455 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
@@ -80,7 +80,7 @@ export class NotificationsToasts extends Themable {
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.model.onDidNotificationChange(e => this.onDidNotificationChange(e)));
+		this._register(this.model.onDidNotificationChange(e => this.onDidNotificationChange(e)));
 	}
 
 	private onDidNotificationChange(e: INotificationChangeEvent): void {
@@ -265,7 +265,7 @@ export class NotificationsToasts extends Themable {
 		this.notificationsToastsVisibleContextKey.set(false);
 	}
 
-	public hide(): void {
+	hide(): void {
 		const focusGroup = isAncestor(document.activeElement, this.notificationsToastsContainer);
 
 		this.removeToasts();
@@ -275,7 +275,7 @@ export class NotificationsToasts extends Themable {
 		}
 	}
 
-	public focus(): boolean {
+	focus(): boolean {
 		const toasts = this.getToasts(ToastVisibility.VISIBLE);
 		if (toasts.length > 0) {
 			toasts[0].list.focusFirst();
@@ -286,7 +286,7 @@ export class NotificationsToasts extends Themable {
 		return false;
 	}
 
-	public focusNext(): boolean {
+	focusNext(): boolean {
 		const toasts = this.getToasts(ToastVisibility.VISIBLE);
 		for (let i = 0; i < toasts.length; i++) {
 			const toast = toasts[i];
@@ -305,7 +305,7 @@ export class NotificationsToasts extends Themable {
 		return false;
 	}
 
-	public focusPrevious(): boolean {
+	focusPrevious(): boolean {
 		const toasts = this.getToasts(ToastVisibility.VISIBLE);
 		for (let i = 0; i < toasts.length; i++) {
 			const toast = toasts[i];
@@ -324,7 +324,7 @@ export class NotificationsToasts extends Themable {
 		return false;
 	}
 
-	public focusFirst(): boolean {
+	focusFirst(): boolean {
 		const toast = this.getToasts(ToastVisibility.VISIBLE)[0];
 		if (toast) {
 			toast.list.focusFirst();
@@ -335,7 +335,7 @@ export class NotificationsToasts extends Themable {
 		return false;
 	}
 
-	public focusLast(): boolean {
+	focusLast(): boolean {
 		const toasts = this.getToasts(ToastVisibility.VISIBLE);
 		if (toasts.length > 0) {
 			toasts[toasts.length - 1].list.focusFirst();
@@ -346,7 +346,7 @@ export class NotificationsToasts extends Themable {
 		return false;
 	}
 
-	public update(isCenterVisible: boolean): void {
+	update(isCenterVisible: boolean): void {
 		if (this.isNotificationsCenterVisible !== isCenterVisible) {
 			this.isNotificationsCenterVisible = isCenterVisible;
 
@@ -391,7 +391,7 @@ export class NotificationsToasts extends Themable {
 		return notificationToasts.reverse(); // from newest to oldest
 	}
 
-	public layout(dimension: Dimension): void {
+	layout(dimension: Dimension): void {
 		this.workbenchDimensions = dimension;
 
 		const maxDimensions = this.computeMaxDimensions();
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
index 27f01868fbc..2ecb5ec8da0 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
@@ -46,7 +46,7 @@ export class NotificationsListDelegate implements IDelegate<INotificationViewIte
 		return offsetHelper;
 	}
 
-	public getHeight(notification: INotificationViewItem): number {
+	getHeight(notification: INotificationViewItem): number {
 
 		// First row: message and actions
 		let expandedHeight = NotificationsListDelegate.ROW_HEIGHT;
@@ -102,7 +102,7 @@ export class NotificationsListDelegate implements IDelegate<INotificationViewIte
 		return preferredHeight;
 	}
 
-	public getTemplateId(element: INotificationViewItem): string {
+	getTemplateId(element: INotificationViewItem): string {
 		if (element instanceof NotificationViewItem) {
 			return NotificationRenderer.TEMPLATE_ID;
 		}
@@ -135,7 +135,7 @@ interface IMessageActionHandler {
 
 class NotificationMessageRenderer {
 
-	public static render(message: INotificationMessage, actionHandler?: IMessageActionHandler): HTMLElement {
+	static render(message: INotificationMessage, actionHandler?: IMessageActionHandler): HTMLElement {
 		const messageContainer = document.createElement('span');
 
 		// Message has no links
@@ -181,7 +181,7 @@ class NotificationMessageRenderer {
 
 export class NotificationRenderer implements IRenderer<INotificationViewItem, INotificationTemplateData> {
 
-	public static readonly TEMPLATE_ID = 'notification';
+	static readonly TEMPLATE_ID = 'notification';
 
 	constructor(
 		private actionRunner: IActionRunner,
@@ -191,11 +191,11 @@ export class NotificationRenderer implements IRenderer<INotificationViewItem, IN
 	) {
 	}
 
-	public get templateId() {
+	get templateId() {
 		return NotificationRenderer.TEMPLATE_ID;
 	}
 
-	public renderTemplate(container: HTMLElement): INotificationTemplateData {
+	renderTemplate(container: HTMLElement): INotificationTemplateData {
 		const data: INotificationTemplateData = Object.create(null);
 		data.toDispose = [];
 
@@ -274,11 +274,11 @@ export class NotificationRenderer implements IRenderer<INotificationViewItem, IN
 		return data;
 	}
 
-	public renderElement(notification: INotificationViewItem, index: number, data: INotificationTemplateData): void {
+	renderElement(notification: INotificationViewItem, index: number, data: INotificationTemplateData): void {
 		data.renderer.setInput(notification);
 	}
 
-	public disposeTemplate(templateData: INotificationTemplateData): void {
+	disposeTemplate(templateData: INotificationTemplateData): void {
 		templateData.toDispose = dispose(templateData.toDispose);
 	}
 }
@@ -291,7 +291,7 @@ export class NotificationTemplateRenderer {
 
 	private static readonly SEVERITIES: ('info' | 'warning' | 'error')[] = ['info', 'warning', 'error'];
 
-	private inputDisposeables: IDisposable[];
+	private inputDisposeables: IDisposable[] = [];
 
 	constructor(
 		private template: INotificationTemplateData,
@@ -301,8 +301,6 @@ export class NotificationTemplateRenderer {
 		@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);
@@ -310,7 +308,7 @@ export class NotificationTemplateRenderer {
 		}
 	}
 
-	public setInput(notification: INotificationViewItem): void {
+	setInput(notification: INotificationViewItem): void {
 		this.inputDisposeables = dispose(this.inputDisposeables);
 
 		this.render(notification);
@@ -507,7 +505,7 @@ export class NotificationTemplateRenderer {
 		return keybinding ? keybinding.getLabel() : void 0;
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.inputDisposeables = dispose(this.inputDisposeables);
 	}
 }
diff --git a/src/vs/workbench/browser/parts/panel/panelActions.ts b/src/vs/workbench/browser/parts/panel/panelActions.ts
index b1451168b72..654186a1c39 100644
--- a/src/vs/workbench/browser/parts/panel/panelActions.ts
+++ b/src/vs/workbench/browser/parts/panel/panelActions.ts
@@ -18,6 +18,7 @@ import { ActivityAction } from 'vs/workbench/browser/parts/compositebar/composit
 import { IActivity } from 'vs/workbench/common/activity';
 
 export class ClosePanelAction extends Action {
+
 	static readonly ID = 'workbench.action.closePanel';
 	static LABEL = nls.localize('closePanel', "Close Panel");
 
@@ -29,12 +30,13 @@ export class ClosePanelAction extends Action {
 		super(id, name, 'hide-panel-action');
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		return this.partService.setPanelHidden(true);
 	}
 }
 
 export class TogglePanelAction extends Action {
+
 	static readonly ID = 'workbench.action.togglePanel';
 	static LABEL = nls.localize('togglePanel', "Toggle Panel");
 
@@ -46,15 +48,15 @@ export class TogglePanelAction extends Action {
 		super(id, name, partService.isVisible(Parts.PANEL_PART) ? 'panel expanded' : 'panel');
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		return this.partService.setPanelHidden(this.partService.isVisible(Parts.PANEL_PART));
 	}
 }
 
 class FocusPanelAction extends Action {
 
-	public static readonly ID = 'workbench.action.focusPanel';
-	public static readonly LABEL = nls.localize('focusPanel', "Focus into Panel");
+	static readonly ID = 'workbench.action.focusPanel';
+	static readonly LABEL = nls.localize('focusPanel', "Focus into Panel");
 
 	constructor(
 		id: string,
@@ -65,7 +67,7 @@ class FocusPanelAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 
 		// Show panel
 		if (!this.partService.isVisible(Parts.PANEL_PART)) {
@@ -83,10 +85,12 @@ class FocusPanelAction extends Action {
 
 export class TogglePanelPositionAction extends Action {
 
-	public static readonly ID = 'workbench.action.togglePanelPosition';
-	public static readonly LABEL = nls.localize('toggledPanelPosition', "Toggle Panel Position");
+	static readonly ID = 'workbench.action.togglePanelPosition';
+	static readonly LABEL = nls.localize('toggledPanelPosition', "Toggle Panel Position");
+
 	private static readonly MOVE_TO_RIGHT_LABEL = nls.localize('moveToRight', "Move to Right");
 	private static readonly MOVE_TO_BOTTOM_LABEL = nls.localize('moveToBottom', "Move to Bottom");
+
 	private toDispose: IDisposable[];
 
 	constructor(
@@ -106,12 +110,12 @@ export class TogglePanelPositionAction extends Action {
 		setClassAndLabel();
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const position = this.partService.getPanelPosition();
 		return this.partService.setPanelPosition(position === Position.BOTTOM ? Position.RIGHT : Position.BOTTOM);
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		super.dispose();
 		this.toDispose = dispose(this.toDispose);
 	}
@@ -119,10 +123,12 @@ export class TogglePanelPositionAction extends Action {
 
 export class ToggleMaximizedPanelAction extends Action {
 
-	public static readonly ID = 'workbench.action.toggleMaximizedPanel';
-	public static readonly LABEL = nls.localize('toggleMaximizedPanel', "Toggle Maximized Panel");
+	static readonly ID = 'workbench.action.toggleMaximizedPanel';
+	static readonly LABEL = nls.localize('toggleMaximizedPanel', "Toggle Maximized Panel");
+
 	private static readonly MAXIMIZE_LABEL = nls.localize('maximizePanel', "Maximize Panel Size");
 	private static readonly RESTORE_LABEL = nls.localize('minimizePanel', "Restore Panel Size");
+
 	private toDispose: IDisposable[];
 
 	constructor(
@@ -139,13 +145,12 @@ export class ToggleMaximizedPanelAction extends Action {
 		}));
 	}
 
-	public run(): TPromise<any> {
-		// Show panel
+	run(): TPromise<any> {
 		return (!this.partService.isVisible(Parts.PANEL_PART) ? this.partService.setPanelHidden(false) : TPromise.as(null))
 			.then(() => this.partService.toggleMaximizedPanel());
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		super.dispose();
 		this.toDispose = dispose(this.toDispose);
 	}
@@ -160,7 +165,7 @@ export class PanelActivityAction extends ActivityAction {
 		super(activity);
 	}
 
-	public run(event: any): TPromise<any> {
+	run(event: any): TPromise<any> {
 		return this.panelService.openPanel(this.activity.id, true).then(() => this.activate());
 	}
 }
diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts
index f076f3a9ff1..40c3fa928ea 100644
--- a/src/vs/workbench/browser/parts/panel/panelPart.ts
+++ b/src/vs/workbench/browser/parts/panel/panelPart.ts
@@ -30,7 +30,7 @@ import { IBadge } from 'vs/workbench/services/activity/common/activity';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { Dimension } from 'vs/base/browser/dom';
 import { localize } from 'vs/nls';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable } from 'vs/base/common/lifecycle';
 import { RawContextKey, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
 const ActivePanleContextId = 'activePanel';
@@ -38,18 +38,18 @@ export const ActivePanelContext = new RawContextKey<string>(ActivePanleContextId
 
 export class PanelPart extends CompositePart<Panel> implements IPanelService {
 
-	public static readonly activePanelSettingsKey = 'workbench.panelpart.activepanelid';
+	static readonly activePanelSettingsKey = 'workbench.panelpart.activepanelid';
+
 	private static readonly PINNED_PANELS = 'workbench.panel.pinnedPanels';
 	private static readonly MIN_COMPOSITE_BAR_WIDTH = 50;
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private activePanelContextKey: IContextKey<string>;
 	private blockOpeningPanel: boolean;
 	private compositeBar: CompositeBar;
-	private compositeActions: { [compositeId: string]: { activityAction: PanelActivityAction, pinnedAction: ToggleCompositePinnedAction } };
+	private compositeActions: { [compositeId: string]: { activityAction: PanelActivityAction, pinnedAction: ToggleCompositePinnedAction } } = Object.create(null);
 	private dimension: Dimension;
-	private disposables: IDisposable[] = [];
 
 	constructor(
 		id: string,
@@ -82,8 +82,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 			{ hasTitle: true }
 		);
 
-		this.compositeActions = Object.create(null);
-		this.compositeBar = this.instantiationService.createInstance(CompositeBar, {
+		this.compositeBar = this._register(this.instantiationService.createInstance(CompositeBar, {
 			icon: false,
 			storageId: PanelPart.PINNED_PANELS,
 			orientation: ActionsOrientation.HORIZONTAL,
@@ -102,31 +101,31 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 				badgeForeground,
 				dragAndDropBackground: PANEL_DRAG_AND_DROP_BACKGROUND
 			}
-		});
-		this.toUnbind.push(this.compositeBar);
+		}));
+
 		for (const panel of this.getPanels()) {
 			this.compositeBar.addComposite(panel);
 		}
+
 		this.activePanelContextKey = ActivePanelContext.bindTo(contextKeyService);
-		this.onDidPanelOpen(this._onDidPanelOpen, this, this.disposables);
-		this.onDidPanelClose(this._onDidPanelClose, this, this.disposables);
 
 		this.registerListeners();
 	}
 
 	private registerListeners(): void {
+		this._register(this.onDidPanelOpen(this._onDidPanelOpen, this));
+		this._register(this.onDidPanelClose(this._onDidPanelClose, this));
 
-		this.toUnbind.push(this.registry.onDidRegister(panelDescriptor => this.compositeBar.addComposite(panelDescriptor)));
+		this._register(this.registry.onDidRegister(panelDescriptor => this.compositeBar.addComposite(panelDescriptor)));
 
 		// Activate panel action on opening of a panel
-		this.toUnbind.push(this.onDidPanelOpen(panel => {
+		this._register(this.onDidPanelOpen(panel => {
 			this.compositeBar.activateComposite(panel.getId());
-			// Need to relayout composite bar since different panels have different action bar width
-			this.layoutCompositeBar();
+			this.layoutCompositeBar(); // Need to relayout composite bar since different panels have different action bar width
 		}));
 
 		// Deactivate panel action on close
-		this.toUnbind.push(this.onDidPanelClose(panel => this.compositeBar.deactivateComposite(panel.getId())));
+		this._register(this.onDidPanelClose(panel => this.compositeBar.deactivateComposite(panel.getId())));
 	}
 
 	private _onDidPanelOpen(panel: IPanel): void {
@@ -141,15 +140,15 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		}
 	}
 
-	public get onDidPanelOpen(): Event<IPanel> {
+	get onDidPanelOpen(): Event<IPanel> {
 		return this._onDidCompositeOpen.event;
 	}
 
-	public get onDidPanelClose(): Event<IPanel> {
+	get onDidPanelClose(): Event<IPanel> {
 		return this._onDidCompositeClose.event;
 	}
 
-	public updateStyles(): void {
+	updateStyles(): void {
 		super.updateStyles();
 
 		const container = $(this.getContainer());
@@ -160,7 +159,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		title.style('border-top-color', this.getColor(PANEL_BORDER) || this.getColor(contrastBorder));
 	}
 
-	public openPanel(id: string, focus?: boolean): TPromise<Panel> {
+	openPanel(id: string, focus?: boolean): TPromise<Panel> {
 		if (this.blockOpeningPanel) {
 			return TPromise.as(null); // Workaround against a potential race condition
 		}
@@ -179,7 +178,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		return promise.then(() => this.openComposite(id, focus));
 	}
 
-	public showActivity(panelId: string, badge: IBadge, clazz?: string): IDisposable {
+	showActivity(panelId: string, badge: IBadge, clazz?: string): IDisposable {
 		return this.compositeBar.showActivity(panelId, badge, clazz);
 	}
 
@@ -187,13 +186,13 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		return this.getPanels().filter(p => p.id === panelId).pop();
 	}
 
-	public getPanels(): PanelDescriptor[] {
+	getPanels(): PanelDescriptor[] {
 		return Registry.as<PanelRegistry>(PanelExtensions.Panels).getPanels()
 			.filter(p => p.enabled)
 			.sort((v1, v2) => v1.order - v2.order);
 	}
 
-	public setPanelEnablement(id: string, enabled: boolean): void {
+	setPanelEnablement(id: string, enabled: boolean): void {
 		const descriptor = Registry.as<PanelRegistry>(PanelExtensions.Panels).getPanels().filter(p => p.id === id).pop();
 		if (descriptor && descriptor.enabled !== enabled) {
 			descriptor.enabled = enabled;
@@ -213,15 +212,15 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		];
 	}
 
-	public getActivePanel(): IPanel {
+	getActivePanel(): IPanel {
 		return this.getActiveComposite();
 	}
 
-	public getLastActivePanelId(): string {
+	getLastActivePanelId(): string {
 		return this.getLastActiveCompositetId();
 	}
 
-	public hideActivePanel(): TPromise<void> {
+	hideActivePanel(): TPromise<void> {
 		return this.hideActiveComposite().then(composite => void 0);
 	}
 
@@ -242,7 +241,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		};
 	}
 
-	public layout(dimension: Dimension): Dimension[] {
+	layout(dimension: Dimension): Dimension[] {
 		if (!this.partService.isVisible(Parts.PANEL_PART)) {
 			return [dimension];
 		}
@@ -299,11 +298,6 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		}
 		return this.toolBar.getItemsWidth();
 	}
-
-	dispose(): void {
-		super.dispose();
-		this.disposables = dispose(this.disposables);
-	}
 }
 
 registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 3895d568ae1..b56ee969d43 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -41,6 +41,8 @@ import { Action } from 'vs/base/common/actions';
 import URI from 'vs/base/common/uri';
 import { IdGenerator } from 'vs/base/common/idGenerator';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { equals } from 'vs/base/common/arrays';
+import { TimeoutTimer } from 'vs/base/common/async';
 
 const $ = dom.$;
 
@@ -103,7 +105,7 @@ class QuickInput implements IQuickInput {
 		this.onDidHideEmitter,
 	];
 
-	private busyDelay: TPromise<void>;
+	private busyDelay: TimeoutTimer;
 
 	constructor(protected ui: QuickInputUI) {
 	}
@@ -214,12 +216,12 @@ class QuickInput implements IQuickInput {
 			this.ui.title.textContent = title;
 		}
 		if (this.busy && !this.busyDelay) {
-			this.busyDelay = TPromise.timeout(800);
-			this.busyDelay.then(() => {
+			this.busyDelay = new TimeoutTimer();
+			this.busyDelay.setIfNotSet(() => {
 				if (this.visible) {
 					this.ui.progressBar.infinite();
 				}
-			}, () => { /* ignore */ });
+			}, 800);
 		}
 		if (!this.busy && this.busyDelay) {
 			this.ui.progressBar.stop();
@@ -285,13 +287,15 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
 	private _items: T[] = [];
 	private itemsUpdated = false;
 	private _canSelectMany = false;
-	private _matchOnDescription = true;
-	private _matchOnDetail = true;
+	private _matchOnDescription = false;
+	private _matchOnDetail = false;
 	private _activeItems: T[] = [];
 	private activeItemsUpdated = false;
+	private activeItemsToConfirm: T[] = [];
 	private onDidChangeActiveEmitter = new Emitter<T[]>();
 	private _selectedItems: T[] = [];
 	private selectedItemsUpdated = false;
+	private selectedItemsToConfirm: T[] = [];
 	private onDidChangeSelectionEmitter = new Emitter<T[]>();
 	private quickNavigate = false;
 
@@ -429,8 +433,7 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
 					if (this.activeItemsUpdated) {
 						return; // Expect another event.
 					}
-					// Drop initial event.
-					if (!focusedItems.length && !this._activeItems.length) {
+					if (this.activeItemsToConfirm !== this._activeItems && equals(focusedItems, this._activeItems, (a, b) => a === b)) {
 						return;
 					}
 					this._activeItems = focusedItems as T[];
@@ -440,8 +443,7 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
 					if (this.canSelectMany) {
 						return;
 					}
-					// Drop initial event.
-					if (!selectedItems.length && !this._selectedItems.length) {
+					if (this.selectedItemsToConfirm !== this._selectedItems && equals(selectedItems, this._selectedItems, (a, b) => a === b)) {
 						return;
 					}
 					this._selectedItems = selectedItems as T[];
@@ -452,6 +454,9 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
 					if (!this.canSelectMany) {
 						return;
 					}
+					if (this.selectedItemsToConfirm !== this._selectedItems && equals(checkedItems, this._selectedItems, (a, b) => a === b)) {
+						return;
+					}
 					this._selectedItems = checkedItems as T[];
 					this.onDidChangeSelectionEmitter.fire(checkedItems as T[]);
 				}),
@@ -490,15 +495,23 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
 		}
 		if (this.activeItemsUpdated) {
 			this.activeItemsUpdated = false;
+			this.activeItemsToConfirm = this._activeItems;
 			this.ui.list.setFocusedElements(this.activeItems);
+			if (this.activeItemsToConfirm === this._activeItems) {
+				this.activeItemsToConfirm = null;
+			}
 		}
 		if (this.selectedItemsUpdated) {
 			this.selectedItemsUpdated = false;
+			this.selectedItemsToConfirm = this._selectedItems;
 			if (this.canSelectMany) {
 				this.ui.list.setCheckedElements(this.selectedItems);
 			} else {
 				this.ui.list.setSelectedElements(this.selectedItems);
 			}
+			if (this.selectedItemsToConfirm === this._selectedItems) {
+				this.selectedItemsToConfirm = null;
+			}
 		}
 		this.ui.list.matchOnDescription = this.matchOnDescription;
 		this.ui.list.matchOnDetail = this.matchOnDetail;
@@ -561,7 +574,7 @@ class InputBox extends QuickInput implements IInputBox {
 
 	private _value = '';
 	private _valueSelection: Readonly<[number, number]>;
-	private valueSelectionUpdated = false;
+	private valueSelectionUpdated = true;
 	private _placeholder: string;
 	private _password = false;
 	private _prompt: string;
@@ -662,9 +675,7 @@ class InputBox extends QuickInput implements IInputBox {
 		}
 		if (this.valueSelectionUpdated) {
 			this.valueSelectionUpdated = false;
-			this.ui.inputBox.select(this._valueSelection ?
-				{ start: this._valueSelection[0], end: this._valueSelection[1] } :
-				{ start: this.ui.inputBox.value.length, end: this.ui.inputBox.value.length });
+			this.ui.inputBox.select(this._valueSelection && { start: this._valueSelection[0], end: this._valueSelection[1] });
 		}
 		if (this.ui.inputBox.placeholder !== (this.placeholder || '')) {
 			this.ui.inputBox.placeholder = (this.placeholder || '');
@@ -701,8 +712,8 @@ export class QuickInputService extends Component implements IQuickInputService {
 	private enabled = true;
 	private inQuickOpenWidgets: Record<string, boolean> = {};
 	private inQuickOpenContext: IContextKey<boolean>;
-	private onDidAcceptEmitter = new Emitter<void>();
-	private onDidTriggerButtonEmitter = new Emitter<IQuickInputButton>();
+	private onDidAcceptEmitter = this._register(new Emitter<void>());
+	private onDidTriggerButtonEmitter = this._register(new Emitter<IQuickInputButton>());
 
 	private controller: QuickInput;
 
@@ -719,11 +730,8 @@ export class QuickInputService extends Component implements IQuickInputService {
 	) {
 		super(QuickInputService.ID, themeService);
 		this.inQuickOpenContext = new RawContextKey<boolean>('inQuickOpen', false).bindTo(contextKeyService);
-		this.toUnbind.push(
-			this.quickOpenService.onShow(() => this.inQuickOpen('quickOpen', true)),
-			this.quickOpenService.onHide(() => this.inQuickOpen('quickOpen', false)),
-			this.onDidAcceptEmitter
-		);
+		this._register(this.quickOpenService.onShow(() => this.inQuickOpen('quickOpen', true)));
+		this._register(this.quickOpenService.onHide(() => this.inQuickOpen('quickOpen', false)));
 	}
 
 	private inQuickOpen(widget: 'quickInput' | 'quickOpen', open: boolean) {
@@ -755,25 +763,23 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 		this.titleBar = dom.append(container, $('.quick-input-titlebar'));
 
-		const leftActionBar = new ActionBar(this.titleBar);
+		const leftActionBar = this._register(new ActionBar(this.titleBar));
 		leftActionBar.domNode.classList.add('quick-input-left-action-bar');
-		this.toUnbind.push(leftActionBar);
 
 		const title = dom.append(this.titleBar, $('.quick-input-title'));
 
-		const rightActionBar = new ActionBar(this.titleBar);
+		const rightActionBar = this._register(new ActionBar(this.titleBar));
 		rightActionBar.domNode.classList.add('quick-input-right-action-bar');
-		this.toUnbind.push(rightActionBar);
 
 		const headerContainer = dom.append(container, $('.quick-input-header'));
 
 		const checkAll = <HTMLInputElement>dom.append(headerContainer, $('input.quick-input-check-all'));
 		checkAll.type = 'checkbox';
-		this.toUnbind.push(dom.addStandardDisposableListener(checkAll, dom.EventType.CHANGE, e => {
+		this._register(dom.addStandardDisposableListener(checkAll, dom.EventType.CHANGE, e => {
 			const checked = checkAll.checked;
 			list.setAllVisibleChecked(checked);
 		}));
-		this.toUnbind.push(dom.addDisposableListener(checkAll, dom.EventType.CLICK, e => {
+		this._register(dom.addDisposableListener(checkAll, dom.EventType.CLICK, e => {
 			if (e.x || e.y) { // Avoid 'click' triggered by 'space'...
 				inputBox.setFocus();
 			}
@@ -781,18 +787,17 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 		this.filterContainer = dom.append(headerContainer, $('.quick-input-filter'));
 
-		const inputBox = new QuickInputBox(this.filterContainer);
-		this.toUnbind.push(inputBox);
+		const inputBox = this._register(new QuickInputBox(this.filterContainer));
 
 		this.countContainer = dom.append(this.filterContainer, $('.quick-input-count'));
 		const count = new CountBadge(this.countContainer, { countFormat: localize({ key: 'quickInput.countSelected', comment: ['This tells the user how many items are selected in a list of items to select from. The items can be anything.'] }, "{0} Selected") });
-		this.toUnbind.push(attachBadgeStyler(count, this.themeService));
+		this._register(attachBadgeStyler(count, this.themeService));
 
 		this.okContainer = dom.append(headerContainer, $('.quick-input-action'));
 		this.ok = new Button(this.okContainer);
 		attachButtonStyler(this.ok, this.themeService);
 		this.ok.label = localize('ok', "OK");
-		this.toUnbind.push(this.ok.onDidClick(e => {
+		this._register(this.ok.onDidClick(e => {
 			this.onDidAcceptEmitter.fire();
 		}));
 
@@ -800,17 +805,16 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 		const progressBar = new ProgressBar(container);
 		dom.addClass(progressBar.getContainer(), 'quick-input-progress');
-		this.toUnbind.push(attachProgressBarStyler(progressBar, this.themeService));
+		this._register(attachProgressBarStyler(progressBar, this.themeService));
 
-		const list = this.instantiationService.createInstance(QuickInputList, container);
-		this.toUnbind.push(list);
-		this.toUnbind.push(list.onChangedAllVisibleChecked(checked => {
+		const list = this._register(this.instantiationService.createInstance(QuickInputList, container));
+		this._register(list.onChangedAllVisibleChecked(checked => {
 			checkAll.checked = checked;
 		}));
-		this.toUnbind.push(list.onChangedCheckedCount(c => {
+		this._register(list.onChangedCheckedCount(c => {
 			count.setCount(c);
 		}));
-		this.toUnbind.push(list.onLeave(() => {
+		this._register(list.onLeave(() => {
 			// Defer to avoid the input field reacting to the triggering key.
 			setTimeout(() => {
 				inputBox.setFocus();
@@ -818,7 +822,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 			}, 0);
 		}));
 
-		this.toUnbind.push(dom.addDisposableListener(container, 'focusout', (e: FocusEvent) => {
+		this._register(dom.addDisposableListener(container, 'focusout', (e: FocusEvent) => {
 			if (e.relatedTarget === container) {
 				(<HTMLElement>e.target).focus();
 				return;
@@ -832,7 +836,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 				this.hide(true);
 			}
 		}));
-		this.toUnbind.push(dom.addDisposableListener(container, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
+		this._register(dom.addDisposableListener(container, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
 			const event = new StandardKeyboardEvent(e);
 			switch (event.keyCode) {
 				case KeyCode.Enter:
@@ -863,7 +867,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 			}
 		}));
 
-		this.toUnbind.push(this.quickOpenService.onShow(() => this.hide(true)));
+		this._register(this.quickOpenService.onShow(() => this.hide(true)));
 
 		this.ui = {
 			container,
@@ -887,8 +891,8 @@ export class QuickInputService extends Component implements IQuickInputService {
 		this.updateStyles();
 	}
 
-	pick<T extends IQuickPickItem, O extends IPickOptions>(picks: TPromise<T[]>, options: O = <O>{}, token: CancellationToken = CancellationToken.None): TPromise<O extends { canPickMany: true } ? T[] : T> {
-		return new TPromise<O extends { canPickMany: true } ? T[] : T>((resolve, reject, progress) => {
+	pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: TPromise<T[]>, options: O = <O>{}, token: CancellationToken = CancellationToken.None): TPromise<O extends { canPickMany: true } ? T[] : T> {
+		return new TPromise<O extends { canPickMany: true } ? T[] : T>((resolve, reject) => {
 			if (token.isCancellationRequested) {
 				resolve(undefined);
 				return;
@@ -910,8 +914,8 @@ export class QuickInputService extends Component implements IQuickInputService {
 				}),
 				input.onDidChangeActive(items => {
 					const focused = items[0];
-					if (focused) {
-						progress(focused);
+					if (focused && options.onDidFocus) {
+						options.onDidFocus(focused);
 					}
 				}),
 				input.onDidChangeSelection(items => {
@@ -961,27 +965,33 @@ export class QuickInputService extends Component implements IQuickInputService {
 			const input = this.createInputBox();
 			const validateInput = options.validateInput || (() => TPromise.as(undefined));
 			const onDidValueChange = debounceEvent(input.onDidChangeValue, (last, cur) => cur, 100);
-			let validationValue: string;
-			let validation = TPromise.as('');
+			let validationValue = options.value || '';
+			let validation = TPromise.wrap(validateInput(validationValue));
 			const disposables = [
 				input,
 				onDidValueChange(value => {
 					if (value !== validationValue) {
 						validation = TPromise.wrap(validateInput(value));
+						validationValue = value;
 					}
 					validation.then(result => {
-						input.validationMessage = result;
+						if (value === validationValue) {
+							input.validationMessage = result;
+						}
 					});
 				}),
 				input.onDidAccept(() => {
 					const value = input.value;
 					if (value !== validationValue) {
 						validation = TPromise.wrap(validateInput(value));
+						validationValue = value;
 					}
 					validation.then(result => {
 						if (!result) {
 							resolve(value);
 							input.hide();
+						} else if (value === validationValue) {
+							input.validationMessage = result;
 						}
 					});
 				}),
diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
index 59e9137b08a..7cab9eec672 100644
--- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
+++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
@@ -34,7 +34,7 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { QuickOpenHandler, QuickOpenHandlerDescriptor, IQuickOpenRegistry, Extensions, EditorQuickOpenEntry, CLOSE_ON_FOCUS_LOST_CONFIG } from 'vs/workbench/browser/quickopen';
 import * as errors from 'vs/base/common/errors';
-import { IPickOpenEntry, IFilePickOpenEntry, IQuickOpenService, IPickOptions, IShowOptions, IPickOpenItem } from 'vs/platform/quickOpen/common/quickOpen';
+import { IPickOpenEntry, IFilePickOpenEntry, IQuickOpenService, IShowOptions, IPickOpenItem, IStringPickOptions, ITypedPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
@@ -73,28 +73,31 @@ interface IInternalPickOptions {
 	ignoreFocusLost?: boolean;
 	quickNavigateConfiguration?: IQuickNavigateConfiguration;
 	onDidType?: (value: string) => any;
+	onDidFocus?: (item: any) => void;
 }
 
 export class QuickOpenController extends Component implements IQuickOpenService {
 
 	private static readonly MAX_SHORT_RESPONSE_TIME = 500;
-
-	public _serviceBrand: any;
-
 	private static readonly ID = 'workbench.component.quickopen';
 
-	private readonly _onShow: Emitter<void>;
-	private readonly _onHide: Emitter<void>;
+	_serviceBrand: any;
+
+	private readonly _onShow: Emitter<void> = this._register(new Emitter<void>());
+	get onShow(): Event<void> { return this._onShow.event; }
+
+	private readonly _onHide: Emitter<void> = this._register(new Emitter<void>());
+	get onHide(): Event<void> { return this._onHide.event; }
 
 	private quickOpenWidget: QuickOpenWidget;
 	private pickOpenWidget: QuickOpenWidget;
 	private layoutDimensions: Dimension;
-	private mapResolvedHandlersToPrefix: { [prefix: string]: TPromise<QuickOpenHandler>; };
-	private mapContextKeyToContext: { [id: string]: IContextKey<boolean>; };
-	private handlerOnOpenCalled: { [prefix: string]: boolean; };
+	private mapResolvedHandlersToPrefix: { [prefix: string]: TPromise<QuickOpenHandler>; } = Object.create(null);
+	private mapContextKeyToContext: { [id: string]: IContextKey<boolean>; } = Object.create(null);
+	private handlerOnOpenCalled: { [prefix: string]: boolean; } = Object.create(null);
 	private currentResultToken: string;
 	private currentPickerToken: string;
-	private promisesToCompleteOnHide: ValueCallback[];
+	private promisesToCompleteOnHide: ValueCallback[] = [];
 	private previousActiveHandlerDescriptor: QuickOpenHandlerDescriptor;
 	private actionProvider = new ContributableActionProvider();
 	private closeOnFocusLost: boolean;
@@ -112,26 +115,17 @@ export class QuickOpenController extends Component implements IQuickOpenService
 	) {
 		super(QuickOpenController.ID, themeService);
 
-		this.mapResolvedHandlersToPrefix = {};
-		this.handlerOnOpenCalled = {};
-		this.mapContextKeyToContext = {};
-
-		this.promisesToCompleteOnHide = [];
-
 		this.editorHistoryHandler = this.instantiationService.createInstance(EditorHistoryHandler);
 
-		this._onShow = new Emitter<void>();
-		this._onHide = new Emitter<void>();
-
 		this.updateConfiguration();
 
 		this.registerListeners();
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => this.updateConfiguration()));
-		this.toUnbind.push(this.partService.onTitleBarVisibilityChange(() => this.positionQuickOpenWidget()));
-		this.toUnbind.push(browser.onDidChangeZoomLevel(() => this.positionQuickOpenWidget()));
+		this._register(this.configurationService.onDidChangeConfiguration(e => this.updateConfiguration()));
+		this._register(this.partService.onTitleBarVisibilityChange(() => this.positionQuickOpenWidget()));
+		this._register(browser.onDidChangeZoomLevel(() => this.positionQuickOpenWidget()));
 	}
 
 	private updateConfiguration(): void {
@@ -142,15 +136,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		}
 	}
 
-	public get onShow(): Event<void> {
-		return this._onShow.event;
-	}
-
-	public get onHide(): Event<void> {
-		return this._onHide.event;
-	}
-
-	public navigate(next: boolean, quickNavigate?: IQuickNavigateConfiguration): void {
+	navigate(next: boolean, quickNavigate?: IQuickNavigateConfiguration): void {
 		if (this.quickOpenWidget) {
 			this.quickOpenWidget.navigate(next, quickNavigate);
 		}
@@ -160,11 +146,11 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		}
 	}
 
-	public pick(picks: TPromise<string[]>, options?: IPickOptions, token?: CancellationToken): TPromise<string>;
-	public pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options?: IPickOptions, token?: CancellationToken): TPromise<string>;
-	public pick(picks: string[], options?: IPickOptions, token?: CancellationToken): TPromise<string>;
-	public pick<T extends IPickOpenEntry>(picks: T[], options?: IPickOptions, token?: CancellationToken): TPromise<T>;
-	public pick(arg1: string[] | TPromise<string[]> | IPickOpenEntry[] | TPromise<IPickOpenEntry[]>, options?: IPickOptions, token?: CancellationToken): TPromise<string | IPickOpenEntry> {
+	pick(picks: TPromise<string[]>, options?: IStringPickOptions, token?: CancellationToken): TPromise<string>;
+	pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options?: ITypedPickOptions<T>, token?: CancellationToken): TPromise<string>;
+	pick(picks: string[], options?: IStringPickOptions, token?: CancellationToken): TPromise<string>;
+	pick<T extends IPickOpenEntry>(picks: T[], options?: ITypedPickOptions<T>, token?: CancellationToken): TPromise<T>;
+	pick(arg1: string[] | TPromise<string[]> | IPickOpenEntry[] | TPromise<IPickOpenEntry[]>, options?: IStringPickOptions | ITypedPickOptions<IPickOpenEntry>, token?: CancellationToken): TPromise<string | IPickOpenEntry> {
 		if (!options) {
 			options = Object.create(null);
 		}
@@ -195,13 +181,13 @@ export class QuickOpenController extends Component implements IQuickOpenService
 			this.pickOpenWidget.hide(HideReason.CANCELED);
 		}
 
-		return new TPromise<string | IPickOpenEntry>((resolve, reject, progress) => {
+		return new TPromise<string | IPickOpenEntry>((resolve, reject) => {
 
 			function onItem(item: IPickOpenEntry): string | IPickOpenEntry {
 				return item && isAboutStrings ? item.label : item;
 			}
 
-			this.doPick(entryPromise, options, token).then(item => resolve(onItem(item)), err => reject(err), item => progress(onItem(item)));
+			this.doPick(entryPromise, options, token).then(item => resolve(onItem(item)), err => reject(err));
 		});
 	}
 
@@ -217,7 +203,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 
 		// Create upon first open
 		if (!this.pickOpenWidget) {
-			this.pickOpenWidget = new QuickOpenWidget(
+			this.pickOpenWidget = this._register(new QuickOpenWidget(
 				document.getElementById(this.partService.getWorkbenchElementId()),
 				{
 					onOk: () => { /* ignore, handle later */ },
@@ -230,8 +216,8 @@ export class QuickOpenController extends Component implements IQuickOpenService
 					keyboardSupport: false,
 					treeCreator: (container, config, opts) => this.instantiationService.createInstance(WorkbenchTree, container, config, opts)
 				}
-			);
-			this.toUnbind.push(attachQuickOpenStyler(this.pickOpenWidget, this.themeService, { background: SIDE_BAR_BACKGROUND, foreground: SIDE_BAR_FOREGROUND }));
+			));
+			this._register(attachQuickOpenStyler(this.pickOpenWidget, this.themeService, { background: SIDE_BAR_BACKGROUND, foreground: SIDE_BAR_FOREGROUND }));
 
 			const pickOpenContainer = this.pickOpenWidget.create();
 			addClass(pickOpenContainer, 'show-file-icons');
@@ -263,7 +249,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 			this.pickOpenWidget.layout(this.layoutDimensions);
 		}
 
-		return new TPromise<IPickOpenEntry>((complete, error, progress) => {
+		return new TPromise<IPickOpenEntry>((complete, error) => {
 
 			// Detect cancellation while pick promise is loading
 			this.pickOpenWidget.setCallbacks({
@@ -294,7 +280,14 @@ export class QuickOpenController extends Component implements IQuickOpenService
 
 				// Model
 				const model = new QuickOpenModel([], new PickOpenActionProvider());
-				const entries = picks.map((e, index) => this.instantiationService.createInstance(PickOpenEntry, e, index, () => progress(e), () => this.pickOpenWidget.refresh()));
+				const entries = picks.map((e, index) => {
+					const onPreview = () => {
+						if (options.onDidFocus) {
+							options.onDidFocus(e);
+						}
+					};
+					return this.instantiationService.createInstance(PickOpenEntry, e, index, onPreview, () => this.pickOpenWidget.refresh());
+				});
 				if (picks.length === 0) {
 					entries.push(this.instantiationService.createInstance(PickOpenEntry, { label: nls.localize('emptyPicks', "There are no entries to pick from") }, 0, null, null));
 				}
@@ -414,7 +407,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		});
 	}
 
-	public accept(): void {
+	accept(): void {
 		[this.quickOpenWidget, this.pickOpenWidget].forEach(w => {
 			if (w && w.isVisible()) {
 				w.accept();
@@ -422,7 +415,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		});
 	}
 
-	public focus(): void {
+	focus(): void {
 		[this.quickOpenWidget, this.pickOpenWidget].forEach(w => {
 			if (w && w.isVisible()) {
 				w.focus();
@@ -430,7 +423,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		});
 	}
 
-	public close(): void {
+	close(): void {
 		[this.quickOpenWidget, this.pickOpenWidget].forEach(w => {
 			if (w && w.isVisible()) {
 				w.hide(HideReason.CANCELED);
@@ -446,7 +439,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		}
 	}
 
-	public show(prefix?: string, options?: IShowOptions): TPromise<void> {
+	show(prefix?: string, options?: IShowOptions): TPromise<void> {
 		let quickNavigateConfiguration = options ? options.quickNavigateConfiguration : void 0;
 		let inputSelection = options ? options.inputSelection : void 0;
 		let autoFocus = options ? options.autoFocus : void 0;
@@ -464,7 +457,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 
 		// Create upon first open
 		if (!this.quickOpenWidget) {
-			this.quickOpenWidget = new QuickOpenWidget(
+			this.quickOpenWidget = this._register(new QuickOpenWidget(
 				document.getElementById(this.partService.getWorkbenchElementId()),
 				{
 					onOk: () => { /* ignore */ },
@@ -478,8 +471,8 @@ export class QuickOpenController extends Component implements IQuickOpenService
 					keyboardSupport: false,
 					treeCreator: (container, config, opts) => this.instantiationService.createInstance(WorkbenchTree, container, config, opts)
 				}
-			);
-			this.toUnbind.push(attachQuickOpenStyler(this.quickOpenWidget, this.themeService, { background: SIDE_BAR_BACKGROUND, foreground: SIDE_BAR_FOREGROUND }));
+			));
+			this._register(attachQuickOpenStyler(this.quickOpenWidget, this.themeService, { background: SIDE_BAR_BACKGROUND, foreground: SIDE_BAR_FOREGROUND }));
 
 			const quickOpenContainer = this.quickOpenWidget.create();
 			addClass(quickOpenContainer, 'show-file-icons');
@@ -557,14 +550,12 @@ export class QuickOpenController extends Component implements IQuickOpenService
 
 			// Pass to handlers
 			for (let prefix in this.mapResolvedHandlersToPrefix) {
-				if (this.mapResolvedHandlersToPrefix.hasOwnProperty(prefix)) {
-					const promise = this.mapResolvedHandlersToPrefix[prefix];
-					promise.then(handler => {
-						this.handlerOnOpenCalled[prefix] = false;
+				const promise = this.mapResolvedHandlersToPrefix[prefix];
+				promise.then(handler => {
+					this.handlerOnOpenCalled[prefix] = false;
 
-						handler.onClose(reason === HideReason.CANCELED); // Don't check if onOpen was called to preserve old behaviour for now
-					});
-				}
+					handler.onClose(reason === HideReason.CANCELED); // Don't check if onOpen was called to preserve old behaviour for now
+				});
 			}
 
 			// Complete promises that are waiting
@@ -879,7 +870,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		return this.mapResolvedHandlersToPrefix[id] = TPromise.as(handler.instantiate(this.instantiationService));
 	}
 
-	public layout(dimension: Dimension): void {
+	layout(dimension: Dimension): void {
 		this.layoutDimensions = dimension;
 		if (this.quickOpenWidget) {
 			this.quickOpenWidget.layout(this.layoutDimensions);
@@ -889,18 +880,6 @@ export class QuickOpenController extends Component implements IQuickOpenService
 			this.pickOpenWidget.layout(this.layoutDimensions);
 		}
 	}
-
-	public dispose(): void {
-		if (this.quickOpenWidget) {
-			this.quickOpenWidget.dispose();
-		}
-
-		if (this.pickOpenWidget) {
-			this.pickOpenWidget.dispose();
-		}
-
-		super.dispose();
-	}
 }
 
 class PlaceholderQuickOpenEntry extends QuickOpenEntryGroup {
@@ -912,7 +891,7 @@ class PlaceholderQuickOpenEntry extends QuickOpenEntryGroup {
 		this.placeHolderLabel = placeHolderLabel;
 	}
 
-	public getLabel(): string {
+	getLabel(): string {
 		return this.placeHolderLabel;
 	}
 }
@@ -961,7 +940,7 @@ class PickOpenEntry extends PlaceholderQuickOpenEntry implements IPickOpenItem {
 		this.fileKind = fileItem.fileKind;
 	}
 
-	public matchesFuzzy(query: string, options: IInternalPickOptions): { labelHighlights: IMatch[], descriptionHighlights: IMatch[], detailHighlights: IMatch[] } {
+	matchesFuzzy(query: string, options: IInternalPickOptions): { labelHighlights: IMatch[], descriptionHighlights: IMatch[], detailHighlights: IMatch[] } {
 		if (!this.labelOcticons) {
 			this.labelOcticons = parseOcticons(this.getLabel()); // parse on demand
 		}
@@ -978,72 +957,72 @@ class PickOpenEntry extends PlaceholderQuickOpenEntry implements IPickOpenItem {
 		};
 	}
 
-	public getPayload(): any {
+	getPayload(): any {
 		return this.payload;
 	}
 
-	public remove(): void {
+	remove(): void {
 		super.setHidden(true);
 		this.removed = true;
 
 		this.onRemove();
 	}
 
-	public isHidden(): boolean {
+	isHidden(): boolean {
 		return this.removed || super.isHidden();
 	}
 
-	public get action(): IAction {
+	get action(): IAction {
 		return this._action;
 	}
 
-	public get index(): number {
+	get index(): number {
 		return this._index;
 	}
 
-	public getLabelOptions(): IIconLabelValueOptions {
+	getLabelOptions(): IIconLabelValueOptions {
 		return {
 			extraClasses: this.resource ? getIconClasses(this.modelService, this.modeService, this.resource, this.fileKind) : []
 		};
 	}
 
-	public get shouldRunWithContext(): IEntryRunContext {
+	get shouldRunWithContext(): IEntryRunContext {
 		return this._shouldRunWithContext;
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.description;
 	}
 
-	public getDetail(): string {
+	getDetail(): string {
 		return this.detail;
 	}
 
-	public getTooltip(): string {
+	getTooltip(): string {
 		return this.tooltip;
 	}
 
-	public getDescriptionTooltip(): string {
+	getDescriptionTooltip(): string {
 		return this.descriptionTooltip;
 	}
 
-	public showBorder(): boolean {
+	showBorder(): boolean {
 		return this.hasSeparator;
 	}
 
-	public getGroupLabel(): string {
+	getGroupLabel(): string {
 		return this.separatorLabel;
 	}
 
-	public shouldAlwaysShow(): boolean {
+	shouldAlwaysShow(): boolean {
 		return this.alwaysShow;
 	}
 
-	public getResource(): URI {
+	getResource(): URI {
 		return this.resource;
 	}
 
-	public run(mode: Mode, context: IEntryRunContext): boolean {
+	run(mode: Mode, context: IEntryRunContext): boolean {
 		if (mode === Mode.OPEN) {
 			this._shouldRunWithContext = context;
 
@@ -1059,23 +1038,23 @@ class PickOpenEntry extends PlaceholderQuickOpenEntry implements IPickOpenItem {
 }
 
 class PickOpenActionProvider implements IActionProvider {
-	public hasActions(tree: ITree, element: PickOpenEntry): boolean {
+	hasActions(tree: ITree, element: PickOpenEntry): boolean {
 		return !!element.action;
 	}
 
-	public getActions(tree: ITree, element: PickOpenEntry): TPromise<IAction[]> {
+	getActions(tree: ITree, element: PickOpenEntry): TPromise<IAction[]> {
 		return TPromise.as(element.action ? [element.action] : []);
 	}
 
-	public hasSecondaryActions(tree: ITree, element: PickOpenEntry): boolean {
+	hasSecondaryActions(tree: ITree, element: PickOpenEntry): boolean {
 		return false;
 	}
 
-	public getSecondaryActions(tree: ITree, element: PickOpenEntry): TPromise<IAction[]> {
+	getSecondaryActions(tree: ITree, element: PickOpenEntry): TPromise<IAction[]> {
 		return TPromise.as([]);
 	}
 
-	public getActionItem(tree: ITree, element: PickOpenEntry, action: Action): BaseActionItem {
+	getActionItem(tree: ITree, element: PickOpenEntry, action: Action): BaseActionItem {
 		return null;
 	}
 }
@@ -1091,7 +1070,7 @@ class EditorHistoryHandler {
 		this.scorerCache = Object.create(null);
 	}
 
-	public getResults(searchValue?: string): QuickOpenEntry[] {
+	getResults(searchValue?: string): QuickOpenEntry[] {
 
 		// Massage search for scoring
 		const query = prepareQuery(searchValue);
@@ -1146,7 +1125,7 @@ class EditorHistoryItemAccessorClass extends QuickOpenItemAccessorClass {
 		super();
 	}
 
-	public getItemDescription(entry: QuickOpenEntry): string {
+	getItemDescription(entry: QuickOpenEntry): string {
 		return this.allowMatchOnDescription ? entry.getDescription() : void 0;
 	}
 }
@@ -1198,37 +1177,37 @@ export class EditorHistoryEntry extends EditorQuickOpenEntry {
 		}
 	}
 
-	public getIcon(): string {
+	getIcon(): string {
 		return this.dirty ? 'dirty' : '';
 	}
 
-	public getLabel(): string {
+	getLabel(): string {
 		return this.label;
 	}
 
-	public getLabelOptions(): IIconLabelValueOptions {
+	getLabelOptions(): IIconLabelValueOptions {
 		return {
 			extraClasses: getIconClasses(this.modelService, this.modeService, this.resource)
 		};
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return nls.localize('entryAriaLabel', "{0}, recently opened", this.getLabel());
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.description;
 	}
 
-	public getResource(): URI {
+	getResource(): URI {
 		return this.resource;
 	}
 
-	public getInput(): IEditorInput | IResourceInput {
+	getInput(): IEditorInput | IResourceInput {
 		return this.input;
 	}
 
-	public run(mode: Mode, context: IEntryRunContext): boolean {
+	run(mode: Mode, context: IEntryRunContext): boolean {
 		if (mode === Mode.OPEN) {
 			const sideBySide = !context.quickNavigateConfiguration && (context.keymods.alt || context.keymods.ctrlCmd);
 			const pinned = !this.configurationService.getValue<IWorkbenchEditorConfiguration>().workbench.editor.enablePreviewFromQuickOpen || context.keymods.alt;
@@ -1260,8 +1239,8 @@ function resourceForEditorHistory(input: EditorInput, fileService: IFileService)
 
 export class RemoveFromEditorHistoryAction extends Action {
 
-	public static readonly ID = 'workbench.action.removeFromEditorHistory';
-	public static readonly LABEL = nls.localize('removeFromEditorHistory', "Remove From History");
+	static readonly ID = 'workbench.action.removeFromEditorHistory';
+	static readonly LABEL = nls.localize('removeFromEditorHistory', "Remove From History");
 
 	constructor(
 		id: string,
@@ -1273,7 +1252,7 @@ export class RemoveFromEditorHistoryAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		interface IHistoryPickEntry extends IFilePickOpenEntry {
 			input: IEditorInput | IResourceInput;
 		}
diff --git a/src/vs/workbench/browser/parts/quickopen/quickopen.ts b/src/vs/workbench/browser/parts/quickopen/quickopen.ts
index a13daae1be5..f0a4175911d 100644
--- a/src/vs/workbench/browser/parts/quickopen/quickopen.ts
+++ b/src/vs/workbench/browser/parts/quickopen/quickopen.ts
@@ -53,7 +53,7 @@ export class BaseQuickOpenNavigateAction extends Action {
 		super(id, label);
 	}
 
-	public run(event?: any): TPromise<any> {
+	run(event?: any): TPromise<any> {
 		const keys = this.keybindingService.lookupKeybindings(this.id);
 		const quickNavigate = this.quickNavigate ? { keybindings: keys } : void 0;
 
@@ -80,8 +80,8 @@ export function getQuickNavigateHandler(id: string, next?: boolean): ICommandHan
 
 export class QuickOpenNavigateNextAction extends BaseQuickOpenNavigateAction {
 
-	public static readonly ID = 'workbench.action.quickOpenNavigateNext';
-	public static readonly LABEL = nls.localize('quickNavigateNext', "Navigate Next in Quick Open");
+	static readonly ID = 'workbench.action.quickOpenNavigateNext';
+	static readonly LABEL = nls.localize('quickNavigateNext', "Navigate Next in Quick Open");
 
 	constructor(
 		id: string,
@@ -96,8 +96,8 @@ export class QuickOpenNavigateNextAction extends BaseQuickOpenNavigateAction {
 
 export class QuickOpenNavigatePreviousAction extends BaseQuickOpenNavigateAction {
 
-	public static readonly ID = 'workbench.action.quickOpenNavigatePrevious';
-	public static readonly LABEL = nls.localize('quickNavigatePrevious', "Navigate Previous in Quick Open");
+	static readonly ID = 'workbench.action.quickOpenNavigatePrevious';
+	static readonly LABEL = nls.localize('quickNavigatePrevious', "Navigate Previous in Quick Open");
 
 	constructor(
 		id: string,
@@ -112,8 +112,8 @@ export class QuickOpenNavigatePreviousAction extends BaseQuickOpenNavigateAction
 
 export class QuickOpenSelectNextAction extends BaseQuickOpenNavigateAction {
 
-	public static readonly ID = 'workbench.action.quickOpenSelectNext';
-	public static readonly LABEL = nls.localize('quickSelectNext', "Select Next in Quick Open");
+	static readonly ID = 'workbench.action.quickOpenSelectNext';
+	static readonly LABEL = nls.localize('quickSelectNext', "Select Next in Quick Open");
 
 	constructor(
 		id: string,
@@ -128,8 +128,8 @@ export class QuickOpenSelectNextAction extends BaseQuickOpenNavigateAction {
 
 export class QuickOpenSelectPreviousAction extends BaseQuickOpenNavigateAction {
 
-	public static readonly ID = 'workbench.action.quickOpenSelectPrevious';
-	public static readonly LABEL = nls.localize('quickSelectPrevious', "Select Previous in Quick Open");
+	static readonly ID = 'workbench.action.quickOpenSelectPrevious';
+	static readonly LABEL = nls.localize('quickSelectPrevious', "Select Previous in Quick Open");
 
 	constructor(
 		id: string,
diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
index d4826a2b8f6..88e7acb9c01 100644
--- a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
+++ b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
@@ -32,9 +32,7 @@ import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 
 export class SidebarPart extends CompositePart<Viewlet> {
 
-	public static readonly activeViewletSettingsKey = 'workbench.sidebar.activeviewletid';
-
-	public _serviceBrand: any;
+	static readonly activeViewletSettingsKey = 'workbench.sidebar.activeviewletid';
 
 	private blockOpeningViewlet: boolean;
 
@@ -69,22 +67,22 @@ export class SidebarPart extends CompositePart<Viewlet> {
 		);
 	}
 
-	public get onDidViewletOpen(): Event<IViewlet> {
+	get onDidViewletOpen(): Event<IViewlet> {
 		return this._onDidCompositeOpen.event as Event<IViewlet>;
 	}
 
-	public get onDidViewletClose(): Event<IViewlet> {
+	get onDidViewletClose(): Event<IViewlet> {
 		return this._onDidCompositeClose.event as Event<IViewlet>;
 	}
 
-	public createTitleArea(parent: HTMLElement): HTMLElement {
+	createTitleArea(parent: HTMLElement): HTMLElement {
 		const titleArea = super.createTitleArea(parent);
-		$(titleArea).on(EventType.CONTEXT_MENU, (e: MouseEvent) => this.onTitleAreaContextMenu(new StandardMouseEvent(e)));
+		$(titleArea).on(EventType.CONTEXT_MENU, (e: MouseEvent) => this.onTitleAreaContextMenu(new StandardMouseEvent(e)), this.toDispose);
 
 		return titleArea;
 	}
 
-	public updateStyles(): void {
+	updateStyles(): void {
 		super.updateStyles();
 
 		// Part container
@@ -103,7 +101,7 @@ export class SidebarPart extends CompositePart<Viewlet> {
 		container.style('border-left-color', !isPositionLeft ? borderColor : null);
 	}
 
-	public openViewlet(id: string, focus?: boolean): TPromise<Viewlet> {
+	openViewlet(id: string, focus?: boolean): TPromise<Viewlet> {
 		if (this.blockOpeningViewlet) {
 			return TPromise.as(null); // Workaround against a potential race condition
 		}
@@ -122,19 +120,19 @@ export class SidebarPart extends CompositePart<Viewlet> {
 		return promise.then(() => this.openComposite(id, focus)) as TPromise<Viewlet>;
 	}
 
-	public getActiveViewlet(): IViewlet {
+	getActiveViewlet(): IViewlet {
 		return <IViewlet>this.getActiveComposite();
 	}
 
-	public getLastActiveViewletId(): string {
+	getLastActiveViewletId(): string {
 		return this.getLastActiveCompositetId();
 	}
 
-	public hideActiveViewlet(): TPromise<void> {
+	hideActiveViewlet(): TPromise<void> {
 		return this.hideActiveComposite().then(composite => void 0);
 	}
 
-	public layout(dimension: Dimension): Dimension[] {
+	layout(dimension: Dimension): Dimension[] {
 		if (!this.partService.isVisible(Parts.SIDEBAR_PART)) {
 			return [dimension];
 		}
@@ -162,8 +160,8 @@ export class SidebarPart extends CompositePart<Viewlet> {
 
 class FocusSideBarAction extends Action {
 
-	public static readonly ID = 'workbench.action.focusSideBar';
-	public static readonly LABEL = nls.localize('focusSideBar', "Focus into Side Bar");
+	static readonly ID = 'workbench.action.focusSideBar';
+	static readonly LABEL = nls.localize('focusSideBar', "Focus into Side Bar");
 
 	constructor(
 		id: string,
@@ -174,7 +172,7 @@ class FocusSideBarAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 
 		// Show side bar
 		if (!this.partService.isVisible(Parts.SIDEBAR_PART)) {
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbar.ts b/src/vs/workbench/browser/parts/statusbar/statusbar.ts
index d46fd03dc31..259eb702089 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbar.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbar.ts
@@ -17,10 +17,9 @@ export interface IStatusbarItem {
 export import StatusbarAlignment = statusbarService.StatusbarAlignment;
 
 export class StatusbarItemDescriptor {
-
-	public syncDescriptor: SyncDescriptor0<IStatusbarItem>;
-	public alignment: StatusbarAlignment;
-	public priority: number;
+	syncDescriptor: SyncDescriptor0<IStatusbarItem>;
+	alignment: StatusbarAlignment;
+	priority: number;
 
 	constructor(ctor: IConstructorSignature0<IStatusbarItem>, alignment?: StatusbarAlignment, priority?: number) {
 		this.syncDescriptor = createSyncDescriptor(ctor);
@@ -42,11 +41,11 @@ class StatusbarRegistry implements IStatusbarRegistry {
 		this._items = [];
 	}
 
-	public get items(): StatusbarItemDescriptor[] {
+	get items(): StatusbarItemDescriptor[] {
 		return this._items;
 	}
 
-	public registerStatusbarItem(descriptor: StatusbarItemDescriptor): void {
+	registerStatusbarItem(descriptor: StatusbarItemDescriptor): void {
 		this._items.push(descriptor);
 	}
 }
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index beebc378ade..226ccc2b80d 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -33,7 +33,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 
 export class StatusbarPart extends Part implements IStatusbarService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private static readonly PRIORITY_PROP = 'priority';
 	private static readonly ALIGNMENT_PROP = 'alignment';
@@ -55,10 +55,10 @@ export class StatusbarPart extends Part implements IStatusbarService {
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.contextService.onDidChangeWorkbenchState(() => this.updateStyles()));
+		this._register(this.contextService.onDidChangeWorkbenchState(() => this.updateStyles()));
 	}
 
-	public addEntry(entry: IStatusbarEntry, alignment: StatusbarAlignment, priority: number = 0): IDisposable {
+	addEntry(entry: IStatusbarEntry, alignment: StatusbarAlignment, priority: number = 0): IDisposable {
 
 		// Render entry in status bar
 		const el = this.doCreateStatusItem(alignment, priority, entry.showBeak ? 'has-beak' : void 0);
@@ -112,7 +112,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 		return entries;
 	}
 
-	public createContentArea(parent: HTMLElement): HTMLElement {
+	createContentArea(parent: HTMLElement): HTMLElement {
 		this.statusItemsContainer = parent;
 
 		// Fill in initial items that were contributed from the registry
@@ -122,16 +122,13 @@ export class StatusbarPart extends Part implements IStatusbarService {
 		const rightDescriptors = registry.items.filter(d => d.alignment === StatusbarAlignment.RIGHT).sort((a, b) => a.priority - b.priority);
 
 		const descriptors = rightDescriptors.concat(leftDescriptors); // right first because they float
-
-		this.toUnbind.push(...descriptors.map(descriptor => {
+		descriptors.forEach(descriptor => {
 			const item = this.instantiationService.createInstance(descriptor.syncDescriptor);
 			const el = this.doCreateStatusItem(descriptor.alignment, descriptor.priority);
 
-			const dispose = item.render(el);
+			this._register(item.render(el));
 			this.statusItemsContainer.appendChild(el);
-
-			return dispose;
-		}));
+		});
 
 		return this.statusItemsContainer;
 	}
@@ -179,7 +176,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 		return el;
 	}
 
-	public setStatusMessage(message: string, autoDisposeAfter: number = -1, delayBy: number = 0): IDisposable {
+	setStatusMessage(message: string, autoDisposeAfter: number = -1, delayBy: number = 0): IDisposable {
 		if (this.statusMsgDispose) {
 			this.statusMsgDispose.dispose(); // dismiss any previous
 		}
@@ -238,7 +235,7 @@ class StatusBarEntryItem implements IStatusbarItem {
 		}
 	}
 
-	public render(el: HTMLElement): IDisposable {
+	render(el: HTMLElement): IDisposable {
 		let toDispose: IDisposable[] = [];
 		addClass(el, 'statusbar-entry');
 
@@ -324,7 +321,7 @@ class ManageExtensionAction extends Action {
 		super('statusbar.manage.extension', nls.localize('manageExtension', "Manage Extension"));
 	}
 
-	public run(extensionId: string): TPromise<any> {
+	run(extensionId: string): TPromise<any> {
 		return this.commandService.executeCommand('_extensions.manage', extensionId);
 	}
 }
diff --git a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
index 770803a9a34..a8330e6fc88 100644
--- a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
+++ b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
@@ -45,7 +45,7 @@
 	position: absolute;
 	top: 0;
 	width: 100%;
-	height: 1px;
+	height: 20%;
 }
 
 .monaco-workbench.windows > .part.titlebar > .window-title,
@@ -82,16 +82,15 @@
 .monaco-workbench > .part.titlebar > .window-controls-container > .window-icon {
 	display: inline-block;
 	-webkit-app-region: no-drag;
-	-webkit-transition: background-color .2s;
-	transition: background-color .2s;
+	-webkit-transition: background-color .1s;
+	transition: background-color .1s;
 	height: 100%;
 	width: 33.34%;
-	background-size: 20%;
+	background-size: 21.74%;
 	background-position: center center;
 	background-repeat: no-repeat;
 }
 
-
 .monaco-workbench > .part.titlebar > .window-controls-container > .window-icon svg {
 	shape-rendering: crispEdges;
 	text-align: center;
diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
index 7619cce8d02..d7112d84a45 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -31,12 +31,12 @@ import { isMacintosh, isWindows, isLinux } from 'vs/base/common/platform';
 import URI from 'vs/base/common/uri';
 import { Color } from 'vs/base/common/color';
 import { trim } from 'vs/base/common/strings';
-import { addDisposableListener, EventType, EventHelper, Dimension, addClass, removeClass } from 'vs/base/browser/dom';
+import { addDisposableListener, EventType, EventHelper, Dimension } from 'vs/base/browser/dom';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 
 export class TitlebarPart extends Part implements ITitleService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private static readonly NLS_UNSUPPORTED = nls.localize('patchedWindowTitle', "[Unsupported]");
 	private static readonly NLS_USER_IS_ADMIN = isWindows ? nls.localize('userIsAdmin', "[Administrator]") : nls.localize('userIsSudo', "[Superuser]");
@@ -47,6 +47,7 @@ export class TitlebarPart extends Part implements ITitleService {
 	private titleContainer: Builder;
 	private title: Builder;
 	private windowControls: Builder;
+	private maxRestoreControl: Builder;
 	private appIcon: Builder;
 
 	private pendingTitle: string;
@@ -87,14 +88,14 @@ export class TitlebarPart extends Part implements ITitleService {
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(addDisposableListener(window, EventType.BLUR, () => this.onBlur()));
-		this.toUnbind.push(addDisposableListener(window, EventType.FOCUS, () => this.onFocus()));
-		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChanged(e)));
-		this.toUnbind.push(this.editorService.onDidActiveEditorChange(() => this.onActiveEditorChange()));
-		this.toUnbind.push(this.contextService.onDidChangeWorkspaceFolders(() => this.setTitle(this.getWindowTitle())));
-		this.toUnbind.push(this.contextService.onDidChangeWorkbenchState(() => this.setTitle(this.getWindowTitle())));
-		this.toUnbind.push(this.contextService.onDidChangeWorkspaceName(() => this.setTitle(this.getWindowTitle())));
-		this.toUnbind.push(this.partService.onMenubarVisibilityChange(this.onMenubarVisibilityChanged, this));
+		this._register(addDisposableListener(window, EventType.BLUR, () => this.onBlur()));
+		this._register(addDisposableListener(window, EventType.FOCUS, () => this.onFocus()));
+		this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChanged(e)));
+		this._register(this.editorService.onDidActiveEditorChange(() => this.onActiveEditorChange()));
+		this._register(this.contextService.onDidChangeWorkspaceFolders(() => this.setTitle(this.getWindowTitle())));
+		this._register(this.contextService.onDidChangeWorkbenchState(() => this.setTitle(this.getWindowTitle())));
+		this._register(this.contextService.onDidChangeWorkspaceName(() => this.setTitle(this.getWindowTitle())));
+		this._register(this.partService.onMenubarVisibilityChange(this.onMenubarVisibilityChanged, this));
 	}
 
 	private onBlur(): void {
@@ -177,7 +178,7 @@ export class TitlebarPart extends Part implements ITitleService {
 		return title;
 	}
 
-	public updateProperties(properties: ITitleProperties): void {
+	updateProperties(properties: ITitleProperties): void {
 		const isAdmin = typeof properties.isAdmin === 'boolean' ? properties.isAdmin : this.properties.isAdmin;
 		const isPure = typeof properties.isPure === 'boolean' ? properties.isPure : this.properties.isPure;
 
@@ -246,7 +247,7 @@ export class TitlebarPart extends Part implements ITitleService {
 		});
 	}
 
-	public createContentArea(parent: HTMLElement): HTMLElement {
+	createContentArea(parent: HTMLElement): HTMLElement {
 		this.titleContainer = $(parent);
 
 		// App Icon (Windows/Linux)
@@ -258,9 +259,6 @@ export class TitlebarPart extends Part implements ITitleService {
 
 				this.windowService.closeWindow().then(null, errors.onUnexpectedError);
 			});
-
-			// Resizer
-			$(this.titleContainer).div({ class: 'resizer' });
 		}
 
 		// Title
@@ -297,7 +295,7 @@ export class TitlebarPart extends Part implements ITitleService {
 			});
 
 			// Restore
-			$(this.windowControls).div({ class: 'window-icon window-max-restore' }).on(EventType.CLICK, () => {
+			this.maxRestoreControl = $(this.windowControls).div({ class: 'window-icon window-max-restore' }).on(EventType.CLICK, () => {
 				this.windowService.isMaximized().then((maximized) => {
 					if (maximized) {
 						return this.windowService.unmaximizeWindow();
@@ -315,6 +313,9 @@ export class TitlebarPart extends Part implements ITitleService {
 			const isMaximized = this.windowService.getConfiguration().maximized ? true : false;
 			this.onDidChangeMaximized(isMaximized);
 			this.windowService.onDidChangeMaximize(this.onDidChangeMaximized, this);
+
+			// Resizer
+			$(this.titleContainer).div({ class: 'resizer' });
 		}
 
 		// Since the title area is used to drag the window, we do not want to steal focus from the
@@ -332,17 +333,16 @@ export class TitlebarPart extends Part implements ITitleService {
 	}
 
 	private onDidChangeMaximized(maximized: boolean) {
-		const element = $(this.titleContainer).getHTMLElement().querySelector('.window-max-restore') as HTMLElement;
-		if (!element) {
+		if (!this.maxRestoreControl) {
 			return;
 		}
 
 		if (maximized) {
-			removeClass(element, 'window-maximize');
-			addClass(element, 'window-unmaximize');
+			this.maxRestoreControl.removeClass('window-maximize');
+			this.maxRestoreControl.addClass('window-unmaximize');
 		} else {
-			removeClass(element, 'window-unmaximize');
-			addClass(element, 'window-maximize');
+			this.maxRestoreControl.removeClass('window-unmaximize');
+			this.maxRestoreControl.addClass('window-maximize');
 		}
 	}
 
@@ -417,7 +417,7 @@ export class TitlebarPart extends Part implements ITitleService {
 		return actions;
 	}
 
-	public setTitle(title: string): void {
+	setTitle(title: string): void {
 
 		// Always set the native window title to identify us properly to the OS
 		window.document.title = title;
@@ -506,8 +506,7 @@ export class TitlebarPart extends Part implements ITitleService {
 		}
 	}
 
-	public layout(dimension: Dimension): Dimension[] {
-
+	layout(dimension: Dimension): Dimension[] {
 		this.updateLayout();
 
 		return super.layout(dimension);
@@ -520,7 +519,7 @@ class ShowItemInFolderAction extends Action {
 		super('showItemInFolder.action.id', label);
 	}
 
-	public run(): TPromise<void> {
+	run(): TPromise<void> {
 		return this.windowsService.showItemInFolder(this.path);
 	}
 }
diff --git a/src/vs/workbench/browser/parts/views/customView.ts b/src/vs/workbench/browser/parts/views/customView.ts
index 1de55d78e61..54306015001 100644
--- a/src/vs/workbench/browser/parts/views/customView.ts
+++ b/src/vs/workbench/browser/parts/views/customView.ts
@@ -5,7 +5,7 @@
 
 import 'vs/css!./media/views';
 import { Event, Emitter } from 'vs/base/common/event';
-import { IDisposable, dispose, empty as EmptyDisposable, toDisposable, Disposable } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, Disposable, toDisposable } from 'vs/base/common/lifecycle';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IAction, IActionItem, ActionRunner } from 'vs/base/common/actions';
@@ -109,7 +109,7 @@ export class CustomTreeViewPanel extends ViewletPanel {
 class TitleMenus implements IDisposable {
 
 	private disposables: IDisposable[] = [];
-	private titleDisposable: IDisposable = EmptyDisposable;
+	private titleDisposable: IDisposable = Disposable.None;
 	private titleActions: IAction[] = [];
 	private titleSecondaryActions: IAction[] = [];
 
@@ -123,7 +123,7 @@ class TitleMenus implements IDisposable {
 	) {
 		if (this.titleDisposable) {
 			this.titleDisposable.dispose();
-			this.titleDisposable = EmptyDisposable;
+			this.titleDisposable = Disposable.None;
 		}
 
 		const _contextKeyService = this.contextKeyService.createScoped();
@@ -242,7 +242,12 @@ export class CustomTreeViewer extends Disposable implements ITreeViewer {
 		return this._hasIconForLeafNode;
 	}
 
+	get visible(): boolean {
+		return this.isVisible;
+	}
+
 	setVisibility(isVisible: boolean): void {
+		isVisible = !!isVisible;
 		if (this.isVisible === isVisible) {
 			return;
 		}
@@ -412,26 +417,26 @@ class TreeDataSource implements IDataSource {
 	) {
 	}
 
-	public getId(tree: ITree, node: ITreeItem): string {
+	getId(tree: ITree, node: ITreeItem): string {
 		return node.handle;
 	}
 
-	public hasChildren(tree: ITree, node: ITreeItem): boolean {
+	hasChildren(tree: ITree, node: ITreeItem): boolean {
 		return this.treeView.dataProvider && node.collapsibleState !== TreeItemCollapsibleState.None;
 	}
 
-	public getChildren(tree: ITree, node: ITreeItem): TPromise<any[]> {
+	getChildren(tree: ITree, node: ITreeItem): TPromise<any[]> {
 		if (this.treeView.dataProvider) {
 			return this.progressService.withProgress({ location: this.container }, () => this.treeView.dataProvider.getChildren(node));
 		}
 		return TPromise.as([]);
 	}
 
-	public shouldAutoexpand(tree: ITree, node: ITreeItem): boolean {
+	shouldAutoexpand(tree: ITree, node: ITreeItem): boolean {
 		return node.collapsibleState === TreeItemCollapsibleState.Expanded;
 	}
 
-	public getParent(tree: ITree, node: any): TPromise<any> {
+	getParent(tree: ITree, node: any): TPromise<any> {
 		return TPromise.as(null);
 	}
 }
@@ -458,15 +463,15 @@ class TreeRenderer implements IRenderer {
 	) {
 	}
 
-	public getHeight(tree: ITree, element: any): number {
+	getHeight(tree: ITree, element: any): number {
 		return TreeRenderer.ITEM_HEIGHT;
 	}
 
-	public getTemplateId(tree: ITree, element: any): string {
+	getTemplateId(tree: ITree, element: any): string {
 		return TreeRenderer.TREE_TEMPLATE_ID;
 	}
 
-	public renderTemplate(tree: ITree, templateId: string, container: HTMLElement): ITreeExplorerTemplateData {
+	renderTemplate(tree: ITree, templateId: string, container: HTMLElement): ITreeExplorerTemplateData {
 		DOM.addClass(container, 'custom-view-tree-node-item');
 
 		const icon = DOM.append(container, DOM.$('.custom-view-tree-node-item-icon'));
@@ -481,7 +486,7 @@ class TreeRenderer implements IRenderer {
 		return { label, resourceLabel, icon, actionBar, aligner: new Aligner(container, tree, this.themeService) };
 	}
 
-	public renderElement(tree: ITree, node: ITreeItem, templateId: string, templateData: ITreeExplorerTemplateData): void {
+	renderElement(tree: ITree, node: ITreeItem, templateId: string, templateData: ITreeExplorerTemplateData): void {
 		const resource = node.resourceUri ? URI.revive(node.resourceUri) : null;
 		const label = node.label ? node.label : resource ? basename(resource.path) : '';
 		const icon = this.themeService.getTheme().type === LIGHT ? node.icon : node.iconDark;
@@ -523,7 +528,7 @@ class TreeRenderer implements IRenderer {
 		return node.collapsibleState === TreeItemCollapsibleState.Collapsed || node.collapsibleState === TreeItemCollapsibleState.Expanded ? FileKind.FOLDER : FileKind.FILE;
 	}
 
-	public disposeTemplate(tree: ITree, templateId: string, templateData: ITreeExplorerTemplateData): void {
+	disposeTemplate(tree: ITree, templateId: string, templateData: ITreeExplorerTemplateData): void {
 		templateData.resourceLabel.dispose();
 		templateData.actionBar.dispose();
 		templateData.aligner.dispose();
@@ -602,7 +607,7 @@ class TreeController extends WorkbenchTreeController {
 		return element.command ? this.isClickOnTwistie(event) : super.shouldToggleExpansion(element, event, origin);
 	}
 
-	public onContextMenu(tree: ITree, node: ITreeItem, event: ContextMenuEvent): boolean {
+	onContextMenu(tree: ITree, node: ITreeItem, event: ContextMenuEvent): boolean {
 		event.preventDefault();
 		event.stopPropagation();
 
diff --git a/src/vs/workbench/browser/parts/views/panelViewlet.ts b/src/vs/workbench/browser/parts/views/panelViewlet.ts
index f8c1b05ffa2..8bfdfdae01c 100644
--- a/src/vs/workbench/browser/parts/views/panelViewlet.ts
+++ b/src/vs/workbench/browser/parts/views/panelViewlet.ts
@@ -52,7 +52,7 @@ export abstract class ViewletPanel extends Panel implements IView {
 	private _onDidBlur = new Emitter<void>();
 	readonly onDidBlur: Event<void> = this._onDidBlur.event;
 
-	private _onDidChangeTitleArea = new Emitter<void>();
+	protected _onDidChangeTitleArea = new Emitter<void>();
 	readonly onDidChangeTitleArea: Event<void> = this._onDidChangeTitleArea.event;
 
 	private _isVisible: boolean;
@@ -207,12 +207,12 @@ export class PanelViewlet extends Viewlet {
 		super(id, partService, telemetryService, themeService);
 	}
 
-	async create(parent: HTMLElement): TPromise<void> {
-		super.create(parent);
-
-		this.panelview = this._register(new PanelView(parent, this.options));
-		this._register(this.panelview.onDidDrop(({ from, to }) => this.movePanel(from as ViewletPanel, to as ViewletPanel)));
-		this._register(addDisposableListener(parent, EventType.CONTEXT_MENU, (e: MouseEvent) => this.showContextMenu(new StandardMouseEvent(e))));
+	create(parent: HTMLElement): TPromise<void> {
+		return super.create(parent).then(() => {
+			this.panelview = this._register(new PanelView(parent, this.options));
+			this._register(this.panelview.onDidDrop(({ from, to }) => this.movePanel(from as ViewletPanel, to as ViewletPanel)));
+			this._register(addDisposableListener(parent, EventType.CONTEXT_MENU, (e: MouseEvent) => this.showContextMenu(new StandardMouseEvent(e))));
+		});
 	}
 
 	private showContextMenu(event: StandardMouseEvent): void {
diff --git a/src/vs/workbench/browser/parts/views/views.ts b/src/vs/workbench/browser/parts/views/views.ts
index 217543d55d0..612b59f257f 100644
--- a/src/vs/workbench/browser/parts/views/views.ts
+++ b/src/vs/workbench/browser/parts/views/views.ts
@@ -421,8 +421,8 @@ export class PersistentContributableViewsModel extends ContributableViewsModel {
 		this.storageService = storageService;
 		this.contextService = contextService;
 
-		this._register(this.onDidAdd(() => this.saveVisibilityStates()));
-		this._register(this.onDidRemove(() => this.saveVisibilityStates()));
+		this._register(this.onDidAdd(viewDescriptorRefs => this.saveVisibilityStates(viewDescriptorRefs.map(r => r.viewDescriptor))));
+		this._register(this.onDidRemove(viewDescriptorRefs => this.saveVisibilityStates(viewDescriptorRefs.map(r => r.viewDescriptor))));
 	}
 
 	saveViewsStates(): void {
@@ -436,9 +436,9 @@ export class PersistentContributableViewsModel extends ContributableViewsModel {
 		this.storageService.store(this.viewletStateStorageId, JSON.stringify(storedViewsStates), this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? StorageScope.WORKSPACE : StorageScope.GLOBAL);
 	}
 
-	private saveVisibilityStates(): void {
-		const storedViewsVisibilityStates: { id: string, isHidden: boolean }[] = [];
-		for (const viewDescriptor of this.viewDescriptors) {
+	private saveVisibilityStates(viewDescriptors: IViewDescriptor[]): void {
+		const storedViewsVisibilityStates = PersistentContributableViewsModel.loadViewsVisibilityState(this.hiddenViewsStorageId, this.storageService, this.contextService);
+		for (const viewDescriptor of viewDescriptors) {
 			if (viewDescriptor.canToggleVisibility) {
 				const viewState = this.viewStates.get(viewDescriptor.id);
 				storedViewsVisibilityStates.push({ id: viewDescriptor.id, isHidden: viewState ? !viewState.visible : void 0 });
@@ -450,8 +450,7 @@ export class PersistentContributableViewsModel extends ContributableViewsModel {
 	private static loadViewsStates(viewletStateStorageId: string, hiddenViewsStorageId: string, storageService: IStorageService, contextService: IWorkspaceContextService): Map<string, IViewState> {
 		const viewStates = new Map<string, IViewState>();
 		const storedViewsStates = JSON.parse(storageService.get(viewletStateStorageId, contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? StorageScope.WORKSPACE : StorageScope.GLOBAL, '{}'));
-		const storedVisibilityStates = <Array<string | { id: string, isHidden: boolean }>>JSON.parse(storageService.get(hiddenViewsStorageId, StorageScope.GLOBAL, '[]'));
-		const viewsVisibilityStates = <{ id: string, isHidden: boolean }[]>storedVisibilityStates.map(c => typeof c === 'string' /* migration */ ? { id: c, isHidden: true } : c);
+		const viewsVisibilityStates = PersistentContributableViewsModel.loadViewsVisibilityState(hiddenViewsStorageId, storageService, contextService);
 		for (const { id, isHidden } of viewsVisibilityStates) {
 			const viewState = storedViewsStates[id];
 			if (viewState) {
@@ -469,6 +468,11 @@ export class PersistentContributableViewsModel extends ContributableViewsModel {
 		return viewStates;
 	}
 
+	private static loadViewsVisibilityState(hiddenViewsStorageId: string, storageService: IStorageService, contextService: IWorkspaceContextService): { id: string, isHidden: boolean }[] {
+		const storedVisibilityStates = <Array<string | { id: string, isHidden: boolean }>>JSON.parse(storageService.get(hiddenViewsStorageId, StorageScope.GLOBAL, '[]'));
+		return <{ id: string, isHidden: boolean }[]>storedVisibilityStates.map(c => typeof c === 'string' /* migration */ ? { id: c, isHidden: true } : c);
+	}
+
 	dispose(): void {
 		this.saveViewsStates();
 		super.dispose();
diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts
index e930b4be1fb..183b36edfb6 100644
--- a/src/vs/workbench/browser/parts/views/viewsViewlet.ts
+++ b/src/vs/workbench/browser/parts/views/viewsViewlet.ts
@@ -144,31 +144,31 @@ export abstract class ViewContainerViewlet extends PanelViewlet implements IView
 		this._register(toDisposable(() => this.viewDisposables = dispose(this.viewDisposables)));
 	}
 
-	async create(parent: HTMLElement): TPromise<void> {
-		await super.create(parent);
-
-		this._register(this.onDidSashChange(() => this.saveViewSizes()));
-		this.viewsModel.onDidAdd(added => this.onDidAddViews(added));
-		this.viewsModel.onDidRemove(removed => this.onDidRemoveViews(removed));
-		const addedViews: IAddedViewDescriptorRef[] = this.viewsModel.visibleViewDescriptors.map((viewDescriptor, index) => {
-			const size = this.viewsModel.getSize(viewDescriptor.id);
-			const collapsed = this.viewsModel.isCollapsed(viewDescriptor.id);
-			return ({ viewDescriptor, index, size, collapsed });
-		});
-		if (addedViews.length) {
-			this.onDidAddViews(addedViews);
-		}
-
-		// Update headers after and title contributed views after available, since we read from cache in the beginning to know if the viewlet has single view or not. Ref #29609
-		this.extensionService.whenInstalledExtensionsRegistered().then(() => {
-			this.areExtensionsReady = true;
-			if (this.panels.length) {
-				this.updateTitleArea();
-				this.updateViewHeaders();
+	create(parent: HTMLElement): TPromise<void> {
+		return super.create(parent).then(() => {
+			this._register(this.onDidSashChange(() => this.saveViewSizes()));
+			this.viewsModel.onDidAdd(added => this.onDidAddViews(added));
+			this.viewsModel.onDidRemove(removed => this.onDidRemoveViews(removed));
+			const addedViews: IAddedViewDescriptorRef[] = this.viewsModel.visibleViewDescriptors.map((viewDescriptor, index) => {
+				const size = this.viewsModel.getSize(viewDescriptor.id);
+				const collapsed = this.viewsModel.isCollapsed(viewDescriptor.id);
+				return ({ viewDescriptor, index, size, collapsed });
+			});
+			if (addedViews.length) {
+				this.onDidAddViews(addedViews);
 			}
-		});
 
-		this.focus();
+			// Update headers after and title contributed views after available, since we read from cache in the beginning to know if the viewlet has single view or not. Ref #29609
+			this.extensionService.whenInstalledExtensionsRegistered().then(() => {
+				this.areExtensionsReady = true;
+				if (this.panels.length) {
+					this.updateTitleArea();
+					this.updateViewHeaders();
+				}
+			});
+
+			this.focus();
+		});
 	}
 
 	getContextMenuActions(): IAction[] {
@@ -334,8 +334,16 @@ export abstract class ViewContainerViewlet extends PanelViewlet implements IView
 		});
 	}
 
-	private toggleViewVisibility(id: string): void {
-		this.viewsModel.setVisible(id, !this.viewsModel.isVisible(id));
+	private toggleViewVisibility(viewId: string): void {
+		const visible = !this.viewsModel.isVisible(viewId);
+		/* __GDPR__
+			"views.toggleVisibility" : {
+				"viewId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"visible": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
+		this.telemetryService.publicLog('views.toggledVisibility', { viewId, visible });
+		this.viewsModel.setVisible(viewId, visible);
 	}
 
 	private saveViewSizes(): void {
diff --git a/src/vs/workbench/browser/quickopen.ts b/src/vs/workbench/browser/quickopen.ts
index 407acc7b5d5..f942bae0e02 100644
--- a/src/vs/workbench/browser/quickopen.ts
+++ b/src/vs/workbench/browser/quickopen.ts
@@ -42,21 +42,21 @@ export class QuickOpenHandler {
 	 * As such, returning the same model instance across multiple searches will yield best
 	 * results in terms of performance when many items are shown.
 	 */
-	public getResults(searchValue: string): TPromise<IModel<any>> {
+	getResults(searchValue: string): TPromise<IModel<any>> {
 		return TPromise.as(null);
 	}
 
 	/**
 	 * The ARIA label to apply when this quick open handler is active in quick open.
 	 */
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return null;
 	}
 
 	/**
 	 * Extra CSS class name to add to the quick open widget to do custom styling of entries.
 	 */
-	public getClass(): string {
+	getClass(): string {
 		return null;
 	}
 
@@ -64,14 +64,14 @@ export class QuickOpenHandler {
 	 * Indicates if the handler can run in the current environment. Return a string if the handler cannot run but has
 	 * a good message to show in this case.
 	 */
-	public canRun(): boolean | string {
+	canRun(): boolean | string {
 		return true;
 	}
 
 	/**
 	 * Hints to the outside that this quick open handler typically returns results fast.
 	 */
-	public hasShortResponseTime(): boolean {
+	hasShortResponseTime(): boolean {
 		return false;
 	}
 
@@ -79,14 +79,14 @@ export class QuickOpenHandler {
 	 * Indicates if the handler wishes the quick open widget to automatically select the first result entry or an entry
 	 * based on a specific prefix match.
 	 */
-	public getAutoFocus(searchValue: string, context: { model: IModel<QuickOpenEntry>, quickNavigateConfiguration?: IQuickNavigateConfiguration }): IAutoFocus {
+	getAutoFocus(searchValue: string, context: { model: IModel<QuickOpenEntry>, quickNavigateConfiguration?: IQuickNavigateConfiguration }): IAutoFocus {
 		return {};
 	}
 
 	/**
 	 * Indicates to the handler that the quick open widget has been opened.
 	 */
-	public onOpen(): void {
+	onOpen(): void {
 		return;
 	}
 
@@ -94,21 +94,21 @@ export class QuickOpenHandler {
 	 * Indicates to the handler that the quick open widget has been closed. Allows to free up any resources as needed.
 	 * The parameter canceled indicates if the quick open widget was closed with an entry being run or not.
 	 */
-	public onClose(canceled: boolean): void {
+	onClose(canceled: boolean): void {
 		return;
 	}
 
 	/**
 	 * Allows to return a label that will be placed to the side of the results from this handler or null if none.
 	 */
-	public getGroupLabel(): string {
+	getGroupLabel(): string {
 		return null;
 	}
 
 	/**
 	 * Allows to return a label that will be used when there are no results found
 	 */
-	public getEmptyLabel(searchString: string): string {
+	getEmptyLabel(searchString: string): string {
 		if (searchString.length > 0) {
 			return nls.localize('noResultsMatching', "No results matching");
 		}
@@ -126,11 +126,11 @@ export interface QuickOpenHandlerHelpEntry {
  * A lightweight descriptor of a quick open handler.
  */
 export class QuickOpenHandlerDescriptor {
-	public prefix: string;
-	public description: string;
-	public contextKey: string;
-	public helpEntries: QuickOpenHandlerHelpEntry[];
-	public instantProgress: boolean;
+	prefix: string;
+	description: string;
+	contextKey: string;
+	helpEntries: QuickOpenHandlerHelpEntry[];
+	instantProgress: boolean;
 
 	private id: string;
 	private ctor: IConstructorSignature0<QuickOpenHandler>;
@@ -151,11 +151,11 @@ export class QuickOpenHandlerDescriptor {
 		}
 	}
 
-	public getId(): string {
+	getId(): string {
 		return this.id;
 	}
 
-	public instantiate(instantiationService: IInstantiationService): QuickOpenHandler {
+	instantiate(instantiationService: IInstantiationService): QuickOpenHandler {
 		return instantiationService.createInstance(this.ctor);
 	}
 }
@@ -193,14 +193,10 @@ export interface IQuickOpenRegistry {
 }
 
 class QuickOpenRegistry implements IQuickOpenRegistry {
-	private handlers: QuickOpenHandlerDescriptor[];
+	private handlers: QuickOpenHandlerDescriptor[] = [];
 	private defaultHandler: QuickOpenHandlerDescriptor;
 
-	constructor() {
-		this.handlers = [];
-	}
-
-	public registerQuickOpenHandler(descriptor: QuickOpenHandlerDescriptor): void {
+	registerQuickOpenHandler(descriptor: QuickOpenHandlerDescriptor): void {
 		this.handlers.push(descriptor);
 
 		// sort the handlers by decreasing prefix length, such that longer
@@ -208,19 +204,19 @@ class QuickOpenRegistry implements IQuickOpenRegistry {
 		this.handlers.sort((h1, h2) => h2.prefix.length - h1.prefix.length);
 	}
 
-	public registerDefaultQuickOpenHandler(descriptor: QuickOpenHandlerDescriptor): void {
+	registerDefaultQuickOpenHandler(descriptor: QuickOpenHandlerDescriptor): void {
 		this.defaultHandler = descriptor;
 	}
 
-	public getQuickOpenHandlers(): QuickOpenHandlerDescriptor[] {
+	getQuickOpenHandlers(): QuickOpenHandlerDescriptor[] {
 		return this.handlers.slice(0);
 	}
 
-	public getQuickOpenHandler(text: string): QuickOpenHandlerDescriptor {
+	getQuickOpenHandler(text: string): QuickOpenHandlerDescriptor {
 		return text ? arrays.first(this.handlers, h => strings.startsWith(text, h.prefix), null) : null;
 	}
 
-	public getDefaultQuickOpenHandler(): QuickOpenHandlerDescriptor {
+	getDefaultQuickOpenHandler(): QuickOpenHandlerDescriptor {
 		return this.defaultHandler;
 	}
 }
@@ -249,19 +245,19 @@ export class EditorQuickOpenEntry extends QuickOpenEntry implements IEditorQuick
 		super();
 	}
 
-	public get editorService() {
+	get editorService() {
 		return this._editorService;
 	}
 
-	public getInput(): IResourceInput | IEditorInput {
+	getInput(): IResourceInput | IEditorInput {
 		return null;
 	}
 
-	public getOptions(): IEditorOptions {
+	getOptions(): IEditorOptions {
 		return null;
 	}
 
-	public run(mode: Mode, context: IEntryRunContext): boolean {
+	run(mode: Mode, context: IEntryRunContext): boolean {
 		const hideWidget = (mode === Mode.OPEN);
 
 		if (mode === Mode.OPEN || mode === Mode.OPEN_IN_BACKGROUND) {
@@ -304,11 +300,11 @@ export class EditorQuickOpenEntry extends QuickOpenEntry implements IEditorQuick
  */
 export class EditorQuickOpenEntryGroup extends QuickOpenEntryGroup implements IEditorQuickOpenEntry {
 
-	public getInput(): IEditorInput | IResourceInput {
+	getInput(): IEditorInput | IResourceInput {
 		return null;
 	}
 
-	public getOptions(): IEditorOptions {
+	getOptions(): IEditorOptions {
 		return null;
 	}
 }
@@ -328,7 +324,7 @@ export class QuickOpenAction extends Action {
 		this.enabled = !!this.quickOpenService;
 	}
 
-	public run(context?: any): TPromise<void> {
+	run(context?: any): TPromise<void> {
 
 		// Show with prefix
 		this.quickOpenService.show(this.prefix);
diff --git a/src/vs/workbench/browser/viewlet.ts b/src/vs/workbench/browser/viewlet.ts
index 90e103c10bb..7dfd692e56f 100644
--- a/src/vs/workbench/browser/viewlet.ts
+++ b/src/vs/workbench/browser/viewlet.ts
@@ -30,11 +30,11 @@ export abstract class Viewlet extends Composite implements IViewlet {
 		super(id, telemetryService, themeService);
 	}
 
-	public getOptimalWidth(): number {
+	getOptimalWidth(): number {
 		return null;
 	}
 
-	public getContextMenuActions(): IAction[] {
+	getContextMenuActions(): IAction[] {
 		return [<IAction>{
 			id: ToggleSidebarVisibilityAction.ID,
 			label: nls.localize('compositePart.hideSideBarLabel', "Hide Side Bar"),
@@ -60,7 +60,7 @@ export class ViewletDescriptor extends CompositeDescriptor<Viewlet> {
 		super(ctor, id, name, cssClass, order, id);
 	}
 
-	public get iconUrl(): URI {
+	get iconUrl(): URI {
 		return this._iconUrl;
 	}
 }
@@ -75,35 +75,35 @@ export class ViewletRegistry extends CompositeRegistry<Viewlet> {
 	/**
 	 * Registers a viewlet to the platform.
 	 */
-	public registerViewlet(descriptor: ViewletDescriptor): void {
+	registerViewlet(descriptor: ViewletDescriptor): void {
 		super.registerComposite(descriptor);
 	}
 
 	/**
 	 * Returns the viewlet descriptor for the given id or null if none.
 	 */
-	public getViewlet(id: string): ViewletDescriptor {
+	getViewlet(id: string): ViewletDescriptor {
 		return this.getComposite(id) as ViewletDescriptor;
 	}
 
 	/**
 	 * Returns an array of registered viewlets known to the platform.
 	 */
-	public getViewlets(): ViewletDescriptor[] {
+	getViewlets(): ViewletDescriptor[] {
 		return this.getComposites() as ViewletDescriptor[];
 	}
 
 	/**
 	 * Sets the id of the viewlet that should open on startup by default.
 	 */
-	public setDefaultViewletId(id: string): void {
+	setDefaultViewletId(id: string): void {
 		this.defaultViewletId = id;
 	}
 
 	/**
 	 * Gets the id of the viewlet that should open on startup by default.
 	 */
-	public getDefaultViewletId(): string {
+	getDefaultViewletId(): string {
 		return this.defaultViewletId;
 	}
 }
@@ -129,7 +129,7 @@ export class ToggleViewletAction extends Action {
 		this.enabled = !!this.viewletService && !!this.editorGroupService;
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 
 		// Pass focus to viewlet if not open or focused
 		if (this.otherViewletShowing() || !this.sidebarHasFocus()) {
diff --git a/src/vs/workbench/common/component.ts b/src/vs/workbench/common/component.ts
index 99cafcca30c..f855f0a8a30 100644
--- a/src/vs/workbench/common/component.ts
+++ b/src/vs/workbench/common/component.ts
@@ -45,7 +45,7 @@ export class Component extends Themable implements IWorkbenchComponent {
 		this.componentMemento = new Memento(this.id);
 	}
 
-	public getId(): string {
+	getId(): string {
 		return this.id;
 	}
 
@@ -73,7 +73,7 @@ export class Component extends Themable implements IWorkbenchComponent {
 		this.componentMemento.saveMemento();
 	}
 
-	public shutdown(): void {
+	shutdown(): void {
 
 		// Save Memento
 		this.saveMemento();
diff --git a/src/vs/workbench/common/contributions.ts b/src/vs/workbench/common/contributions.ts
index fb6612f3a7c..0b86ba6a484 100644
--- a/src/vs/workbench/common/contributions.ts
+++ b/src/vs/workbench/common/contributions.ts
@@ -45,7 +45,7 @@ export class WorkbenchContributionsRegistry implements IWorkbenchContributionsRe
 
 	private toBeInstantiated: Map<LifecyclePhase, IConstructorSignature0<IWorkbenchContribution>[]> = new Map<LifecyclePhase, IConstructorSignature0<IWorkbenchContribution>[]>();
 
-	public registerWorkbenchContribution(ctor: IWorkbenchContributionSignature, phase: LifecyclePhase = LifecyclePhase.Starting): void {
+	registerWorkbenchContribution(ctor: IWorkbenchContributionSignature, phase: LifecyclePhase = LifecyclePhase.Starting): void {
 
 		// Instantiate directly if we are already matching the provided phase
 		if (this.instantiationService && this.lifecycleService && this.lifecycleService.phase >= phase) {
@@ -64,7 +64,7 @@ export class WorkbenchContributionsRegistry implements IWorkbenchContributionsRe
 		}
 	}
 
-	public start(instantiationService: IInstantiationService, lifecycleService: ILifecycleService): void {
+	start(instantiationService: IInstantiationService, lifecycleService: ILifecycleService): void {
 		this.instantiationService = instantiationService;
 		this.lifecycleService = lifecycleService;
 
diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
index 59e35f9be53..e49e2d26fc5 100644
--- a/src/vs/workbench/common/editor.ts
+++ b/src/vs/workbench/common/editor.ts
@@ -9,7 +9,7 @@ import { Event, Emitter, once } from 'vs/base/common/event';
 import * as objects from 'vs/base/common/objects';
 import * as types from 'vs/base/common/types';
 import URI from 'vs/base/common/uri';
-import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
+import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { IEditor as ICodeEditor, IEditorViewState, ScrollType, IDiffEditor } from 'vs/editor/common/editorCommon';
 import { IEditorModel, IEditorOptions, ITextEditorOptions, IBaseResourceInput } from 'vs/platform/editor/common/editor';
 import { IInstantiationService, IConstructorSignature0 } from 'vs/platform/instantiation/common/instantiation';
@@ -318,46 +318,28 @@ export interface IEditorInput extends IDisposable {
  * Editor inputs are lightweight objects that can be passed to the workbench API to open inside the editor part.
  * Each editor input is mapped to an editor that is capable of opening it through the Platform facade.
  */
-export abstract class EditorInput implements IEditorInput {
-	private readonly _onDispose: Emitter<void>;
-	protected _onDidChangeDirty: Emitter<void>;
-	protected _onDidChangeLabel: Emitter<void>;
+export abstract class EditorInput extends Disposable implements IEditorInput {
 
-	private disposed: boolean;
+	protected readonly _onDidChangeDirty: Emitter<void> = this._register(new Emitter<void>());
+	get onDidChangeDirty(): Event<void> { return this._onDidChangeDirty.event; }
 
-	constructor() {
-		this._onDidChangeDirty = new Emitter<void>();
-		this._onDidChangeLabel = new Emitter<void>();
-		this._onDispose = new Emitter<void>();
+	protected readonly _onDidChangeLabel: Emitter<void> = this._register(new Emitter<void>());
+	get onDidChangeLabel(): Event<void> { return this._onDidChangeLabel.event; }
 
-		this.disposed = false;
-	}
+	private readonly _onDispose: Emitter<void> = this._register(new Emitter<void>());
+	get onDispose(): Event<void> { return this._onDispose.event; }
+
+	private disposed: boolean = false;
 
 	/**
-	 * Fired when the dirty state of this input changes.
+	 * Returns the unique type identifier of this input.
 	 */
-	public get onDidChangeDirty(): Event<void> {
-		return this._onDidChangeDirty.event;
-	}
-
-	/**
-	 * Fired when the label this input changes.
-	 */
-	public get onDidChangeLabel(): Event<void> {
-		return this._onDidChangeLabel.event;
-	}
-
-	/**
-	 * Fired when the model gets disposed.
-	 */
-	public get onDispose(): Event<void> {
-		return this._onDispose.event;
-	}
+	abstract getTypeId(): string;
 
 	/**
 	 * Returns the associated resource of this input if any.
 	 */
-	public getResource(): URI {
+	getResource(): URI {
 		return null;
 	}
 
@@ -365,7 +347,7 @@ export abstract class EditorInput implements IEditorInput {
 	 * Returns the name of this input that can be shown to the user. Examples include showing the name of the input
 	 * above the editor area when the input is shown.
 	 */
-	public getName(): string {
+	getName(): string {
 		return null;
 	}
 
@@ -373,24 +355,23 @@ export abstract class EditorInput implements IEditorInput {
 	 * Returns the description of this input that can be shown to the user. Examples include showing the description of
 	 * the input above the editor area to the side of the name of the input.
 	 */
-	public getDescription(verbosity?: Verbosity): string {
+	getDescription(verbosity?: Verbosity): string {
 		return null;
 	}
 
-	public getTitle(verbosity?: Verbosity): string {
+	/**
+	 * Returns the title of this input that can be shown to the user. Examples include showing the title of
+	 * the input above the editor area as hover over the input label.
+	 */
+	getTitle(verbosity?: Verbosity): string {
 		return this.getName();
 	}
 
-	/**
-	 * Returns the unique type identifier of this input.
-	 */
-	public abstract getTypeId(): string;
-
 	/**
 	 * Returns the preferred editor for this input. A list of candidate editors is passed in that whee registered
 	 * for the input. This allows subclasses to decide late which editor to use for the input on a case by case basis.
 	 */
-	public getPreferredEditorId(candidates: string[]): string {
+	getPreferredEditorId(candidates: string[]): string {
 		if (candidates && candidates.length > 0) {
 			return candidates[0];
 		}
@@ -403,7 +384,7 @@ export abstract class EditorInput implements IEditorInput {
 	 *
 	 * Subclasses should extend if they can contribute.
 	 */
-	public getTelemetryDescriptor(): object {
+	getTelemetryDescriptor(): object {
 		/* __GDPR__FRAGMENT__
 			"EditorTelemetryDescriptor" : {
 				"typeId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
@@ -414,79 +395,75 @@ export abstract class EditorInput implements IEditorInput {
 
 	/**
 	 * Returns a type of EditorModel that represents the resolved input. Subclasses should
-	 * override to provide a meaningful model. The optional second argument allows to specify
-	 * if the EditorModel should be refreshed before returning it. Depending on the implementation
-	 * this could mean to refresh the editor model contents with the version from disk.
+	 * override to provide a meaningful model.
 	 */
-	public abstract resolve(refresh?: boolean): TPromise<IEditorModel>;
+	abstract resolve(): TPromise<IEditorModel>;
 
 	/**
 	 * An editor that is dirty will be asked to be saved once it closes.
 	 */
-	public isDirty(): boolean {
+	isDirty(): boolean {
 		return false;
 	}
 
 	/**
 	 * Subclasses should bring up a proper dialog for the user if the editor is dirty and return the result.
 	 */
-	public confirmSave(): TPromise<ConfirmResult> {
+	confirmSave(): TPromise<ConfirmResult> {
 		return TPromise.wrap(ConfirmResult.DONT_SAVE);
 	}
 
 	/**
 	 * Saves the editor if it is dirty. Subclasses return a promise with a boolean indicating the success of the operation.
 	 */
-	public save(): TPromise<boolean> {
+	save(): TPromise<boolean> {
 		return TPromise.as(true);
 	}
 
 	/**
 	 * Reverts the editor if it is dirty. Subclasses return a promise with a boolean indicating the success of the operation.
 	 */
-	public revert(options?: IRevertOptions): TPromise<boolean> {
+	revert(options?: IRevertOptions): TPromise<boolean> {
 		return TPromise.as(true);
 	}
 
 	/**
 	 * Called when this input is no longer opened in any editor. Subclasses can free resources as needed.
 	 */
-	public close(): void {
+	close(): void {
 		this.dispose();
 	}
 
 	/**
 	 * Subclasses can set this to false if it does not make sense to split the editor input.
 	 */
-	public supportsSplitEditor(): boolean {
+	supportsSplitEditor(): boolean {
 		return true;
 	}
 
 	/**
 	 * Returns true if this input is identical to the otherInput.
 	 */
-	public matches(otherInput: any): boolean {
+	matches(otherInput: any): boolean {
 		return this === otherInput;
 	}
 
+	/**
+	 * Returns whether this input was disposed or not.
+	 */
+	isDisposed(): boolean {
+		return this.disposed;
+	}
+
 	/**
 	 * Called when an editor input is no longer needed. Allows to free up any resources taken by
 	 * resolving the editor input.
 	 */
-	public dispose(): void {
+	dispose(): void {
 		this.disposed = true;
 		this._onDispose.fire();
 
-		this._onDidChangeDirty.dispose();
-		this._onDidChangeLabel.dispose();
-		this._onDispose.dispose();
-	}
-
-	/**
-	 * Returns whether this input was disposed or not.
-	 */
-	public isDisposed(): boolean {
-		return this.disposed;
+		super.dispose();
 	}
 }
 
@@ -544,13 +521,11 @@ export interface IFileEditorInput extends IEditorInput, IEncodingSupport {
  */
 export class SideBySideEditorInput extends EditorInput {
 
-	public static readonly ID: string = 'workbench.editorinputs.sidebysideEditorInput';
-
-	private _toUnbind: IDisposable[];
+	static readonly ID: string = 'workbench.editorinputs.sidebysideEditorInput';
 
 	constructor(private name: string, private description: string, private _details: EditorInput, private _master: EditorInput) {
 		super();
-		this._toUnbind = [];
+
 		this.registerListeners();
 	}
 
@@ -562,23 +537,23 @@ export class SideBySideEditorInput extends EditorInput {
 		return this._details;
 	}
 
-	public isDirty(): boolean {
+	isDirty(): boolean {
 		return this.master.isDirty();
 	}
 
-	public confirmSave(): TPromise<ConfirmResult> {
+	confirmSave(): TPromise<ConfirmResult> {
 		return this.master.confirmSave();
 	}
 
-	public save(): TPromise<boolean> {
+	save(): TPromise<boolean> {
 		return this.master.save();
 	}
 
-	public revert(): TPromise<boolean> {
+	revert(): TPromise<boolean> {
 		return this.master.revert();
 	}
 
-	public getTelemetryDescriptor(): object {
+	getTelemetryDescriptor(): object {
 		const descriptor = this.master.getTelemetryDescriptor();
 		return objects.assign(descriptor, super.getTelemetryDescriptor());
 	}
@@ -587,29 +562,25 @@ export class SideBySideEditorInput extends EditorInput {
 
 		// When the details or master input gets disposed, dispose this diff editor input
 		const onceDetailsDisposed = once(this.details.onDispose);
-		this._toUnbind.push(onceDetailsDisposed(() => {
+		this._register(onceDetailsDisposed(() => {
 			if (!this.isDisposed()) {
 				this.dispose();
 			}
 		}));
 
 		const onceMasterDisposed = once(this.master.onDispose);
-		this._toUnbind.push(onceMasterDisposed(() => {
+		this._register(onceMasterDisposed(() => {
 			if (!this.isDisposed()) {
 				this.dispose();
 			}
 		}));
 
 		// Reemit some events from the master side to the outside
-		this._toUnbind.push(this.master.onDidChangeDirty(() => this._onDidChangeDirty.fire()));
-		this._toUnbind.push(this.master.onDidChangeLabel(() => this._onDidChangeLabel.fire()));
+		this._register(this.master.onDidChangeDirty(() => this._onDidChangeDirty.fire()));
+		this._register(this.master.onDidChangeLabel(() => this._onDidChangeLabel.fire()));
 	}
 
-	public get toUnbind() {
-		return this._toUnbind;
-	}
-
-	public resolve(refresh?: boolean): TPromise<EditorModel> {
+	resolve(): TPromise<EditorModel> {
 		return TPromise.as(null);
 	}
 
@@ -617,15 +588,15 @@ export class SideBySideEditorInput extends EditorInput {
 		return SideBySideEditorInput.ID;
 	}
 
-	public getName(): string {
+	getName(): string {
 		return this.name;
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.description;
 	}
 
-	public matches(otherInput: any): boolean {
+	matches(otherInput: any): boolean {
 		if (super.matches(otherInput) === true) {
 			return true;
 		}
@@ -641,11 +612,6 @@ export class SideBySideEditorInput extends EditorInput {
 
 		return false;
 	}
-
-	public dispose(): void {
-		this._toUnbind = dispose(this._toUnbind);
-		super.dispose();
-	}
 }
 
 export interface ITextEditorModel extends IEditorModel {
@@ -658,40 +624,30 @@ export interface ITextEditorModel extends IEditorModel {
  * are typically cached for some while because they are expensive to construct.
  */
 export class EditorModel extends Disposable implements IEditorModel {
-	private readonly _onDispose: Emitter<void>;
 
-	constructor() {
-		super();
-		this._onDispose = new Emitter<void>();
-	}
-
-	/**
-	 * Fired when the model gets disposed.
-	 */
-	public get onDispose(): Event<void> {
-		return this._onDispose.event;
-	}
+	private readonly _onDispose: Emitter<void> = this._register(new Emitter<void>());
+	get onDispose(): Event<void> { return this._onDispose.event; }
 
 	/**
 	 * Causes this model to load returning a promise when loading is completed.
 	 */
-	public load(): TPromise<EditorModel> {
+	load(): TPromise<EditorModel> {
 		return TPromise.as(this);
 	}
 
 	/**
 	 * Returns whether this model was loaded or not.
 	 */
-	public isResolved(): boolean {
+	isResolved(): boolean {
 		return true;
 	}
 
 	/**
 	 * Subclasses should implement to free resources that have been claimed through loading.
 	 */
-	public dispose(): void {
+	dispose(): void {
 		this._onDispose.fire();
-		this._onDispose.dispose();
+
 		super.dispose();
 	}
 }
@@ -715,11 +671,11 @@ export class EditorOptions implements IEditorOptions {
 	/**
 	 * Helper to create EditorOptions inline.
 	 */
-	public static create(settings: IEditorOptions): EditorOptions {
+	static create(settings: IEditorOptions): EditorOptions {
 		const options = new EditorOptions();
 
 		options.preserveFocus = settings.preserveFocus;
-		options.forceOpen = settings.forceOpen;
+		options.forceReload = settings.forceReload;
 		options.revealIfVisible = settings.revealIfVisible;
 		options.revealIfOpened = settings.revealIfOpened;
 		options.pinned = settings.pinned;
@@ -733,41 +689,41 @@ export class EditorOptions implements IEditorOptions {
 	 * Tells the editor to not receive keyboard focus when the editor is being opened. By default,
 	 * the editor will receive keyboard focus on open.
 	 */
-	public preserveFocus: boolean;
+	preserveFocus: boolean;
 
 	/**
-	 * Tells the editor to replace the editor input in the editor even if it is identical to the one
-	 * already showing. By default, the editor will not replace the input if it is identical to the
+	 * Tells the editor to reload the editor input in the editor even if it is identical to the one
+	 * already showing. By default, the editor will not reload the input if it is identical to the
 	 * one showing.
 	 */
-	public forceOpen: boolean;
+	forceReload: boolean;
 
 	/**
 	 * Will reveal the editor if it is already opened and visible in any of the opened editor groups.
 	 */
-	public revealIfVisible: boolean;
+	revealIfVisible: boolean;
 
 	/**
 	 * Will reveal the editor if it is already opened (even when not visible) in any of the opened editor groups.
 	 */
-	public revealIfOpened: boolean;
+	revealIfOpened: boolean;
 
 	/**
 	 * An editor that is pinned remains in the editor stack even when another editor is being opened.
 	 * An editor that is not pinned will always get replaced by another editor that is not pinned.
 	 */
-	public pinned: boolean;
+	pinned: boolean;
 
 	/**
 	 * The index in the document stack where to insert the editor into when opening.
 	 */
-	public index: number;
+	index: number;
 
 	/**
 	 * An active editor that is opened will show its contents directly. Set to true to open an editor
 	 * in the background.
 	 */
-	public inactive: boolean;
+	inactive: boolean;
 }
 
 /**
@@ -782,7 +738,7 @@ export class TextEditorOptions extends EditorOptions {
 	private revealInCenterIfOutsideViewport: boolean;
 	private editorViewState: IEditorViewState;
 
-	public static from(input?: IBaseResourceInput): TextEditorOptions {
+	static from(input?: IBaseResourceInput): TextEditorOptions {
 		if (!input || !input.options) {
 			return null;
 		}
@@ -793,7 +749,7 @@ export class TextEditorOptions extends EditorOptions {
 	/**
 	 * Helper to convert options bag to real class
 	 */
-	public static create(options: ITextEditorOptions = Object.create(null)): TextEditorOptions {
+	static create(options: ITextEditorOptions = Object.create(null)): TextEditorOptions {
 		const textEditorOptions = new TextEditorOptions();
 
 		if (options.selection) {
@@ -805,8 +761,8 @@ export class TextEditorOptions extends EditorOptions {
 			textEditorOptions.editorViewState = options.viewState as IEditorViewState;
 		}
 
-		if (options.forceOpen) {
-			textEditorOptions.forceOpen = true;
+		if (options.forceReload) {
+			textEditorOptions.forceReload = true;
 		}
 
 		if (options.revealIfVisible) {
@@ -843,14 +799,14 @@ export class TextEditorOptions extends EditorOptions {
 	/**
 	 * Returns if this options object has objects defined for the editor.
 	 */
-	public hasOptionsDefined(): boolean {
+	hasOptionsDefined(): boolean {
 		return !!this.editorViewState || (!types.isUndefinedOrNull(this.startLineNumber) && !types.isUndefinedOrNull(this.startColumn));
 	}
 
 	/**
 	 * Tells the editor to set show the given selection when the editor is being opened.
 	 */
-	public selection(startLineNumber: number, startColumn: number, endLineNumber: number = startLineNumber, endColumn: number = startColumn): EditorOptions {
+	selection(startLineNumber: number, startColumn: number, endLineNumber: number = startLineNumber, endColumn: number = startColumn): EditorOptions {
 		this.startLineNumber = startLineNumber;
 		this.startColumn = startColumn;
 		this.endLineNumber = endLineNumber;
@@ -862,7 +818,7 @@ export class TextEditorOptions extends EditorOptions {
 	/**
 	 * Create a TextEditorOptions inline to be used when the editor is opening.
 	 */
-	public static fromEditor(editor: ICodeEditor, settings?: IEditorOptions): TextEditorOptions {
+	static fromEditor(editor: ICodeEditor, settings?: IEditorOptions): TextEditorOptions {
 		const options = TextEditorOptions.create(settings);
 
 		// View state
@@ -876,7 +832,7 @@ export class TextEditorOptions extends EditorOptions {
 	 *
 	 * @return if something was applied
 	 */
-	public apply(editor: ICodeEditor, scrollType: ScrollType): boolean {
+	apply(editor: ICodeEditor, scrollType: ScrollType): boolean {
 
 		// View state
 		return this.applyViewState(editor, scrollType);
@@ -1057,10 +1013,7 @@ class EditorInputFactoryRegistry implements IEditorInputFactoryRegistry {
 	private editorInputFactoryConstructors: { [editorInputId: string]: IConstructorSignature0<IEditorInputFactory> } = Object.create(null);
 	private editorInputFactoryInstances: { [editorInputId: string]: IEditorInputFactory } = Object.create(null);
 
-	constructor() {
-	}
-
-	public setInstantiationService(service: IInstantiationService): void {
+	setInstantiationService(service: IInstantiationService): void {
 		this.instantiationService = service;
 
 		for (let key in this.editorInputFactoryConstructors) {
@@ -1076,15 +1029,15 @@ class EditorInputFactoryRegistry implements IEditorInputFactoryRegistry {
 		this.editorInputFactoryInstances[editorInputId] = instance;
 	}
 
-	public registerFileInputFactory(factory: IFileInputFactory): void {
+	registerFileInputFactory(factory: IFileInputFactory): void {
 		this.fileInputFactory = factory;
 	}
 
-	public getFileInputFactory(): IFileInputFactory {
+	getFileInputFactory(): IFileInputFactory {
 		return this.fileInputFactory;
 	}
 
-	public registerEditorInputFactory(editorInputId: string, ctor: IConstructorSignature0<IEditorInputFactory>): void {
+	registerEditorInputFactory(editorInputId: string, ctor: IConstructorSignature0<IEditorInputFactory>): void {
 		if (!this.instantiationService) {
 			this.editorInputFactoryConstructors[editorInputId] = ctor;
 		} else {
@@ -1092,7 +1045,7 @@ class EditorInputFactoryRegistry implements IEditorInputFactoryRegistry {
 		}
 	}
 
-	public getEditorInputFactory(editorInputId: string): IEditorInputFactory {
+	getEditorInputFactory(editorInputId: string): IEditorInputFactory {
 		return this.editorInputFactoryInstances[editorInputId];
 	}
 }
diff --git a/src/vs/workbench/common/editor/binaryEditorModel.ts b/src/vs/workbench/common/editor/binaryEditorModel.ts
index d4f34881d8c..061090b27ce 100644
--- a/src/vs/workbench/common/editor/binaryEditorModel.ts
+++ b/src/vs/workbench/common/editor/binaryEditorModel.ts
@@ -44,39 +44,39 @@ export class BinaryEditorModel extends EditorModel {
 	/**
 	 * The name of the binary resource.
 	 */
-	public getName(): string {
+	getName(): string {
 		return this.name;
 	}
 
 	/**
 	 * The resource of the binary resource.
 	 */
-	public getResource(): URI {
+	getResource(): URI {
 		return this.resource;
 	}
 
 	/**
 	 * The size of the binary resource if known.
 	 */
-	public getSize(): number {
+	getSize(): number {
 		return this.size;
 	}
 
 	/**
 	 * The mime of the binary resource if known.
 	 */
-	public getMime(): string {
+	getMime(): string {
 		return this.mime;
 	}
 
 	/**
 	 * The etag of the binary resource if known.
 	 */
-	public getETag(): string {
+	getETag(): string {
 		return this.etag;
 	}
 
-	public load(): TPromise<EditorModel> {
+	load(): TPromise<EditorModel> {
 
 		// Make sure to resolve up to date stat for file resources
 		if (this.fileService.canHandleResource(this.resource)) {
diff --git a/src/vs/workbench/common/editor/dataUriEditorInput.ts b/src/vs/workbench/common/editor/dataUriEditorInput.ts
index c1d785bd73b..07f9455bd3f 100644
--- a/src/vs/workbench/common/editor/dataUriEditorInput.ts
+++ b/src/vs/workbench/common/editor/dataUriEditorInput.ts
@@ -49,27 +49,27 @@ export class DataUriEditorInput extends EditorInput {
 		}
 	}
 
-	public getResource(): URI {
+	getResource(): URI {
 		return this.resource;
 	}
 
-	public getTypeId(): string {
+	getTypeId(): string {
 		return DataUriEditorInput.ID;
 	}
 
-	public getName(): string {
+	getName(): string {
 		return this.name;
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.description;
 	}
 
-	public resolve(refresh?: boolean): TPromise<BinaryEditorModel> {
+	resolve(): TPromise<BinaryEditorModel> {
 		return this.instantiationService.createInstance(BinaryEditorModel, this.resource, this.getName()).load().then(m => m as BinaryEditorModel);
 	}
 
-	public matches(otherInput: any): boolean {
+	matches(otherInput: any): boolean {
 		if (super.matches(otherInput) === true) {
 			return true;
 		}
diff --git a/src/vs/workbench/common/editor/diffEditorInput.ts b/src/vs/workbench/common/editor/diffEditorInput.ts
index 7554329bd52..36f7632e566 100644
--- a/src/vs/workbench/common/editor/diffEditorInput.ts
+++ b/src/vs/workbench/common/editor/diffEditorInput.ts
@@ -16,7 +16,7 @@ import { TextDiffEditorModel } from 'vs/workbench/common/editor/textDiffEditorMo
  */
 export class DiffEditorInput extends SideBySideEditorInput {
 
-	public static readonly ID = 'workbench.editors.diffEditorInput';
+	static readonly ID = 'workbench.editors.diffEditorInput';
 
 	private cachedModel: DiffEditorModel;
 
@@ -24,7 +24,7 @@ export class DiffEditorInput extends SideBySideEditorInput {
 		super(name, description, original, modified);
 	}
 
-	public getTypeId(): string {
+	getTypeId(): string {
 		return DiffEditorInput.ID;
 	}
 
@@ -36,23 +36,13 @@ export class DiffEditorInput extends SideBySideEditorInput {
 		return this.master;
 	}
 
-	public resolve(refresh?: boolean): TPromise<EditorModel> {
-		let modelPromise: TPromise<EditorModel>;
-
-		// Use Cached Model
-		if (this.cachedModel && !refresh) {
-			modelPromise = TPromise.as<EditorModel>(this.cachedModel);
-		}
+	resolve(): TPromise<EditorModel> {
 
 		// Create Model - we never reuse our cached model if refresh is true because we cannot
 		// decide for the inputs within if the cached model can be reused or not. There may be
 		// inputs that need to be loaded again and thus we always recreate the model and dispose
 		// the previous one - if any.
-		else {
-			modelPromise = this.createModel(refresh);
-		}
-
-		return modelPromise.then((resolvedModel: DiffEditorModel) => {
+		return this.createModel().then(resolvedModel => {
 			if (this.cachedModel) {
 				this.cachedModel.dispose();
 			}
@@ -63,7 +53,7 @@ export class DiffEditorInput extends SideBySideEditorInput {
 		});
 	}
 
-	public getPreferredEditorId(candidates: string[]): string {
+	getPreferredEditorId(candidates: string[]): string {
 		return this.forceOpenAsBinary ? BINARY_DIFF_EDITOR_ID : TEXT_DIFF_EDITOR_ID;
 	}
 
@@ -71,9 +61,9 @@ export class DiffEditorInput extends SideBySideEditorInput {
 
 		// Join resolve call over two inputs and build diff editor model
 		return TPromise.join([
-			this.originalInput.resolve(refresh),
-			this.modifiedInput.resolve(refresh)
-		]).then((models) => {
+			this.originalInput.resolve(),
+			this.modifiedInput.resolve()
+		]).then(models => {
 			const originalEditorModel = models[0];
 			const modifiedEditorModel = models[1];
 
@@ -87,7 +77,7 @@ export class DiffEditorInput extends SideBySideEditorInput {
 		});
 	}
 
-	public dispose(): void {
+	dispose(): void {
 
 		// Free the diff editor model but do not propagate the dispose() call to the two inputs
 		// We never created the two inputs (original and modified) so we can not dispose
diff --git a/src/vs/workbench/common/editor/diffEditorModel.ts b/src/vs/workbench/common/editor/diffEditorModel.ts
index 47c74e1daf3..232e915b631 100644
--- a/src/vs/workbench/common/editor/diffEditorModel.ts
+++ b/src/vs/workbench/common/editor/diffEditorModel.ts
@@ -23,15 +23,15 @@ export class DiffEditorModel extends EditorModel {
 		this._modifiedModel = modifiedModel;
 	}
 
-	public get originalModel(): EditorModel {
+	get originalModel(): EditorModel {
 		return this._originalModel as EditorModel;
 	}
 
-	public get modifiedModel(): EditorModel {
+	get modifiedModel(): EditorModel {
 		return this._modifiedModel as EditorModel;
 	}
 
-	public load(): TPromise<EditorModel> {
+	load(): TPromise<EditorModel> {
 		return TPromise.join([
 			this._originalModel.load(),
 			this._modifiedModel.load()
@@ -40,11 +40,11 @@ export class DiffEditorModel extends EditorModel {
 		});
 	}
 
-	public isResolved(): boolean {
+	isResolved(): boolean {
 		return this.originalModel.isResolved() && this.modifiedModel.isResolved();
 	}
 
-	public dispose(): void {
+	dispose(): void {
 
 		// Do not propagate the dispose() call to the two models inside. We never created the two models
 		// (original and modified) so we can not dispose them without sideeffects. Rather rely on the
diff --git a/src/vs/workbench/common/editor/resourceEditorInput.ts b/src/vs/workbench/common/editor/resourceEditorInput.ts
index 0d19259d23a..572510986ac 100644
--- a/src/vs/workbench/common/editor/resourceEditorInput.ts
+++ b/src/vs/workbench/common/editor/resourceEditorInput.ts
@@ -40,37 +40,37 @@ export class ResourceEditorInput extends EditorInput {
 		this.resource = resource;
 	}
 
-	public getResource(): URI {
+	getResource(): URI {
 		return this.resource;
 	}
 
-	public getTypeId(): string {
+	getTypeId(): string {
 		return ResourceEditorInput.ID;
 	}
 
-	public getName(): string {
+	getName(): string {
 		return this.name;
 	}
 
-	public setName(name: string): void {
+	setName(name: string): void {
 		if (this.name !== name) {
 			this.name = name;
 			this._onDidChangeLabel.fire();
 		}
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.description;
 	}
 
-	public setDescription(description: string): void {
+	setDescription(description: string): void {
 		if (this.description !== description) {
 			this.description = description;
 			this._onDidChangeLabel.fire();
 		}
 	}
 
-	public getTelemetryDescriptor(): object {
+	getTelemetryDescriptor(): object {
 		const descriptor = super.getTelemetryDescriptor();
 		descriptor['resource'] = telemetryURIDescriptor(this.resource, path => this.hashService.createSHA1(path));
 
@@ -82,7 +82,7 @@ export class ResourceEditorInput extends EditorInput {
 		return descriptor;
 	}
 
-	public resolve(refresh?: boolean): TPromise<ITextEditorModel> {
+	resolve(): TPromise<ITextEditorModel> {
 		if (!this.modelReference) {
 			this.modelReference = this.textModelResolverService.createModelReference(this.resource);
 		}
@@ -101,7 +101,7 @@ export class ResourceEditorInput extends EditorInput {
 		});
 	}
 
-	public matches(otherInput: any): boolean {
+	matches(otherInput: any): boolean {
 		if (super.matches(otherInput) === true) {
 			return true;
 		}
@@ -116,7 +116,7 @@ export class ResourceEditorInput extends EditorInput {
 		return false;
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		if (this.modelReference) {
 			this.modelReference.done(ref => ref.dispose());
 			this.modelReference = null;
diff --git a/src/vs/workbench/common/editor/resourceEditorModel.ts b/src/vs/workbench/common/editor/resourceEditorModel.ts
index a195fbe3ebe..638c39abad2 100644
--- a/src/vs/workbench/common/editor/resourceEditorModel.ts
+++ b/src/vs/workbench/common/editor/resourceEditorModel.ts
@@ -24,4 +24,8 @@ export class ResourceEditorModel extends BaseTextEditorModel {
 		// TODO@Joao: force this class to dispose the underlying model
 		this.createdEditorModel = true;
 	}
+
+	isReadonly(): boolean {
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/common/editor/textDiffEditorModel.ts b/src/vs/workbench/common/editor/textDiffEditorModel.ts
index 70c3279e8d8..dd26af7c5f2 100644
--- a/src/vs/workbench/common/editor/textDiffEditorModel.ts
+++ b/src/vs/workbench/common/editor/textDiffEditorModel.ts
@@ -31,7 +31,7 @@ export class TextDiffEditorModel extends DiffEditorModel {
 		return this._modifiedModel as BaseTextEditorModel;
 	}
 
-	public load(): TPromise<EditorModel> {
+	load(): TPromise<EditorModel> {
 		return super.load().then(() => {
 			this.updateTextDiffEditorModel();
 
@@ -58,19 +58,19 @@ export class TextDiffEditorModel extends DiffEditorModel {
 		}
 	}
 
-	public get textDiffEditorModel(): IDiffEditorModel {
+	get textDiffEditorModel(): IDiffEditorModel {
 		return this._textDiffEditorModel;
 	}
 
-	public isResolved(): boolean {
+	isResolved(): boolean {
 		return !!this._textDiffEditorModel;
 	}
 
-	public isReadonly(): boolean {
+	isReadonly(): boolean {
 		return this.modifiedModel.isReadonly();
 	}
 
-	public dispose(): void {
+	dispose(): void {
 
 		// Free the diff editor model but do not propagate the dispose() call to the two models
 		// inside. We never created the two models (original and modified) so we can not dispose
diff --git a/src/vs/workbench/common/editor/textEditorModel.ts b/src/vs/workbench/common/editor/textEditorModel.ts
index 20bec65ef18..9b21ddc8f8f 100644
--- a/src/vs/workbench/common/editor/textEditorModel.ts
+++ b/src/vs/workbench/common/editor/textEditorModel.ts
@@ -19,8 +19,10 @@ import { ITextSnapshot } from 'vs/platform/files/common/files';
  * The base text editor model leverages the code editor model. This class is only intended to be subclassed and not instantiated.
  */
 export abstract class BaseTextEditorModel extends EditorModel implements ITextEditorModel {
-	private textEditorModelHandle: URI;
+
 	protected createdEditorModel: boolean;
+
+	private textEditorModelHandle: URI;
 	private modelDisposeListener: IDisposable;
 
 	constructor(
@@ -60,10 +62,12 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd
 		});
 	}
 
-	public get textEditorModel(): ITextModel {
+	get textEditorModel(): ITextModel {
 		return this.textEditorModelHandle ? this.modelService.getModel(this.textEditorModelHandle) : null;
 	}
 
+	abstract isReadonly(): boolean;
+
 	/**
 	 * Creates the text editor model with the provided value, modeId (can be comma separated for multiple values) and optional resource URL.
 	 */
@@ -124,7 +128,7 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd
 		this.modelService.updateModel(this.textEditorModel, newValue);
 	}
 
-	public createSnapshot(): ITextSnapshot {
+	createSnapshot(): ITextSnapshot {
 		const model = this.textEditorModel;
 		if (model) {
 			return model.createSnapshot(true /* Preserve BOM */);
@@ -133,15 +137,11 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd
 		return null;
 	}
 
-	public isResolved(): boolean {
+	isResolved(): boolean {
 		return !!this.textEditorModelHandle;
 	}
 
-	public isReadonly(): boolean {
-		return false;
-	}
-
-	public dispose(): void {
+	dispose(): void {
 		if (this.modelDisposeListener) {
 			this.modelDisposeListener.dispose(); // dispose this first because it will trigger another dispose() otherwise
 			this.modelDisposeListener = null;
diff --git a/src/vs/workbench/common/editor/untitledEditorInput.ts b/src/vs/workbench/common/editor/untitledEditorInput.ts
index a87394cdd84..ee49dbe7211 100644
--- a/src/vs/workbench/common/editor/untitledEditorInput.ts
+++ b/src/vs/workbench/common/editor/untitledEditorInput.ts
@@ -16,7 +16,6 @@ import { EditorInput, IEncodingSupport, EncodingMode, ConfirmResult, Verbosity }
 import { UntitledEditorModel } from 'vs/workbench/common/editor/untitledEditorModel';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { telemetryURIDescriptor } from 'vs/platform/telemetry/common/telemetryUtils';
@@ -28,16 +27,17 @@ import { IHashService } from 'vs/workbench/services/hash/common/hashService';
  */
 export class UntitledEditorInput extends EditorInput implements IEncodingSupport {
 
-	public static readonly ID: string = 'workbench.editors.untitledEditorInput';
+	static readonly ID: string = 'workbench.editors.untitledEditorInput';
 
 	private _hasAssociatedFilePath: boolean;
 	private cachedModel: UntitledEditorModel;
 	private modelResolve: TPromise<UntitledEditorModel>;
 
-	private readonly _onDidModelChangeContent: Emitter<void>;
-	private readonly _onDidModelChangeEncoding: Emitter<void>;
+	private readonly _onDidModelChangeContent: Emitter<void> = this._register(new Emitter<void>());
+	get onDidModelChangeContent(): Event<void> { return this._onDidModelChangeContent.event; }
 
-	private toUnbind: IDisposable[];
+	private readonly _onDidModelChangeEncoding: Emitter<void> = this._register(new Emitter<void>());
+	get onDidModelChangeEncoding(): Event<void> { return this._onDidModelChangeEncoding.event; }
 
 	constructor(
 		private resource: URI,
@@ -54,33 +54,21 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		super();
 
 		this._hasAssociatedFilePath = hasAssociatedFilePath;
-		this.toUnbind = [];
-
-		this._onDidModelChangeContent = new Emitter<void>();
-		this._onDidModelChangeEncoding = new Emitter<void>();
 	}
 
-	public get hasAssociatedFilePath(): boolean {
+	get hasAssociatedFilePath(): boolean {
 		return this._hasAssociatedFilePath;
 	}
 
-	public get onDidModelChangeContent(): Event<void> {
-		return this._onDidModelChangeContent.event;
-	}
-
-	public get onDidModelChangeEncoding(): Event<void> {
-		return this._onDidModelChangeEncoding.event;
-	}
-
-	public getTypeId(): string {
+	getTypeId(): string {
 		return UntitledEditorInput.ID;
 	}
 
-	public getResource(): URI {
+	getResource(): URI {
 		return this.resource;
 	}
 
-	public getModeId(): string {
+	getModeId(): string {
 		if (this.cachedModel) {
 			return this.cachedModel.getModeId();
 		}
@@ -88,7 +76,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		return this.modeId;
 	}
 
-	public getName(): string {
+	getName(): string {
 		return this.hasAssociatedFilePath ? resources.basenameOrAuthority(this.resource) : this.resource.path;
 	}
 
@@ -107,7 +95,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		return labels.getPathLabel(resources.dirname(this.resource), this.environmentService);
 	}
 
-	public getDescription(verbosity: Verbosity = Verbosity.MEDIUM): string {
+	getDescription(verbosity: Verbosity = Verbosity.MEDIUM): string {
 		if (!this.hasAssociatedFilePath) {
 			return null;
 		}
@@ -144,7 +132,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		return labels.getPathLabel(this.resource, this.environmentService);
 	}
 
-	public getTitle(verbosity: Verbosity): string {
+	getTitle(verbosity: Verbosity): string {
 		if (!this.hasAssociatedFilePath) {
 			return this.getName();
 		}
@@ -165,7 +153,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		return title;
 	}
 
-	public isDirty(): boolean {
+	isDirty(): boolean {
 		if (this.cachedModel) {
 			return this.cachedModel.isDirty();
 		}
@@ -179,15 +167,15 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		return this.hasAssociatedFilePath;
 	}
 
-	public confirmSave(): TPromise<ConfirmResult> {
+	confirmSave(): TPromise<ConfirmResult> {
 		return this.textFileService.confirmSave([this.resource]);
 	}
 
-	public save(): TPromise<boolean> {
+	save(): TPromise<boolean> {
 		return this.textFileService.save(this.resource);
 	}
 
-	public revert(): TPromise<boolean> {
+	revert(): TPromise<boolean> {
 		if (this.cachedModel) {
 			this.cachedModel.revert();
 		}
@@ -197,7 +185,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		return TPromise.as(true);
 	}
 
-	public suggestFileName(): string {
+	suggestFileName(): string {
 		if (!this.hasAssociatedFilePath) {
 			if (this.cachedModel) {
 				const modeId = this.cachedModel.getModeId();
@@ -210,7 +198,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		return this.getName();
 	}
 
-	public getEncoding(): string {
+	getEncoding(): string {
 		if (this.cachedModel) {
 			return this.cachedModel.getEncoding();
 		}
@@ -218,7 +206,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		return this.preferredEncoding;
 	}
 
-	public setEncoding(encoding: string, mode: EncodingMode /* ignored, we only have Encode */): void {
+	setEncoding(encoding: string, mode: EncodingMode /* ignored, we only have Encode */): void {
 		this.preferredEncoding = encoding;
 
 		if (this.cachedModel) {
@@ -226,7 +214,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		}
 	}
 
-	public resolve(): TPromise<UntitledEditorModel> {
+	resolve(): TPromise<UntitledEditorModel> {
 
 		// Join a model resolve if we have had one before
 		if (this.modelResolve) {
@@ -241,17 +229,17 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 	}
 
 	private createModel(): UntitledEditorModel {
-		const model = this.instantiationService.createInstance(UntitledEditorModel, this.modeId, this.resource, this.hasAssociatedFilePath, this.initialValue, this.preferredEncoding);
+		const model = this._register(this.instantiationService.createInstance(UntitledEditorModel, this.modeId, this.resource, this.hasAssociatedFilePath, this.initialValue, this.preferredEncoding));
 
 		// re-emit some events from the model
-		this.toUnbind.push(model.onDidChangeContent(() => this._onDidModelChangeContent.fire()));
-		this.toUnbind.push(model.onDidChangeDirty(() => this._onDidChangeDirty.fire()));
-		this.toUnbind.push(model.onDidChangeEncoding(() => this._onDidModelChangeEncoding.fire()));
+		this._register(model.onDidChangeContent(() => this._onDidModelChangeContent.fire()));
+		this._register(model.onDidChangeDirty(() => this._onDidChangeDirty.fire()));
+		this._register(model.onDidChangeEncoding(() => this._onDidModelChangeEncoding.fire()));
 
 		return model;
 	}
 
-	public getTelemetryDescriptor(): object {
+	getTelemetryDescriptor(): object {
 		const descriptor = super.getTelemetryDescriptor();
 		descriptor['resource'] = telemetryURIDescriptor(this.getResource(), path => this.hashService.createSHA1(path));
 
@@ -263,7 +251,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		return descriptor;
 	}
 
-	public matches(otherInput: any): boolean {
+	matches(otherInput: any): boolean {
 		if (super.matches(otherInput) === true) {
 			return true;
 		}
@@ -278,19 +266,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		return false;
 	}
 
-	public dispose(): void {
-		this._onDidModelChangeContent.dispose();
-		this._onDidModelChangeEncoding.dispose();
-
-		// Listeners
-		dispose(this.toUnbind);
-
-		// Model
-		if (this.cachedModel) {
-			this.cachedModel.dispose();
-			this.cachedModel = null;
-		}
-
+	dispose(): void {
 		this.modelResolve = void 0;
 
 		super.dispose();
diff --git a/src/vs/workbench/common/editor/untitledEditorModel.ts b/src/vs/workbench/common/editor/untitledEditorModel.ts
index c7033b68d95..95153544181 100644
--- a/src/vs/workbench/common/editor/untitledEditorModel.ts
+++ b/src/vs/workbench/common/editor/untitledEditorModel.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IEncodingSupport } from 'vs/workbench/common/editor';
 import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
@@ -23,19 +22,20 @@ import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
 
 export class UntitledEditorModel extends BaseTextEditorModel implements IEncodingSupport {
 
-	public static DEFAULT_CONTENT_CHANGE_BUFFER_DELAY = CONTENT_CHANGE_EVENT_BUFFER_DELAY;
+	static DEFAULT_CONTENT_CHANGE_BUFFER_DELAY = CONTENT_CHANGE_EVENT_BUFFER_DELAY;
 
-	private toDispose: IDisposable[];
+	private readonly _onDidChangeContent: Emitter<void> = this._register(new Emitter<void>());
+	get onDidChangeContent(): Event<void> { return this._onDidChangeContent.event; }
+
+	private readonly _onDidChangeDirty: Emitter<void> = this._register(new Emitter<void>());
+	get onDidChangeDirty(): Event<void> { return this._onDidChangeDirty.event; }
+
+	private readonly _onDidChangeEncoding: Emitter<void> = this._register(new Emitter<void>());
+	get onDidChangeEncoding(): Event<void> { return this._onDidChangeEncoding.event; }
 
 	private dirty: boolean;
-	private readonly _onDidChangeContent: Emitter<void>;
-	private readonly _onDidChangeDirty: Emitter<void>;
-	private readonly _onDidChangeEncoding: Emitter<void>;
-
 	private versionId: number;
-
 	private contentChangeEventScheduler: RunOnceScheduler;
-
 	private configuredEncoding: string;
 
 	constructor(
@@ -53,35 +53,12 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
 
 		this.dirty = false;
 		this.versionId = 0;
-		this.toDispose = [];
 
-		this._onDidChangeContent = new Emitter<void>();
-		this.toDispose.push(this._onDidChangeContent);
-
-		this._onDidChangeDirty = new Emitter<void>();
-		this.toDispose.push(this._onDidChangeDirty);
-
-		this._onDidChangeEncoding = new Emitter<void>();
-		this.toDispose.push(this._onDidChangeEncoding);
-
-		this.contentChangeEventScheduler = new RunOnceScheduler(() => this._onDidChangeContent.fire(), UntitledEditorModel.DEFAULT_CONTENT_CHANGE_BUFFER_DELAY);
-		this.toDispose.push(this.contentChangeEventScheduler);
+		this.contentChangeEventScheduler = this._register(new RunOnceScheduler(() => this._onDidChangeContent.fire(), UntitledEditorModel.DEFAULT_CONTENT_CHANGE_BUFFER_DELAY));
 
 		this.registerListeners();
 	}
 
-	public get onDidChangeContent(): Event<void> {
-		return this._onDidChangeContent.event;
-	}
-
-	public get onDidChangeDirty(): Event<void> {
-		return this._onDidChangeDirty.event;
-	}
-
-	public get onDidChangeEncoding(): Event<void> {
-		return this._onDidChangeEncoding.event;
-	}
-
 	protected getOrCreateMode(modeService: IModeService, modeId: string, firstLineText?: string): TPromise<IMode> {
 		if (!modeId || modeId === PLAINTEXT_MODE_ID) {
 			return modeService.getOrCreateModeByFilenameOrFirstLine(this.resource.fsPath, firstLineText); // lookup mode via resource path if the provided modeId is unspecific
@@ -93,7 +70,7 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
 	private registerListeners(): void {
 
 		// Config Changes
-		this.toDispose.push(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChange()));
+		this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChange()));
 	}
 
 	private onConfigurationChange(): void {
@@ -108,11 +85,11 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
 		}
 	}
 
-	public getVersionId(): number {
+	getVersionId(): number {
 		return this.versionId;
 	}
 
-	public getModeId(): string {
+	getModeId(): string {
 		if (this.textEditorModel) {
 			return this.textEditorModel.getLanguageIdentifier().language;
 		}
@@ -120,11 +97,11 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
 		return null;
 	}
 
-	public getEncoding(): string {
+	getEncoding(): string {
 		return this.preferredEncoding || this.configuredEncoding;
 	}
 
-	public setEncoding(encoding: string): void {
+	setEncoding(encoding: string): void {
 		const oldEncoding = this.getEncoding();
 		this.preferredEncoding = encoding;
 
@@ -134,7 +111,7 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
 		}
 	}
 
-	public isDirty(): boolean {
+	isDirty(): boolean {
 		return this.dirty;
 	}
 
@@ -147,18 +124,18 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
 		this._onDidChangeDirty.fire();
 	}
 
-	public getResource(): URI {
+	getResource(): URI {
 		return this.resource;
 	}
 
-	public revert(): void {
+	revert(): void {
 		this.setDirty(false);
 
 		// Handle content change event buffered
 		this.contentChangeEventScheduler.schedule();
 	}
 
-	public load(): TPromise<UntitledEditorModel> {
+	load(): TPromise<UntitledEditorModel> {
 
 		// Check for backups first
 		return this.backupFileService.loadBackupResource(this.resource).then(backupResource => {
@@ -185,10 +162,10 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
 				this.configuredEncoding = this.configurationService.getValue<string>(this.resource, 'files.encoding');
 
 				// Listen to content changes
-				this.toDispose.push(this.textEditorModel.onDidChangeContent(() => this.onModelContentChanged()));
+				this._register(this.textEditorModel.onDidChangeContent(() => this.onModelContentChanged()));
 
 				// Listen to mode changes
-				this.toDispose.push(this.textEditorModel.onDidChangeLanguage(() => this.onConfigurationChange())); // mode change can have impact on config
+				this._register(this.textEditorModel.onDidChangeLanguage(() => this.onConfigurationChange())); // mode change can have impact on config
 
 				return model;
 			});
@@ -228,9 +205,7 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
 		this.contentChangeEventScheduler.schedule();
 	}
 
-	public dispose(): void {
-		super.dispose();
-
-		this.toDispose = dispose(this.toDispose);
+	isReadonly(): boolean {
+		return false;
 	}
 }
diff --git a/src/vs/workbench/common/notifications.ts b/src/vs/workbench/common/notifications.ts
index 37a912ff71d..1c03a386805 100644
--- a/src/vs/workbench/common/notifications.ts
+++ b/src/vs/workbench/common/notifications.ts
@@ -8,7 +8,7 @@
 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 { Disposable } from 'vs/base/common/lifecycle';
 import { isPromiseCanceledError, isErrorWithActions } from 'vs/base/common/errors';
 
 export interface INotificationsModel {
@@ -44,7 +44,9 @@ export interface INotificationChangeEvent {
 }
 
 export class NotificationHandle implements INotificationHandle {
+
 	private readonly _onDidClose: Emitter<void> = new Emitter();
+	get onDidClose(): Event<void> { return this._onDidClose.event; }
 
 	constructor(private item: INotificationViewItem, private closeItem: (item: INotificationViewItem) => void) {
 		this.registerListeners();
@@ -57,58 +59,42 @@ export class NotificationHandle implements INotificationHandle {
 		});
 	}
 
-	public get onDidClose(): Event<void> {
-		return this._onDidClose.event;
-	}
-
-	public get progress(): INotificationProgress {
+	get progress(): INotificationProgress {
 		return this.item.progress;
 	}
 
-	public updateSeverity(severity: Severity): void {
+	updateSeverity(severity: Severity): void {
 		this.item.updateSeverity(severity);
 	}
 
-	public updateMessage(message: NotificationMessage): void {
+	updateMessage(message: NotificationMessage): void {
 		this.item.updateMessage(message);
 	}
 
-	public updateActions(actions?: INotificationActions): void {
+	updateActions(actions?: INotificationActions): void {
 		this.item.updateActions(actions);
 	}
 
-	public close(): void {
+	close(): void {
 		this.closeItem(this.item);
 		this._onDidClose.dispose();
 	}
 }
 
-export class NotificationsModel implements INotificationsModel {
+export class NotificationsModel extends Disposable implements INotificationsModel {
 
 	private static NO_OP_NOTIFICATION = new NoOpNotification();
 
-	private _notifications: INotificationViewItem[];
+	private readonly _onDidNotificationChange: Emitter<INotificationChangeEvent> = this._register(new Emitter<INotificationChangeEvent>());
+	get onDidNotificationChange(): Event<INotificationChangeEvent> { return this._onDidNotificationChange.event; }
 
-	private readonly _onDidNotificationChange: Emitter<INotificationChangeEvent>;
-	private toDispose: IDisposable[];
+	private _notifications: INotificationViewItem[] = [];
 
-	constructor() {
-		this._notifications = [];
-		this.toDispose = [];
-
-		this._onDidNotificationChange = new Emitter<INotificationChangeEvent>();
-		this.toDispose.push(this._onDidNotificationChange);
-	}
-
-	public get notifications(): INotificationViewItem[] {
+	get notifications(): INotificationViewItem[] {
 		return this._notifications;
 	}
 
-	public get onDidNotificationChange(): Event<INotificationChangeEvent> {
-		return this._onDidNotificationChange.event;
-	}
-
-	public notify(notification: INotification): INotificationHandle {
+	notify(notification: INotification): INotificationHandle {
 		const item = this.createViewItem(notification);
 		if (!item) {
 			return NotificationsModel.NO_OP_NOTIFICATION; // return early if this is a no-op
@@ -187,10 +173,6 @@ export class NotificationsModel implements INotificationsModel {
 
 		return item;
 	}
-
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
-	}
 }
 
 export interface INotificationViewItem {
@@ -250,29 +232,23 @@ export interface INotificationViewItemProgress extends INotificationProgress {
 	dispose(): void;
 }
 
-export class NotificationViewItemProgress implements INotificationViewItemProgress {
+export class NotificationViewItemProgress extends Disposable implements INotificationViewItemProgress {
 	private _state: INotificationViewItemProgressState;
 
-	private readonly _onDidChange: Emitter<void>;
-	private toDispose: IDisposable[];
+	private readonly _onDidChange: Emitter<void> = this._register(new Emitter<void>());
+	get onDidChange(): Event<void> { return this._onDidChange.event; }
 
 	constructor() {
-		this.toDispose = [];
-		this._state = Object.create(null);
+		super();
 
-		this._onDidChange = new Emitter<void>();
-		this.toDispose.push(this._onDidChange);
+		this._state = Object.create(null);
 	}
 
-	public get state(): INotificationViewItemProgressState {
+	get state(): INotificationViewItemProgressState {
 		return this._state;
 	}
 
-	public get onDidChange(): Event<void> {
-		return this._onDidChange.event;
-	}
-
-	public infinite(): void {
+	infinite(): void {
 		if (this._state.infinite) {
 			return;
 		}
@@ -286,7 +262,7 @@ export class NotificationViewItemProgress implements INotificationViewItemProgre
 		this._onDidChange.fire();
 	}
 
-	public done(): void {
+	done(): void {
 		if (this._state.done) {
 			return;
 		}
@@ -300,7 +276,7 @@ export class NotificationViewItemProgress implements INotificationViewItemProgre
 		this._onDidChange.fire();
 	}
 
-	public total(value: number): void {
+	total(value: number): void {
 		if (this._state.total === value) {
 			return;
 		}
@@ -313,7 +289,7 @@ export class NotificationViewItemProgress implements INotificationViewItemProgre
 		this._onDidChange.fire();
 	}
 
-	public worked(value: number): void {
+	worked(value: number): void {
 		if (typeof this._state.worked === 'number') {
 			this._state.worked += value;
 		} else {
@@ -325,10 +301,6 @@ export class NotificationViewItemProgress implements INotificationViewItemProgre
 
 		this._onDidChange.fire();
 	}
-
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
-	}
 }
 
 export interface IMessageLink {
@@ -345,7 +317,7 @@ export interface INotificationMessage {
 	links: IMessageLink[];
 }
 
-export class NotificationViewItem implements INotificationViewItem {
+export class NotificationViewItem extends Disposable implements INotificationViewItem {
 
 	private static MAX_MESSAGE_LENGTH = 1000;
 
@@ -354,16 +326,20 @@ export class NotificationViewItem implements INotificationViewItem {
 	private static LINK_REGEX = /\[([^\]]+)\]\((https?:\/\/[^\)\s]+)\)/gi;
 
 	private _expanded: boolean;
-	private toDispose: IDisposable[];
 
 	private _actions: INotificationActions;
 	private _progress: NotificationViewItemProgress;
 
-	private readonly _onDidExpansionChange: Emitter<void>;
-	private readonly _onDidClose: Emitter<void>;
-	private readonly _onDidLabelChange: Emitter<INotificationViewItemLabelChangeEvent>;
+	private readonly _onDidExpansionChange: Emitter<void> = this._register(new Emitter<void>());
+	get onDidExpansionChange(): Event<void> { return this._onDidExpansionChange.event; }
 
-	public static create(notification: INotification): INotificationViewItem {
+	private readonly _onDidClose: Emitter<void> = this._register(new Emitter<void>());
+	get onDidClose(): Event<void> { return this._onDidClose.event; }
+
+	private readonly _onDidLabelChange: Emitter<INotificationViewItemLabelChangeEvent> = this._register(new Emitter<INotificationViewItemLabelChangeEvent>());
+	get onDidLabelChange(): Event<INotificationViewItemLabelChangeEvent> { return this._onDidLabelChange.event; }
+
+	static create(notification: INotification): INotificationViewItem {
 		if (!notification || !notification.message || isPromiseCanceledError(notification.message)) {
 			return null; // we need a message to show
 		}
@@ -426,18 +402,9 @@ export class NotificationViewItem implements INotificationViewItem {
 	}
 
 	private constructor(private _severity: Severity, private _message: INotificationMessage, private _source: string, actions?: INotificationActions) {
-		this.toDispose = [];
+		super();
 
 		this.setActions(actions);
-
-		this._onDidExpansionChange = new Emitter<void>();
-		this.toDispose.push(this._onDidExpansionChange);
-
-		this._onDidLabelChange = new Emitter<INotificationViewItemLabelChangeEvent>();
-		this.toDispose.push(this._onDidLabelChange);
-
-		this._onDidClose = new Emitter<void>();
-		this.toDispose.push(this._onDidClose);
 	}
 
 	private setActions(actions: INotificationActions): void {
@@ -457,62 +424,49 @@ export class NotificationViewItem implements INotificationViewItem {
 		this._expanded = actions.primary.length > 0;
 	}
 
-	public get onDidExpansionChange(): Event<void> {
-		return this._onDidExpansionChange.event;
-	}
-
-	public get onDidLabelChange(): Event<INotificationViewItemLabelChangeEvent> {
-		return this._onDidLabelChange.event;
-	}
-
-	public get onDidClose(): Event<void> {
-		return this._onDidClose.event;
-	}
-
-	public get canCollapse(): boolean {
+	get canCollapse(): boolean {
 		return this._actions.primary.length === 0;
 	}
 
-	public get expanded(): boolean {
+	get expanded(): boolean {
 		return this._expanded;
 	}
 
-	public get severity(): Severity {
+	get severity(): Severity {
 		return this._severity;
 	}
 
-	public hasProgress(): boolean {
+	hasProgress(): boolean {
 		return !!this._progress;
 	}
 
-	public get progress(): INotificationViewItemProgress {
+	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 })));
+			this._progress = this._register(new NotificationViewItemProgress());
+			this._register(this._progress.onDidChange(() => this._onDidLabelChange.fire({ kind: NotificationViewItemLabelKind.PROGRESS })));
 		}
 
 		return this._progress;
 	}
 
-	public get message(): INotificationMessage {
+	get message(): INotificationMessage {
 		return this._message;
 	}
 
-	public get source(): string {
+	get source(): string {
 		return this._source;
 	}
 
-	public get actions(): INotificationActions {
+	get actions(): INotificationActions {
 		return this._actions;
 	}
 
-	public updateSeverity(severity: Severity): void {
+	updateSeverity(severity: Severity): void {
 		this._severity = severity;
 		this._onDidLabelChange.fire({ kind: NotificationViewItemLabelKind.SEVERITY });
 	}
 
-	public updateMessage(input: NotificationMessage): void {
+	updateMessage(input: NotificationMessage): void {
 		const message = NotificationViewItem.parseNotificationMessage(input);
 		if (!message) {
 			return;
@@ -522,13 +476,13 @@ export class NotificationViewItem implements INotificationViewItem {
 		this._onDidLabelChange.fire({ kind: NotificationViewItemLabelKind.MESSAGE });
 	}
 
-	public updateActions(actions?: INotificationActions): void {
+	updateActions(actions?: INotificationActions): void {
 		this.setActions(actions);
 
 		this._onDidLabelChange.fire({ kind: NotificationViewItemLabelKind.ACTIONS });
 	}
 
-	public expand(): void {
+	expand(): void {
 		if (this._expanded || !this.canCollapse) {
 			return;
 		}
@@ -537,7 +491,7 @@ export class NotificationViewItem implements INotificationViewItem {
 		this._onDidExpansionChange.fire();
 	}
 
-	public collapse(skipEvents?: boolean): void {
+	collapse(skipEvents?: boolean): void {
 		if (!this._expanded || !this.canCollapse) {
 			return;
 		}
@@ -549,7 +503,7 @@ export class NotificationViewItem implements INotificationViewItem {
 		}
 	}
 
-	public toggle(): void {
+	toggle(): void {
 		if (this._expanded) {
 			this.collapse();
 		} else {
@@ -557,13 +511,13 @@ export class NotificationViewItem implements INotificationViewItem {
 		}
 	}
 
-	public close(): void {
+	close(): void {
 		this._onDidClose.fire();
 
-		this.toDispose = dispose(this.toDispose);
+		this.dispose();
 	}
 
-	public equals(other: INotificationViewItem): boolean {
+	equals(other: INotificationViewItem): boolean {
 		if (this.hasProgress() || other.hasProgress()) {
 			return false;
 		}
diff --git a/src/vs/workbench/common/resources.ts b/src/vs/workbench/common/resources.ts
index 4809497f2a8..1801c5ad38c 100644
--- a/src/vs/workbench/common/resources.ts
+++ b/src/vs/workbench/common/resources.ts
@@ -63,7 +63,7 @@ export class ResourceContextKey implements IContextKey<URI> {
 		this._isFile.reset();
 	}
 
-	public get(): URI {
+	get(): URI {
 		return this._resourceKey.get();
 	}
 }
diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts
index dc310d1c9f0..cb1b5e23623 100644
--- a/src/vs/workbench/common/theme.ts
+++ b/src/vs/workbench/common/theme.ts
@@ -5,7 +5,7 @@
 
 import * as nls from 'vs/nls';
 import { registerColor, editorBackground, contrastBorder, transparent, editorWidgetBackground, textLinkForeground, lighten, darken, focusBorder } from 'vs/platform/theme/common/colorRegistry';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
 import { Color } from 'vs/base/common/color';
 
@@ -121,7 +121,7 @@ registerColor('editorGroup.background', {
 	dark: null,
 	light: null,
 	hc: null
-}, nls.localize('editorGroupBackground', "Deprecated background color of an editor group."), false, nls.localize('deprecatedEditorGroupBackground', "Deprecated: Background color of an editor group is no longer being supported with the introduction of the grid editor lyout. You can use editorGroup.emptyBackground to set the background color of empty editor groups."));
+}, nls.localize('editorGroupBackground', "Deprecated background color of an editor group."), false, nls.localize('deprecatedEditorGroupBackground', "Deprecated: Background color of an editor group is no longer being supported with the introduction of the grid editor layout. You can use editorGroup.emptyBackground to set the background color of empty editor groups."));
 
 export const EDITOR_GROUP_EMPTY_BACKGROUND = registerColor('editorGroup.emptyBackground', {
 	dark: null,
@@ -455,10 +455,6 @@ export class Themable extends Disposable {
 		this._register(this.themeService.onThemeChange(theme => this.onThemeChange(theme)));
 	}
 
-	protected get toUnbind(): IDisposable[] {
-		return this._toDispose;
-	}
-
 	protected onThemeChange(theme: ITheme): void {
 		this.theme = theme;
 
diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts
index 47d5a9cfadf..ba637549b16 100644
--- a/src/vs/workbench/common/views.ts
+++ b/src/vs/workbench/common/views.ts
@@ -96,7 +96,7 @@ export interface IViewDescriptor {
 
 	readonly container: ViewContainer;
 
-	// TODO do we really need this?!
+	// TODO@Sandeep do we really need this?!
 	readonly ctor: any;
 
 	readonly when?: ContextKeyExpr;
@@ -229,6 +229,8 @@ export interface ITreeViewer extends IDisposable {
 
 	readonly onDidChangeVisibility: Event<boolean>;
 
+	readonly visible: boolean;
+
 	refresh(treeItems?: ITreeItem[]): TPromise<void>;
 
 	setVisibility(visible: boolean): void;
diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts
index 028e7c374cc..c6fb39e0bc0 100644
--- a/src/vs/workbench/electron-browser/actions.ts
+++ b/src/vs/workbench/electron-browser/actions.ts
@@ -20,19 +20,19 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import * as paths from 'vs/base/common/paths';
-import { isMacintosh, isLinux } from 'vs/base/common/platform';
+import { isMacintosh, isLinux, language } from 'vs/base/common/platform';
 import { IQuickOpenService, IFilePickOpenEntry, ISeparator, IPickOpenAction, IPickOpenItem } from 'vs/platform/quickOpen/common/quickOpen';
 import * as browser from 'vs/base/browser/browser';
 import { IIntegrityService } from 'vs/platform/integrity/common/integrity';
 import { IEntryRunContext } from 'vs/base/parts/quickopen/common/quickOpen';
 import { ITimerService, IStartupMetrics } from 'vs/workbench/services/timer/common/timerService';
-import { IEditorGroupsService, GroupDirection } from 'vs/workbench/services/group/common/editorGroupsService';
+import { IEditorGroupsService, GroupDirection, GroupLocation, IFindGroupScope } from 'vs/workbench/services/group/common/editorGroupsService';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IPartService, Parts, Position as PartPosition } from 'vs/workbench/services/part/common/partService';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import * as os from 'os';
-import { webFrame } from 'electron';
+import { webFrame, shell } from 'electron';
 import { getPathLabel, getBaseLabel } from 'vs/base/common/labels';
 import { IViewlet } from 'vs/workbench/common/viewlet';
 import { IPanel } from 'vs/workbench/common/panel';
@@ -55,14 +55,14 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 
 export class CloseCurrentWindowAction extends Action {
 
-	public static readonly ID = 'workbench.action.closeWindow';
-	public static readonly LABEL = nls.localize('closeWindow', "Close Window");
+	static readonly ID = 'workbench.action.closeWindow';
+	static readonly LABEL = nls.localize('closeWindow', "Close Window");
 
 	constructor(id: string, label: string, @IWindowService private windowService: IWindowService) {
 		super(id, label);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		this.windowService.closeWindow();
 
 		return TPromise.as(true);
@@ -142,7 +142,7 @@ export class ToggleMenuBarAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<void> {
+	run(): TPromise<void> {
 		let currentVisibilityValue = this.configurationService.getValue<MenuBarVisibility>(ToggleMenuBarAction.menuBarVisibilityKey);
 		if (typeof currentVisibilityValue !== 'string') {
 			currentVisibilityValue = 'default';
@@ -170,7 +170,7 @@ export class ToggleDevToolsAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<void> {
+	run(): TPromise<void> {
 		return this.windowsService.toggleDevTools();
 	}
 }
@@ -204,8 +204,8 @@ export abstract class BaseZoomAction extends Action {
 
 export class ZoomInAction extends BaseZoomAction {
 
-	public static readonly ID = 'workbench.action.zoomIn';
-	public static readonly LABEL = nls.localize('zoomIn', "Zoom In");
+	static readonly ID = 'workbench.action.zoomIn';
+	static readonly LABEL = nls.localize('zoomIn', "Zoom In");
 
 	constructor(
 		id: string,
@@ -215,7 +215,7 @@ export class ZoomInAction extends BaseZoomAction {
 		super(id, label, configurationService);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		this.setConfiguredZoomLevel(webFrame.getZoomLevel() + 1);
 
 		return TPromise.as(true);
@@ -224,8 +224,8 @@ export class ZoomInAction extends BaseZoomAction {
 
 export class ZoomOutAction extends BaseZoomAction {
 
-	public static readonly ID = 'workbench.action.zoomOut';
-	public static readonly LABEL = nls.localize('zoomOut', "Zoom Out");
+	static readonly ID = 'workbench.action.zoomOut';
+	static readonly LABEL = nls.localize('zoomOut', "Zoom Out");
 
 	constructor(
 		id: string,
@@ -235,7 +235,7 @@ export class ZoomOutAction extends BaseZoomAction {
 		super(id, label, configurationService);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		this.setConfiguredZoomLevel(webFrame.getZoomLevel() - 1);
 
 		return TPromise.as(true);
@@ -244,8 +244,8 @@ export class ZoomOutAction extends BaseZoomAction {
 
 export class ZoomResetAction extends BaseZoomAction {
 
-	public static readonly ID = 'workbench.action.zoomReset';
-	public static readonly LABEL = nls.localize('zoomReset', "Reset Zoom");
+	static readonly ID = 'workbench.action.zoomReset';
+	static readonly LABEL = nls.localize('zoomReset', "Reset Zoom");
 
 	constructor(
 		id: string,
@@ -255,7 +255,7 @@ export class ZoomResetAction extends BaseZoomAction {
 		super(id, label, configurationService);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		this.setConfiguredZoomLevel(0);
 
 		return TPromise.as(true);
@@ -288,8 +288,8 @@ interface ILoaderEvent {
 
 export class ShowStartupPerformance extends Action {
 
-	public static readonly ID = 'workbench.action.appPerf';
-	public static readonly LABEL = nls.localize('appPerf', "Startup Performance");
+	static readonly ID = 'workbench.action.appPerf';
+	static readonly LABEL = nls.localize('appPerf', "Startup Performance");
 
 	constructor(
 		id: string,
@@ -302,7 +302,7 @@ export class ShowStartupPerformance extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 
 		// Show dev tools
 		this.windowService.openDevTools();
@@ -444,10 +444,10 @@ export class ShowStartupPerformance extends Action {
 
 		class Tick {
 
-			public readonly duration: number;
-			public readonly detail: string;
+			readonly duration: number;
+			readonly detail: string;
 
-			constructor(public readonly start: ILoaderEvent, public readonly end: ILoaderEvent) {
+			constructor(private readonly start: ILoaderEvent, private readonly end: ILoaderEvent) {
 				console.assert(start.detail === end.detail);
 
 				this.duration = this.end.timestamp - this.start.timestamp;
@@ -591,7 +591,7 @@ export abstract class BaseSwitchWindow extends Action {
 
 	protected abstract isQuickNavigate(): boolean;
 
-	public run(): TPromise<void> {
+	run(): TPromise<void> {
 		const currentWindowId = this.windowService.getCurrentWindowId();
 
 		return this.windowsService.getWindows().then(windows => {
@@ -621,7 +621,7 @@ export abstract class BaseSwitchWindow extends Action {
 		});
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		super.dispose();
 
 		this.closeWindowAction.dispose();
@@ -630,8 +630,8 @@ export abstract class BaseSwitchWindow extends Action {
 
 class CloseWindowAction extends Action implements IPickOpenAction {
 
-	public static readonly ID = 'workbench.action.closeWindow';
-	public static readonly LABEL = nls.localize('close', "Close Window");
+	static readonly ID = 'workbench.action.closeWindow';
+	static readonly LABEL = nls.localize('close', "Close Window");
 
 	constructor(
 		@IWindowsService private windowsService: IWindowsService
@@ -641,7 +641,7 @@ class CloseWindowAction extends Action implements IPickOpenAction {
 		this.class = 'action-remove-from-recently-opened';
 	}
 
-	public run(item: IPickOpenItem): TPromise<boolean> {
+	run(item: IPickOpenItem): TPromise<boolean> {
 		return this.windowsService.closeWindow(item.getPayload()).then(() => {
 			item.remove();
 
@@ -716,7 +716,7 @@ export abstract class BaseOpenRecentAction extends Action {
 
 	protected abstract isQuickNavigate(): boolean;
 
-	public run(): TPromise<void> {
+	run(): TPromise<void> {
 		return this.windowService.getRecentlyOpened()
 			.then(({ workspaces, files }) => this.openRecent(workspaces, files));
 	}
@@ -774,7 +774,7 @@ export abstract class BaseOpenRecentAction extends Action {
 		}).done(null, errors.onUnexpectedError);
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		super.dispose();
 
 		this.removeAction.dispose();
@@ -783,8 +783,8 @@ export abstract class BaseOpenRecentAction extends Action {
 
 class RemoveFromRecentlyOpened extends Action implements IPickOpenAction {
 
-	public static readonly ID = 'workbench.action.removeFromRecentlyOpened';
-	public static readonly LABEL = nls.localize('remove', "Remove from Recently Opened");
+	static readonly ID = 'workbench.action.removeFromRecentlyOpened';
+	static readonly LABEL = nls.localize('remove', "Remove from Recently Opened");
 
 	constructor(
 		@IWindowsService private windowsService: IWindowsService
@@ -794,7 +794,7 @@ class RemoveFromRecentlyOpened extends Action implements IPickOpenAction {
 		this.class = 'action-remove-from-recently-opened';
 	}
 
-	public run(item: IPickOpenItem): TPromise<boolean> {
+	run(item: IPickOpenItem): TPromise<boolean> {
 		return this.windowsService.removeFromRecentlyOpened([item.getResource().fsPath]).then(() => {
 			item.remove();
 
@@ -805,8 +805,8 @@ class RemoveFromRecentlyOpened extends Action implements IPickOpenAction {
 
 export class OpenRecentAction extends BaseOpenRecentAction {
 
-	public static readonly ID = 'workbench.action.openRecent';
-	public static readonly LABEL = nls.localize('openRecent', "Open Recent...");
+	static readonly ID = 'workbench.action.openRecent';
+	static readonly LABEL = nls.localize('openRecent', "Open Recent...");
 
 	constructor(
 		id: string,
@@ -828,8 +828,8 @@ export class OpenRecentAction extends BaseOpenRecentAction {
 
 export class QuickOpenRecentAction extends BaseOpenRecentAction {
 
-	public static readonly ID = 'workbench.action.quickOpenRecent';
-	public static readonly LABEL = nls.localize('quickOpenRecent', "Quick Open Recent...");
+	static readonly ID = 'workbench.action.quickOpenRecent';
+	static readonly LABEL = nls.localize('quickOpenRecent', "Quick Open Recent...");
 
 	constructor(
 		id: string,
@@ -850,8 +850,8 @@ export class QuickOpenRecentAction extends BaseOpenRecentAction {
 }
 
 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");
+	static readonly ID = 'workbench.action.openIssueReporter';
+	static readonly LABEL = nls.localize({ key: 'reportIssueInEnglish', comment: ['Translate this to "Report Issue in English" in all languages please!'] }, "Report Issue");
 
 	constructor(
 		id: string,
@@ -861,15 +861,15 @@ export class OpenIssueReporterAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		return this.issueService.openReporter()
 			.then(() => true);
 	}
 }
 
 export class OpenProcessExplorer extends Action {
-	public static readonly ID = 'workbench.action.openProcessExplorer';
-	public static readonly LABEL = nls.localize('openProcessExplorer', "Open Process Explorer");
+	static readonly ID = 'workbench.action.openProcessExplorer';
+	static readonly LABEL = nls.localize('openProcessExplorer', "Open Process Explorer");
 
 	constructor(
 		id: string,
@@ -879,15 +879,15 @@ export class OpenProcessExplorer extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		return this.issueService.openProcessExplorer()
 			.then(() => true);
 	}
 }
 
 export class ReportPerformanceIssueUsingReporterAction extends Action {
-	public static readonly ID = 'workbench.action.reportPerformanceIssueUsingReporter';
-	public static readonly LABEL = nls.localize('reportPerformanceIssue', "Report Performance Issue");
+	static readonly ID = 'workbench.action.reportPerformanceIssueUsingReporter';
+	static readonly LABEL = nls.localize('reportPerformanceIssue', "Report Performance Issue");
 
 	constructor(
 		id: string,
@@ -897,7 +897,7 @@ export class ReportPerformanceIssueUsingReporterAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		// TODO: Reporter should send timings table as well
 		return this.issueService.openReporter({ issueType: IssueType.PerformanceIssue })
 			.then(() => true);
@@ -907,8 +907,8 @@ export class ReportPerformanceIssueUsingReporterAction extends Action {
 // NOTE: This is still used when running --prof-startup, which already opens a dialog, so the reporter is not used.
 export class ReportPerformanceIssueAction extends Action {
 
-	public static readonly ID = 'workbench.action.reportPerformanceIssue';
-	public static readonly LABEL = nls.localize('reportPerformanceIssue', "Report Performance Issue");
+	static readonly ID = 'workbench.action.reportPerformanceIssue';
+	static readonly LABEL = nls.localize('reportPerformanceIssue', "Report Performance Issue");
 
 	constructor(
 		id: string,
@@ -920,7 +920,7 @@ export class ReportPerformanceIssueAction extends Action {
 		super(id, label);
 	}
 
-	public run(appendix?: string): TPromise<boolean> {
+	run(appendix?: string): TPromise<boolean> {
 		this.integrityService.isPure().then(res => {
 			const issueUrl = this.generatePerformanceIssueUrl(product.reportIssueUrl, pkg.name, pkg.version, product.commit, product.date, res.isPure, appendix);
 
@@ -1027,11 +1027,11 @@ ${appendix}`
 
 export class KeybindingsReferenceAction extends Action {
 
-	public static readonly ID = 'workbench.action.keybindingsReference';
-	public static readonly LABEL = nls.localize('keybindingsReference', "Keyboard Shortcuts Reference");
+	static readonly ID = 'workbench.action.keybindingsReference';
+	static readonly LABEL = nls.localize('keybindingsReference', "Keyboard Shortcuts Reference");
 
 	private static readonly URL = isLinux ? product.keyboardShortcutsUrlLinux : isMacintosh ? product.keyboardShortcutsUrlMac : product.keyboardShortcutsUrlWin;
-	public static readonly AVAILABLE = !!KeybindingsReferenceAction.URL;
+	static readonly AVAILABLE = !!KeybindingsReferenceAction.URL;
 
 	constructor(
 		id: string,
@@ -1040,7 +1040,7 @@ export class KeybindingsReferenceAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<void> {
+	run(): TPromise<void> {
 		window.open(KeybindingsReferenceAction.URL);
 		return null;
 	}
@@ -1048,11 +1048,11 @@ export class KeybindingsReferenceAction extends Action {
 
 export class OpenDocumentationUrlAction extends Action {
 
-	public static readonly ID = 'workbench.action.openDocumentationUrl';
-	public static readonly LABEL = nls.localize('openDocumentationUrl', "Documentation");
+	static readonly ID = 'workbench.action.openDocumentationUrl';
+	static readonly LABEL = nls.localize('openDocumentationUrl', "Documentation");
 
 	private static readonly URL = product.documentationUrl;
-	public static readonly AVAILABLE = !!OpenDocumentationUrlAction.URL;
+	static readonly AVAILABLE = !!OpenDocumentationUrlAction.URL;
 
 	constructor(
 		id: string,
@@ -1061,7 +1061,7 @@ export class OpenDocumentationUrlAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<void> {
+	run(): TPromise<void> {
 		window.open(OpenDocumentationUrlAction.URL);
 		return null;
 	}
@@ -1069,11 +1069,11 @@ export class OpenDocumentationUrlAction extends Action {
 
 export class OpenIntroductoryVideosUrlAction extends Action {
 
-	public static readonly ID = 'workbench.action.openIntroductoryVideosUrl';
-	public static readonly LABEL = nls.localize('openIntroductoryVideosUrl', "Introductory Videos");
+	static readonly ID = 'workbench.action.openIntroductoryVideosUrl';
+	static readonly LABEL = nls.localize('openIntroductoryVideosUrl', "Introductory Videos");
 
 	private static readonly URL = product.introductoryVideosUrl;
-	public static readonly AVAILABLE = !!OpenIntroductoryVideosUrlAction.URL;
+	static readonly AVAILABLE = !!OpenIntroductoryVideosUrlAction.URL;
 
 	constructor(
 		id: string,
@@ -1082,7 +1082,7 @@ export class OpenIntroductoryVideosUrlAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<void> {
+	run(): TPromise<void> {
 		window.open(OpenIntroductoryVideosUrlAction.URL);
 		return null;
 	}
@@ -1090,11 +1090,11 @@ export class OpenIntroductoryVideosUrlAction extends Action {
 
 export class OpenTipsAndTricksUrlAction extends Action {
 
-	public static readonly ID = 'workbench.action.openTipsAndTricksUrl';
-	public static readonly LABEL = nls.localize('openTipsAndTricksUrl', "Tips and Tricks");
+	static readonly ID = 'workbench.action.openTipsAndTricksUrl';
+	static readonly LABEL = nls.localize('openTipsAndTricksUrl', "Tips and Tricks");
 
 	private static readonly URL = product.tipsAndTricksUrl;
-	public static readonly AVAILABLE = !!OpenTipsAndTricksUrlAction.URL;
+	static readonly AVAILABLE = !!OpenTipsAndTricksUrlAction.URL;
 
 	constructor(
 		id: string,
@@ -1103,7 +1103,7 @@ export class OpenTipsAndTricksUrlAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<void> {
+	run(): TPromise<void> {
 		window.open(OpenTipsAndTricksUrlAction.URL);
 		return null;
 	}
@@ -1141,7 +1141,7 @@ export abstract class BaseNavigationAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		const isEditorFocus = this.partService.hasFocus(Parts.EDITOR_PART);
 		const isPanelFocus = this.partService.hasFocus(Parts.PANEL_PART);
 		const isSidebarFocus = this.partService.hasFocus(Parts.SIDEBAR_PART);
@@ -1197,27 +1197,29 @@ export abstract class BaseNavigationAction extends Action {
 	}
 
 	protected navigateAcrossEditorGroup(direction: GroupDirection): TPromise<boolean> {
-		const nextGroup = this.editorGroupService.findGroup({ direction }, this.editorGroupService.activeGroup);
-		if (nextGroup) {
-			nextGroup.focus();
+		return this.doNavigateToEditorGroup({ direction });
+	}
+
+	protected navigateToEditorGroup(location: GroupLocation): TPromise<boolean> {
+		return this.doNavigateToEditorGroup({ location });
+	}
+
+	private doNavigateToEditorGroup(scope: IFindGroupScope): TPromise<boolean> {
+		const targetGroup = this.editorGroupService.findGroup(scope, this.editorGroupService.activeGroup);
+		if (targetGroup) {
+			targetGroup.focus();
 
 			return TPromise.as(true);
 		}
 
 		return TPromise.as(false);
 	}
-
-	protected navigateToActiveEditorGroup(): TPromise<boolean> {
-		this.editorGroupService.activeGroup.focus();
-
-		return TPromise.as(true);
-	}
 }
 
 export class NavigateLeftAction extends BaseNavigationAction {
 
-	public static readonly ID = 'workbench.action.navigateLeft';
-	public static readonly LABEL = nls.localize('navigateLeft', "Navigate to the View on the Left");
+	static readonly ID = 'workbench.action.navigateLeft';
+	static readonly LABEL = nls.localize('navigateLeft', "Navigate to the View on the Left");
 
 	constructor(
 		id: string,
@@ -1251,7 +1253,7 @@ export class NavigateLeftAction extends BaseNavigationAction {
 		}
 
 		if (!isPanelPositionDown) {
-			return this.navigateToActiveEditorGroup();
+			return this.navigateToEditorGroup(GroupLocation.LAST);
 		}
 
 		return TPromise.as(false);
@@ -1259,7 +1261,7 @@ export class NavigateLeftAction extends BaseNavigationAction {
 
 	protected navigateOnSidebarFocus(isSidebarPositionLeft: boolean, isPanelPositionDown: boolean): TPromise<boolean> {
 		if (!isSidebarPositionLeft) {
-			return this.navigateToActiveEditorGroup();
+			return this.navigateToEditorGroup(GroupLocation.LAST);
 		}
 
 		return TPromise.as(false);
@@ -1268,8 +1270,8 @@ export class NavigateLeftAction extends BaseNavigationAction {
 
 export class NavigateRightAction extends BaseNavigationAction {
 
-	public static readonly ID = 'workbench.action.navigateRight';
-	public static readonly LABEL = nls.localize('navigateRight', "Navigate to the View on the Right");
+	static readonly ID = 'workbench.action.navigateRight';
+	static readonly LABEL = nls.localize('navigateRight', "Navigate to the View on the Right");
 
 	constructor(
 		id: string,
@@ -1311,7 +1313,7 @@ export class NavigateRightAction extends BaseNavigationAction {
 
 	protected navigateOnSidebarFocus(isSidebarPositionLeft: boolean, isPanelPositionDown: boolean): TPromise<boolean> {
 		if (isSidebarPositionLeft) {
-			return this.navigateToActiveEditorGroup();
+			return this.navigateToEditorGroup(GroupLocation.FIRST);
 		}
 
 		return TPromise.as(false);
@@ -1320,8 +1322,8 @@ export class NavigateRightAction extends BaseNavigationAction {
 
 export class NavigateUpAction extends BaseNavigationAction {
 
-	public static readonly ID = 'workbench.action.navigateUp';
-	public static readonly LABEL = nls.localize('navigateUp', "Navigate to the View Above");
+	static readonly ID = 'workbench.action.navigateUp';
+	static readonly LABEL = nls.localize('navigateUp', "Navigate to the View Above");
 
 	constructor(
 		id: string,
@@ -1340,7 +1342,7 @@ export class NavigateUpAction extends BaseNavigationAction {
 
 	protected navigateOnPanelFocus(isSidebarPositionLeft: boolean, isPanelPositionDown: boolean): TPromise<boolean> {
 		if (isPanelPositionDown) {
-			return this.navigateToActiveEditorGroup();
+			return this.navigateToEditorGroup(GroupLocation.LAST);
 		}
 
 		return TPromise.as(false);
@@ -1349,8 +1351,8 @@ export class NavigateUpAction extends BaseNavigationAction {
 
 export class NavigateDownAction extends BaseNavigationAction {
 
-	public static readonly ID = 'workbench.action.navigateDown';
-	public static readonly LABEL = nls.localize('navigateDown', "Navigate to the View Below");
+	static readonly ID = 'workbench.action.navigateDown';
+	static readonly LABEL = nls.localize('navigateDown', "Navigate to the View Below");
 
 	constructor(
 		id: string,
@@ -1415,8 +1417,8 @@ export abstract class BaseResizeViewAction extends Action {
 
 export class IncreaseViewSizeAction extends BaseResizeViewAction {
 
-	public static readonly ID = 'workbench.action.increaseViewSize';
-	public static readonly LABEL = nls.localize('increaseViewSize', "Increase Current View Size");
+	static readonly ID = 'workbench.action.increaseViewSize';
+	static readonly LABEL = nls.localize('increaseViewSize', "Increase Current View Size");
 
 	constructor(
 		id: string,
@@ -1426,7 +1428,7 @@ export class IncreaseViewSizeAction extends BaseResizeViewAction {
 		super(id, label, partService);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		this.resizePart(BaseResizeViewAction.RESIZE_INCREMENT);
 		return TPromise.as(true);
 	}
@@ -1434,8 +1436,8 @@ export class IncreaseViewSizeAction extends BaseResizeViewAction {
 
 export class DecreaseViewSizeAction extends BaseResizeViewAction {
 
-	public static readonly ID = 'workbench.action.decreaseViewSize';
-	public static readonly LABEL = nls.localize('decreaseViewSize', "Decrease Current View Size");
+	static readonly ID = 'workbench.action.decreaseViewSize';
+	static readonly LABEL = nls.localize('decreaseViewSize', "Decrease Current View Size");
 
 	constructor(
 		id: string,
@@ -1446,7 +1448,7 @@ export class DecreaseViewSizeAction extends BaseResizeViewAction {
 		super(id, label, partService);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		this.resizePart(-BaseResizeViewAction.RESIZE_INCREMENT);
 		return TPromise.as(true);
 	}
@@ -1454,8 +1456,8 @@ export class DecreaseViewSizeAction extends BaseResizeViewAction {
 
 export class ShowPreviousWindowTab extends Action {
 
-	public static readonly ID = 'workbench.action.showPreviousWindowTab';
-	public static readonly LABEL = nls.localize('showPreviousTab', "Show Previous Window Tab");
+	static readonly ID = 'workbench.action.showPreviousWindowTab';
+	static readonly LABEL = nls.localize('showPreviousTab', "Show Previous Window Tab");
 
 	constructor(
 		id: string,
@@ -1465,15 +1467,15 @@ export class ShowPreviousWindowTab extends Action {
 		super(ShowPreviousWindowTab.ID, ShowPreviousWindowTab.LABEL);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		return this.windowsService.showPreviousWindowTab().then(() => true);
 	}
 }
 
 export class ShowNextWindowTab extends Action {
 
-	public static readonly ID = 'workbench.action.showNextWindowTab';
-	public static readonly LABEL = nls.localize('showNextWindowTab', "Show Next Window Tab");
+	static readonly ID = 'workbench.action.showNextWindowTab';
+	static readonly LABEL = nls.localize('showNextWindowTab', "Show Next Window Tab");
 
 	constructor(
 		id: string,
@@ -1483,15 +1485,15 @@ export class ShowNextWindowTab extends Action {
 		super(ShowNextWindowTab.ID, ShowNextWindowTab.LABEL);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		return this.windowsService.showNextWindowTab().then(() => true);
 	}
 }
 
 export class MoveWindowTabToNewWindow extends Action {
 
-	public static readonly ID = 'workbench.action.moveWindowTabToNewWindow';
-	public static readonly LABEL = nls.localize('moveWindowTabToNewWindow', "Move Window Tab to New Window");
+	static readonly ID = 'workbench.action.moveWindowTabToNewWindow';
+	static readonly LABEL = nls.localize('moveWindowTabToNewWindow', "Move Window Tab to New Window");
 
 	constructor(
 		id: string,
@@ -1501,15 +1503,15 @@ export class MoveWindowTabToNewWindow extends Action {
 		super(MoveWindowTabToNewWindow.ID, MoveWindowTabToNewWindow.LABEL);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		return this.windowsService.moveWindowTabToNewWindow().then(() => true);
 	}
 }
 
 export class MergeAllWindowTabs extends Action {
 
-	public static readonly ID = 'workbench.action.mergeAllWindowTabs';
-	public static readonly LABEL = nls.localize('mergeAllWindowTabs', "Merge All Windows");
+	static readonly ID = 'workbench.action.mergeAllWindowTabs';
+	static readonly LABEL = nls.localize('mergeAllWindowTabs', "Merge All Windows");
 
 	constructor(
 		id: string,
@@ -1519,15 +1521,15 @@ export class MergeAllWindowTabs extends Action {
 		super(MergeAllWindowTabs.ID, MergeAllWindowTabs.LABEL);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		return this.windowsService.mergeAllWindowTabs().then(() => true);
 	}
 }
 
 export class ToggleWindowTabsBar extends Action {
 
-	public static readonly ID = 'workbench.action.toggleWindowTabsBar';
-	public static readonly LABEL = nls.localize('toggleWindowTabsBar', "Toggle Window Tabs Bar");
+	static readonly ID = 'workbench.action.toggleWindowTabsBar';
+	static readonly LABEL = nls.localize('toggleWindowTabsBar', "Toggle Window Tabs Bar");
 
 	constructor(
 		id: string,
@@ -1537,15 +1539,130 @@ export class ToggleWindowTabsBar extends Action {
 		super(ToggleWindowTabsBar.ID, ToggleWindowTabsBar.LABEL);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		return this.windowsService.toggleWindowTabsBar().then(() => true);
 	}
 }
 
+export class OpenTwitterUrlAction extends Action {
+
+	static readonly ID = 'workbench.action.openTwitterUrl';
+	static LABEL = nls.localize('openTwitterUrl', "Join us on Twitter", product.applicationName);
+
+	constructor(
+		id: string,
+		label: string
+	) {
+		super(id, label);
+	}
+
+	run(): TPromise<boolean> {
+		if (product.twitterUrl) {
+			return TPromise.as(shell.openExternal(product.twitterUrl));
+		}
+
+		return TPromise.as(false);
+	}
+}
+
+export class OpenRequestFeatureUrlAction extends Action {
+
+	static readonly ID = 'workbench.action.openRequestFeatureUrl';
+	static LABEL = nls.localize('openUserVoiceUrl', "Search Feature Requests");
+
+	constructor(
+		id: string,
+		label: string
+	) {
+		super(id, label);
+	}
+
+	run(): TPromise<boolean> {
+		if (product.requestFeatureUrl) {
+			return TPromise.as(shell.openExternal(product.requestFeatureUrl));
+		}
+
+		return TPromise.as(false);
+	}
+}
+
+export class OpenLicenseUrlAction extends Action {
+
+	static readonly ID = 'workbench.action.openLicenseUrl';
+	static LABEL = nls.localize('openLicenseUrl', "View License");
+
+	constructor(
+		id: string,
+		label: string
+	) {
+		super(id, label);
+	}
+
+	run(): TPromise<boolean> {
+		if (product.licenseUrl) {
+			if (language) {
+				const queryArgChar = product.licenseUrl.indexOf('?') > 0 ? '&' : '?';
+				return TPromise.as(shell.openExternal(`${product.licenseUrl}${queryArgChar}lang=${language}`));
+			} else {
+				return TPromise.as(shell.openExternal(product.licenseUrl));
+			}
+		}
+
+		return TPromise.as(false);
+	}
+}
+
+
+export class OpenPrivacyStatementUrlAction extends Action {
+
+	static readonly ID = 'workbench.action.openPrivacyStatementUrl';
+	static LABEL = nls.localize('openPrivacyStatement', "Privacy Statement");
+
+	constructor(
+		id: string,
+		label: string
+	) {
+		super(id, label);
+	}
+
+	run(): TPromise<boolean> {
+		if (product.privacyStatementUrl) {
+			if (language) {
+				const queryArgChar = product.privacyStatementUrl.indexOf('?') > 0 ? '&' : '?';
+				return TPromise.as(shell.openExternal(`${product.privacyStatementUrl}${queryArgChar}lang=${language}`));
+			} else {
+				return TPromise.as(shell.openExternal(product.privacyStatementUrl));
+			}
+		}
+
+
+		return TPromise.as(false);
+	}
+}
+
+export class ShowAccessibilityOptionsAction extends Action {
+
+	static readonly ID = 'workbench.action.showAccessibilityOptions';
+	static LABEL = nls.localize('accessibilityOptions', "Accessibility Options");
+
+	constructor(
+		id: string,
+		label: string,
+		@IWindowsService private windowsService: IWindowsService
+	) {
+		super(id, label);
+	}
+
+	run(): TPromise<void> {
+		return this.windowsService.openAccessibilityOptions();
+	}
+}
+
+
 export class ShowAboutDialogAction extends Action {
 
-	public static readonly ID = 'workbench.action.showAboutDialog';
-	public static LABEL = nls.localize('about', "About {0}", product.applicationName);
+	static readonly ID = 'workbench.action.showAboutDialog';
+	static LABEL = nls.localize('about', "About {0}", product.applicationName);
 
 	constructor(
 		id: string,
@@ -1562,8 +1679,8 @@ export class ShowAboutDialogAction extends Action {
 
 export class InspectContextKeysAction extends Action {
 
-	public static readonly ID = 'workbench.action.inspectContextKeys';
-	public static LABEL = nls.localize('inspect context keys', "Inspect Context Keys");
+	static readonly ID = 'workbench.action.inspectContextKeys';
+	static LABEL = nls.localize('inspect context keys', "Inspect Context Keys");
 
 	constructor(
 		id: string,
diff --git a/src/vs/workbench/electron-browser/bootstrap/index.js b/src/vs/workbench/electron-browser/bootstrap/index.js
index 75f6dc4d7f6..692122631e7 100644
--- a/src/vs/workbench/electron-browser/bootstrap/index.js
+++ b/src/vs/workbench/electron-browser/bootstrap/index.js
@@ -81,6 +81,8 @@ function readFile(file) {
 	});
 }
 
+const writeFile = (file, content) => new Promise((c, e) => fs.writeFile(file, content, 'utf8', err => err ? e(err) : c()));
+
 function registerListeners(enableDeveloperTools) {
 
 	// Devtools & reload support
@@ -180,8 +182,15 @@ function main() {
 				let json = JSON.parse(content);
 				bundles[bundle] = json;
 				cb(undefined, json);
-			})
-				.catch(cb);
+			}).catch((error) => {
+				try {
+					if (nlsConfig._corruptedFile) {
+						writeFile(nlsConfig._corruptedFile, 'corrupted').catch(function (error) { console.error(error); });
+					}
+				} finally {
+					cb(error, undefined);
+				}
+			});
 		};
 	}
 
diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts
index b5b9b6e9ba1..6518e436b43 100644
--- a/src/vs/workbench/electron-browser/main.contribution.ts
+++ b/src/vs/workbench/electron-browser/main.contribution.ts
@@ -14,7 +14,7 @@ import { IConfigurationRegistry, Extensions as ConfigurationExtensions, Configur
 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, NavigateUpAction, NavigateDownAction, NavigateLeftAction, NavigateRightAction, IncreaseViewSizeAction, DecreaseViewSizeAction, ShowStartupPerformance, ToggleSharedProcessAction, QuickSwitchWindow, QuickOpenRecentAction, inRecentFilesPickerContextKey, ShowAboutDialogAction, InspectContextKeysAction, OpenProcessExplorer } from 'vs/workbench/electron-browser/actions';
+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, OpenProcessExplorer, OpenTwitterUrlAction, OpenRequestFeatureUrlAction, OpenPrivacyStatementUrlAction, OpenLicenseUrlAction, ShowAccessibilityOptionsAction } from 'vs/workbench/electron-browser/actions';
 import { registerCommands } from 'vs/workbench/electron-browser/commands';
 import { AddRootFolderAction, GlobalRemoveRootFolderAction, OpenWorkspaceAction, SaveWorkspaceAsAction, OpenWorkspaceConfigFileAction, DuplicateWorkspaceInNewWindowAction, OpenFileFolderAction, OpenFileAction, OpenFolderAction } from 'vs/workbench/browser/actions/workspaceActions';
 import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
@@ -22,9 +22,6 @@ import { inQuickOpenContext, getQuickNavigateHandler } from 'vs/workbench/browse
 import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-import { HistoryNavigationKeybindingsChangedContribution } from 'vs/workbench/electron-browser/removedKeybindingsContribution';
 
 // Contribute Commands
 registerCommands();
@@ -69,6 +66,11 @@ if (OpenTipsAndTricksUrlAction.AVAILABLE) {
 	workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenTipsAndTricksUrlAction, OpenTipsAndTricksUrlAction.ID, OpenTipsAndTricksUrlAction.LABEL), 'Help: Tips and Tricks', helpCategory);
 }
 
+workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenTwitterUrlAction, OpenTwitterUrlAction.ID, OpenTwitterUrlAction.LABEL), 'Help: Join us on Twitter', helpCategory);
+workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenRequestFeatureUrlAction, OpenRequestFeatureUrlAction.ID, OpenRequestFeatureUrlAction.LABEL), 'Help: Search Feature Requests', helpCategory);
+workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenLicenseUrlAction, OpenLicenseUrlAction.ID, OpenLicenseUrlAction.LABEL), 'Help: View License', helpCategory);
+workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenPrivacyStatementUrlAction, OpenPrivacyStatementUrlAction.ID, OpenPrivacyStatementUrlAction.LABEL), 'Help: Privacy Statement', helpCategory);
+workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ShowAccessibilityOptionsAction, ShowAccessibilityOptionsAction.ID, ShowAccessibilityOptionsAction.LABEL), 'Help: Accessibility Options', helpCategory);
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ShowAboutDialogAction, ShowAboutDialogAction.ID, ShowAboutDialogAction.LABEL), 'Help: About', helpCategory);
 
 workbenchActionsRegistry.registerWorkbenchAction(
@@ -109,10 +111,6 @@ workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(Global
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenWorkspaceAction, OpenWorkspaceAction.ID, OpenWorkspaceAction.LABEL), 'Workspaces: Open Workspace...', workspacesCategory);
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(SaveWorkspaceAsAction, SaveWorkspaceAsAction.ID, SaveWorkspaceAsAction.LABEL), 'Workspaces: Save Workspace As...', workspacesCategory);
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(DuplicateWorkspaceInNewWindowAction, DuplicateWorkspaceInNewWindowAction.ID, DuplicateWorkspaceInNewWindowAction.LABEL), 'Workspaces: Duplicate Workspace in New Window', workspacesCategory);
-// Support old command id
-CommandsRegistry.registerCommand('workbench.action.openFolderAsWorkspaceInNewWindow', serviceAccesor => {
-	serviceAccesor.get(IInstantiationService).createInstance(DuplicateWorkspaceInNewWindowAction, DuplicateWorkspaceInNewWindowAction.ID, DuplicateWorkspaceInNewWindowAction.LABEL).run();
-});
 
 CommandsRegistry.registerCommand(OpenWorkspaceConfigFileAction.ID, serviceAccessor => {
 	serviceAccessor.get(IInstantiationService).createInstance(OpenWorkspaceConfigFileAction, OpenWorkspaceConfigFileAction.ID, OpenWorkspaceConfigFileAction.LABEL).run();
@@ -305,13 +303,21 @@ configurationRegistry.registerConfiguration({
 		'workbench.settings.enableNaturalLanguageSearch': {
 			'type': 'boolean',
 			'description': nls.localize('enableNaturalLanguageSettingsSearch', "Controls whether to enable the natural language search mode for settings."),
-			'default': true
+			'default': true,
+			'scope': ConfigurationScope.WINDOW
 		},
 		'workbench.settings.settingsSearchTocBehavior': {
 			'type': 'string',
 			'enum': ['hide', 'filter', 'show'],
-			'description': nls.localize('settingsSearchTocBehavior', "Controls the behavior of the settings editor TOC while searching."),
-			'default': 'hide'
+			'description': nls.localize('settingsSearchTocBehavior', "Controls the behavior of the settings editor Table of Contents while searching."),
+			'default': 'hide',
+			'scope': ConfigurationScope.WINDOW
+		},
+		'workbench.settings.tocVisible': {
+			'type': 'boolean',
+			'description': nls.localize('settingsTocVisible', "Controls whether the settings editor Table of Contents is visible."),
+			'default': true,
+			'scope': ConfigurationScope.WINDOW
 		}
 	}
 });
@@ -509,5 +515,3 @@ configurationRegistry.registerConfiguration({
 		}
 	}
 });
-
-Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(HistoryNavigationKeybindingsChangedContribution, LifecyclePhase.Eventually);
diff --git a/src/vs/workbench/electron-browser/media/shell.css b/src/vs/workbench/electron-browser/media/shell.css
index 6748e7384c3..64869f0de97 100644
--- a/src/vs/workbench/electron-browser/media/shell.css
+++ b/src/vs/workbench/electron-browser/media/shell.css
@@ -69,11 +69,24 @@
 	padding: .5em 0;
 }
 
-.monaco-shell .monaco-menu .monaco-action-bar.vertical .action-label,
+.monaco-shell .monaco-menu .monaco-action-bar.vertical .action-label:not(.separator),
 .monaco-shell .monaco-menu .monaco-action-bar.vertical .keybinding {
 	padding: 0.5em 2em;
 }
 
+.monaco-shell .monaco-menu .monaco-action-bar.vertical .action-label.separator {
+	padding: 0.2em 0 0 0;
+	margin-bottom: 0.2em;
+}
+
+.monaco-shell .monaco-menu .monaco-action-bar.vertical .submenu-indicator {
+	padding: 0.5em 1em;
+}
+
+.monaco-shell .monaco-menu .action-item {
+	cursor: default;
+}
+
 /* START Keyboard Focus Indication Styles */
 
 .monaco-shell [tabindex="0"]:focus,
diff --git a/src/vs/workbench/electron-browser/resources.ts b/src/vs/workbench/electron-browser/resources.ts
index fce07d4794d..0c204a94463 100644
--- a/src/vs/workbench/electron-browser/resources.ts
+++ b/src/vs/workbench/electron-browser/resources.ts
@@ -8,19 +8,20 @@
 import URI from 'vs/base/common/uri';
 import * as objects from 'vs/base/common/objects';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { ParsedExpression, IExpression, parse } from 'vs/base/common/glob';
 import { relative } from 'path';
 import { normalize } from 'vs/base/common/paths';
 
-export class ResourceGlobMatcher {
+export class ResourceGlobMatcher extends Disposable {
 
 	private static readonly NO_ROOT: string = null;
 
-	private readonly _onExpressionChange: Emitter<void>;
-	private toUnbind: IDisposable[];
+	private readonly _onExpressionChange: Emitter<void> = this._register(new Emitter<void>());
+	get onExpressionChange(): Event<void> { return this._onExpressionChange.event; }
+
 	private mapRootToParsedExpression: Map<string, ParsedExpression>;
 	private mapRootToExpressionConfig: Map<string, IExpression>;
 
@@ -30,30 +31,24 @@ export class ResourceGlobMatcher {
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IConfigurationService private configurationService: IConfigurationService
 	) {
-		this.toUnbind = [];
+		super();
 
 		this.mapRootToParsedExpression = new Map<string, ParsedExpression>();
 		this.mapRootToExpressionConfig = new Map<string, IExpression>();
 
-		this._onExpressionChange = new Emitter<void>();
-		this.toUnbind.push(this._onExpressionChange);
-
 		this.updateExcludes(false);
 
 		this.registerListeners();
 	}
 
-	public get onExpressionChange(): Event<void> {
-		return this._onExpressionChange.event;
-	}
-
 	private registerListeners(): void {
-		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => {
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
 			if (this.shouldUpdate(e)) {
 				this.updateExcludes(true);
 			}
 		}));
-		this.toUnbind.push(this.contextService.onDidChangeWorkspaceFolders(() => this.updateExcludes(true)));
+
+		this._register(this.contextService.onDidChangeWorkspaceFolders(() => this.updateExcludes(true)));
 	}
 
 	private updateExcludes(fromEvent: boolean): void {
@@ -98,7 +93,7 @@ export class ResourceGlobMatcher {
 		}
 	}
 
-	public matches(resource: URI): boolean {
+	matches(resource: URI): boolean {
 		const folder = this.contextService.getWorkspaceFolder(resource);
 
 		let expressionForRoot: ParsedExpression;
@@ -121,8 +116,4 @@ export class ResourceGlobMatcher {
 
 		return !!expressionForRoot(resourcePathToMatch);
 	}
-
-	public dispose(): void {
-		this.toUnbind = dispose(this.toUnbind);
-	}
 }
\ 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 e4320501ecd..1096104def6 100644
--- a/src/vs/workbench/electron-browser/shell.ts
+++ b/src/vs/workbench/electron-browser/shell.ts
@@ -10,7 +10,7 @@ import 'vs/css!./media/shell';
 import * as platform from 'vs/base/common/platform';
 import * as perf from 'vs/base/common/performance';
 import * as aria from 'vs/base/browser/ui/aria/aria';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
 import * as errors from 'vs/base/common/errors';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import product from 'vs/platform/node/product';
@@ -20,7 +20,6 @@ import { ContextViewService } from 'vs/platform/contextview/browser/contextViewS
 import { Workbench, IWorkbenchStartedInfo } from 'vs/workbench/electron-browser/workbench';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { NullTelemetryService, configurationTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IExperimentService, ExperimentService } from 'vs/platform/telemetry/common/experiments';
 import { ITelemetryAppenderChannel, TelemetryAppenderClient } from 'vs/platform/telemetry/common/telemetryIpc';
 import { TelemetryService, ITelemetryServiceConfig } from 'vs/platform/telemetry/common/telemetryService';
 import ErrorTelemetry from 'vs/platform/telemetry/browser/errorTelemetry';
@@ -117,7 +116,7 @@ export interface ICoreServices {
  * The workbench shell contains the workbench with a rich header containing navigation and the activity bar.
  * With the Shell being the top level element in the page, it is also responsible for driving the layouting.
  */
-export class WorkbenchShell {
+export class WorkbenchShell extends Disposable {
 	private storageService: IStorageService;
 	private environmentService: IEnvironmentService;
 	private logService: ILogService;
@@ -125,7 +124,6 @@ export class WorkbenchShell {
 	private configurationService: IConfigurationService;
 	private contextService: IWorkspaceContextService;
 	private telemetryService: ITelemetryService;
-	private experimentService: IExperimentService;
 	private extensionService: ExtensionService;
 	private broadcastService: IBroadcastService;
 	private timerService: ITimerService;
@@ -135,7 +133,6 @@ export class WorkbenchShell {
 	private notificationService: INotificationService;
 
 	private container: HTMLElement;
-	private toUnbind: IDisposable[];
 	private previousErrorValue: string;
 	private previousErrorTime: number;
 	private content: HTMLElement;
@@ -145,6 +142,8 @@ export class WorkbenchShell {
 	private workbench: Workbench;
 
 	constructor(container: HTMLElement, coreServices: ICoreServices, mainProcessServices: ServiceCollection, private mainProcessClient: IPCClient, configuration: IWindowConfiguration) {
+		super();
+
 		this.container = container;
 
 		this.configuration = configuration;
@@ -158,7 +157,6 @@ export class WorkbenchShell {
 
 		this.mainProcessServices = mainProcessServices;
 
-		this.toUnbind = [];
 		this.previousErrorTime = 0;
 	}
 
@@ -178,7 +176,7 @@ export class WorkbenchShell {
 		this.workbench = this.createWorkbench(instantiationService, serviceCollection, parent, workbenchContainer);
 
 		// Window
-		this.workbench.getInstantiationService().createInstance(ElectronWindow, this.container);
+		this.workbench.getInstantiationService().createInstance(ElectronWindow);
 
 		// Handle case where workbench is not starting up properly
 		const timeoutHandle = setTimeout(() => {
@@ -213,13 +211,12 @@ export class WorkbenchShell {
 					eventuallPhaseTimeoutHandle = void 0;
 					this.lifecycleService.phase = LifecyclePhase.Eventually;
 				}, 3000);
-				this.toUnbind.push({
-					dispose: () => {
-						if (eventuallPhaseTimeoutHandle) {
-							clearTimeout(eventuallPhaseTimeoutHandle);
-						}
+
+				this._register(toDisposable(() => {
+					if (eventuallPhaseTimeoutHandle) {
+						clearTimeout(eventuallPhaseTimeoutHandle);
 					}
-				});
+				}));
 
 				// localStorage metrics (TODO@Ben remove me later)
 				if (!this.environmentService.extensionTestsPath && this.contextService.getWorkbenchState() === WorkbenchState.FOLDER) {
@@ -254,7 +251,6 @@ export class WorkbenchShell {
 				"customKeybindingsCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 				"theme": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 				"language": { "classification": "SystemMetaData", "purpose": "BusinessInsight" },
-				"experiments": { "${inline}": [ "${IExperiments}" ] },
 				"pinnedViewlets": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 				"restoredViewlet": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 				"restoredEditors": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
@@ -272,7 +268,6 @@ export class WorkbenchShell {
 			customKeybindingsCount: info.customKeybindingsCount,
 			theme: this.themeService.getColorTheme().id,
 			language: platform.language,
-			experiments: this.experimentService.getExperiments(),
 			pinnedViewlets: info.pinnedViewlets,
 			restoredViewlet: info.restoredViewlet,
 			restoredEditors: info.restoredEditorsCount,
@@ -335,8 +330,7 @@ export class WorkbenchShell {
 		serviceCollection.set(IWorkspaceContextService, this.contextService);
 		serviceCollection.set(IConfigurationService, this.configurationService);
 		serviceCollection.set(IEnvironmentService, this.environmentService);
-		serviceCollection.set(ILogService, this.logService);
-		this.toUnbind.push(this.logService);
+		serviceCollection.set(ILogService, this._register(this.logService));
 
 		serviceCollection.set(ITimerService, this.timerService);
 		serviceCollection.set(IStorageService, this.storageService);
@@ -367,10 +361,6 @@ export class WorkbenchShell {
 		// Hash
 		serviceCollection.set(IHashService, new SyncDescriptor(HashService));
 
-		// Experiments
-		this.experimentService = instantiationService.createInstance(ExperimentService);
-		serviceCollection.set(IExperimentService, this.experimentService);
-
 		// Telemetry
 		if (this.environmentService.isBuilt && !this.environmentService.isExtensionDevelopment && !this.environmentService.args['disable-telemetry'] && !!product.enableTelemetry) {
 			const channel = getDelayedChannel<ITelemetryAppenderChannel>(sharedProcess.then(c => c.getChannel('telemetryAppender')));
@@ -383,18 +373,14 @@ export class WorkbenchShell {
 				piiPaths: [this.environmentService.appRoot, this.environmentService.extensionsPath]
 			};
 
-			const telemetryService = instantiationService.createInstance(TelemetryService, config);
-			this.telemetryService = telemetryService;
-
-			const errorTelemetry = new ErrorTelemetry(telemetryService);
-
-			this.toUnbind.push(telemetryService, errorTelemetry);
+			this.telemetryService = this._register(instantiationService.createInstance(TelemetryService, config));
+			this._register(new ErrorTelemetry(this.telemetryService));
 		} else {
 			this.telemetryService = NullTelemetryService;
 		}
 
 		serviceCollection.set(ITelemetryService, this.telemetryService);
-		this.toUnbind.push(configurationTelemetry(this.telemetryService, this.configurationService));
+		this._register(configurationTelemetry(this.telemetryService, this.configurationService));
 
 		let crashReporterService = NullCrashReporterService;
 		if (!this.environmentService.disableCrashReporter && product.crashReporter && product.hockeyApp) {
@@ -405,7 +391,7 @@ export class WorkbenchShell {
 		serviceCollection.set(IDialogService, instantiationService.createInstance(DialogService));
 
 		const lifecycleService = instantiationService.createInstance(LifecycleService);
-		this.toUnbind.push(lifecycleService.onShutdown(reason => this.dispose(reason)));
+		this._register(lifecycleService.onShutdown(reason => this.dispose(reason)));
 		serviceCollection.set(ILifecycleService, lifecycleService);
 		this.lifecycleService = lifecycleService;
 
@@ -414,9 +400,8 @@ export class WorkbenchShell {
 		serviceCollection.set(IExtensionManagementServerService, new SyncDescriptor(ExtensionManagementServerService, extensionManagementChannelClient));
 		serviceCollection.set(IExtensionManagementService, new SyncDescriptor(MulitExtensionManagementService));
 
-		const extensionEnablementService = instantiationService.createInstance(ExtensionEnablementService);
+		const extensionEnablementService = this._register(instantiationService.createInstance(ExtensionEnablementService));
 		serviceCollection.set(IExtensionEnablementService, extensionEnablementService);
-		this.toUnbind.push(extensionEnablementService);
 
 		serviceCollection.set(IRequestService, new SyncDescriptor(RequestService));
 
@@ -468,7 +453,16 @@ export class WorkbenchShell {
 		return [instantiationService, serviceCollection];
 	}
 
-	public open(): void {
+	open(): void {
+
+		// Listen on unhandled rejection events
+		window.addEventListener('unhandledrejection', (event) => {
+			// See https://developer.mozilla.org/en-US/docs/Web/API/PromiseRejectionEvent
+			errors.onUnexpectedError((<any>event).reason);
+
+			// Prevent the printing of this event to the console
+			event.preventDefault();
+		});
 
 		// Listen on unexpected errors
 		errors.setUnexpectedErrorHandler((error: any) => {
@@ -496,14 +490,14 @@ export class WorkbenchShell {
 	private registerListeners(): void {
 
 		// Resize
-		this.toUnbind.push(addDisposableListener(window, EventType.RESIZE, e => {
+		this._register(addDisposableListener(window, EventType.RESIZE, e => {
 			if (e.target === window) {
 				this.layout();
 			}
 		}));
 	}
 
-	public onUnexpectedError(error: any): void {
+	onUnexpectedError(error: any): void {
 		const errorMsg = toErrorMessage(error, true);
 		if (!errorMsg) {
 			return;
@@ -536,10 +530,8 @@ export class WorkbenchShell {
 		this.workbench.layout();
 	}
 
-	public dispose(reason = ShutdownReason.QUIT): void {
-
-		// Dispose bindings
-		this.toUnbind = dispose(this.toUnbind);
+	dispose(reason = ShutdownReason.QUIT): void {
+		super.dispose();
 
 		// Keep font info for next startup around
 		saveFontInfo(this.storageService);
diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts
index 4552d8a7555..a87a8f73f31 100644
--- a/src/vs/workbench/electron-browser/window.ts
+++ b/src/vs/workbench/electron-browser/window.ts
@@ -8,14 +8,13 @@
 import * as nls from 'vs/nls';
 import URI from 'vs/base/common/uri';
 import * as errors from 'vs/base/common/errors';
-import * as types from 'vs/base/common/types';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as arrays from 'vs/base/common/arrays';
 import * as objects from 'vs/base/common/objects';
 import * as DOM from 'vs/base/browser/dom';
 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 { IFileService } from 'vs/platform/files/common/files';
 import { toResource, IUntitledResourceInput } from 'vs/workbench/common/editor';
 import { IEditorService, IResourceEditor } from 'vs/workbench/services/editor/common/editorService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -38,7 +37,6 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { fillInActionBarActions } from 'vs/platform/actions/browser/menuItemActionItem';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { LifecyclePhase, ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
 import { IIntegrityService } from 'vs/platform/integrity/common/integrity';
@@ -60,8 +58,6 @@ const TextInputActions: IAction[] = [
 
 export class ElectronWindow extends Themable {
 
-	private static readonly AUTO_SAVE_SETTING = 'files.autoSave';
-
 	private touchBarMenu: IMenu;
 	private touchBarUpdater: RunOnceScheduler;
 	private touchBarDisposables: IDisposable[];
@@ -73,7 +69,6 @@ export class ElectronWindow extends Themable {
 	private pendingFoldersToAdd: IAddFoldersRequest[];
 
 	constructor(
-		shellContainer: HTMLElement,
 		@IEditorService private editorService: EditorServiceImpl,
 		@IWindowsService private windowsService: IWindowsService,
 		@IWindowService private windowService: IWindowService,
@@ -97,8 +92,7 @@ export class ElectronWindow extends Themable {
 		this.touchBarDisposables = [];
 
 		this.pendingFoldersToAdd = [];
-		this.addFoldersScheduler = new RunOnceScheduler(() => this.doAddFolders(), 100);
-		this.toUnbind.push(this.addFoldersScheduler);
+		this.addFoldersScheduler = this._register(new RunOnceScheduler(() => this.doAddFolders(), 100));
 
 		this.registerListeners();
 		this.create();
@@ -107,7 +101,7 @@ export class ElectronWindow extends Themable {
 	private registerListeners(): void {
 
 		// React to editor input changes
-		this.toUnbind.push(this.editorService.onDidActiveEditorChange(() => this.updateTouchbarMenu()));
+		this._register(this.editorService.onDidActiveEditorChange(() => this.updateTouchbarMenu()));
 
 		// prevent opening a real URL inside the shell
 		[DOM.EventType.DRAG_OVER, DOM.EventType.DROP].forEach(event => {
@@ -183,11 +177,6 @@ export class ElectronWindow extends Themable {
 			this.notificationService.info(message);
 		});
 
-		// Support toggling auto save
-		ipc.on('vscode.toggleAutoSave', () => {
-			this.toggleAutoSave();
-		});
-
 		// Fullscreen Events
 		ipc.on('vscode:enterFullScreen', () => {
 			this.lifecycleService.when(LifecyclePhase.Running).then(() => {
@@ -232,7 +221,7 @@ export class ElectronWindow extends Themable {
 
 		// Zoom level changes
 		this.updateWindowZoomLevel();
-		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => {
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('window.zoomLevel')) {
 				this.updateWindowZoomLevel();
 			}
@@ -246,12 +235,12 @@ export class ElectronWindow extends Themable {
 		if (e.target instanceof HTMLElement) {
 			const target = <HTMLElement>e.target;
 			if (target.nodeName && (target.nodeName.toLowerCase() === 'input' || target.nodeName.toLowerCase() === 'textarea')) {
-				e.preventDefault();
-				e.stopPropagation();
+				DOM.EventHelper.stop(e, true);
 
 				this.contextMenuService.showContextMenu({
 					getAnchor: () => e,
-					getActions: () => TPromise.as(TextInputActions)
+					getActions: () => TPromise.as(TextInputActions),
+					onHide: () => target.focus() // fixes https://github.com/Microsoft/vscode/issues/52948
 				});
 			}
 		}
@@ -509,24 +498,7 @@ export class ElectronWindow extends Themable {
 		});
 	}
 
-	private toggleAutoSave(): void {
-		const setting = this.configurationService.inspect(ElectronWindow.AUTO_SAVE_SETTING);
-		let userAutoSaveConfig = setting.user;
-		if (types.isUndefinedOrNull(userAutoSaveConfig)) {
-			userAutoSaveConfig = setting.default; // use default if setting not defined
-		}
-
-		let newAutoSaveValue: string;
-		if ([AutoSaveConfiguration.AFTER_DELAY, AutoSaveConfiguration.ON_FOCUS_CHANGE, AutoSaveConfiguration.ON_WINDOW_CHANGE].some(s => s === userAutoSaveConfig)) {
-			newAutoSaveValue = AutoSaveConfiguration.OFF;
-		} else {
-			newAutoSaveValue = AutoSaveConfiguration.AFTER_DELAY;
-		}
-
-		this.configurationService.updateValue(ElectronWindow.AUTO_SAVE_SETTING, newAutoSaveValue, ConfigurationTarget.USER);
-	}
-
-	public dispose(): void {
+	dispose(): void {
 		this.touchBarDisposables = dispose(this.touchBarDisposables);
 
 		super.dispose();
diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts
index ac68914351a..7191ec03a8c 100644
--- a/src/vs/workbench/electron-browser/workbench.ts
+++ b/src/vs/workbench/electron-browser/workbench.ts
@@ -233,7 +233,7 @@ export class Workbench extends Disposable implements IPartService {
 	private inZenMode: IContextKey<boolean>;
 	private sideBarVisibleContext: IContextKey<boolean>;
 
-	private closeEmptyWindowScheduler: RunOnceScheduler = new RunOnceScheduler(() => this.onAllEditorsClosed(), 50);
+	private closeEmptyWindowScheduler: RunOnceScheduler = this._register(new RunOnceScheduler(() => this.onAllEditorsClosed(), 50));
 
 	constructor(
 		private parent: HTMLElement,
@@ -1205,7 +1205,7 @@ export class Workbench extends Disposable implements IPartService {
 	getTitleBarOffset(): number {
 		let offset = 0;
 		if (this.isVisible(Parts.TITLEBAR_PART)) {
-			offset = 22 / browser.getZoomFactor(); // adjust the position based on title bar size and zoom factor
+			offset = this.workbenchLayout.partLayoutInfo.titlebar.height;
 		}
 
 		return offset;
diff --git a/src/vs/workbench/node/extensionHostMain.ts b/src/vs/workbench/node/extensionHostMain.ts
index 4008bae8e48..6bf7a628602 100644
--- a/src/vs/workbench/node/extensionHostMain.ts
+++ b/src/vs/workbench/node/extensionHostMain.ts
@@ -41,8 +41,8 @@ function patchProcess(allowExit: boolean) {
 		console.warn(err.stack);
 	};
 }
+
 export function exit(code?: number) {
-	// TODO@electron
 	// See https://github.com/Microsoft/vscode/issues/32990
 	// calling process.exit() does not exit the process when the process is being debugged
 	// It waits for the debugger to disconnect, but in our version, the debugger does not
@@ -126,6 +126,7 @@ export class ExtensionHostMain {
 				return `${error.name || 'Error'}: ${error.message || ''}${stackTraceMessage}`;
 			};
 		});
+
 		const mainThreadExtensions = rpcProtocol.getProxy(MainContext.MainThreadExtensionService);
 		const mainThreadErrors = rpcProtocol.getProxy(MainContext.MainThreadErrors);
 		errors.setUnexpectedErrorHandler(err => {
@@ -137,14 +138,9 @@ export class ExtensionHostMain {
 				mainThreadErrors.$onUnexpectedError(data);
 			}
 		});
-
-		// Configure the watchdog to kill our process if the JS event loop is unresponsive for more than 10s
-		// if (!initData.environment.isExtensionDevelopmentDebug) {
-		// 	watchdog.start(10000);
-		// }
 	}
 
-	public start(): TPromise<void> {
+	start(): TPromise<void> {
 		return this._extensionService.onExtensionAPIReady()
 			.then(() => this.handleEagerExtensions())
 			.then(() => this.handleExtensionTests())
@@ -153,7 +149,7 @@ export class ExtensionHostMain {
 			});
 	}
 
-	public terminate(): void {
+	terminate(): void {
 		if (this._isTerminating) {
 			// we are already shutting down...
 			return;
@@ -168,9 +164,9 @@ export class ExtensionHostMain {
 
 		let allPromises: TPromise<void>[] = [];
 		try {
-			let allExtensions = this._extensionService.getAllExtensionDescriptions();
-			let allExtensionsIds = allExtensions.map(ext => ext.id);
-			let activatedExtensions = allExtensionsIds.filter(id => this._extensionService.isActivated(id));
+			const allExtensions = this._extensionService.getAllExtensionDescriptions();
+			const allExtensionsIds = allExtensions.map(ext => ext.id);
+			const activatedExtensions = allExtensionsIds.filter(id => this._extensionService.isActivated(id));
 
 			allPromises = activatedExtensions.map((extensionId) => {
 				return this._extensionService.deactivate(extensionId);
@@ -179,7 +175,7 @@ export class ExtensionHostMain {
 			// TODO: write to log once we have one
 		}
 
-		let extensionsDeactivated = TPromise.join(allPromises).then<void>(() => void 0);
+		const extensionsDeactivated = TPromise.join(allPromises).then<void>(() => void 0);
 
 		// Give extensions 1 second to wrap up any async dispose, then exit
 		setTimeout(() => {
@@ -192,6 +188,7 @@ export class ExtensionHostMain {
 		this._extensionService.activateByEvent('*', true).then(null, (err) => {
 			console.error(err);
 		});
+
 		return this.handleWorkspaceContainsEagerExtensions();
 	}
 
@@ -208,7 +205,7 @@ export class ExtensionHostMain {
 	}
 
 	private handleWorkspaceContainsEagerExtension(desc: IExtensionDescription): TPromise<void> {
-		let activationEvents = desc.activationEvents;
+		const activationEvents = desc.activationEvents;
 		if (!activationEvents) {
 			return TPromise.as(void 0);
 		}
@@ -218,7 +215,7 @@ export class ExtensionHostMain {
 
 		for (let i = 0; i < activationEvents.length; i++) {
 			if (/^workspaceContains:/.test(activationEvents[i])) {
-				let fileNameOrGlob = activationEvents[i].substr('workspaceContains:'.length);
+				const fileNameOrGlob = activationEvents[i].substr('workspaceContains:'.length);
 				if (fileNameOrGlob.indexOf('*') >= 0 || fileNameOrGlob.indexOf('?') >= 0) {
 					globPatterns.push(fileNameOrGlob);
 				} else {
@@ -231,15 +228,15 @@ export class ExtensionHostMain {
 			return TPromise.as(void 0);
 		}
 
-		let fileNamePromise = TPromise.join(fileNames.map((fileName) => this.activateIfFileName(desc.id, fileName))).then(() => { });
-		let globPatternPromise = this.activateIfGlobPatterns(desc.id, globPatterns);
+		const fileNamePromise = TPromise.join(fileNames.map((fileName) => this.activateIfFileName(desc.id, fileName))).then(() => { });
+		const globPatternPromise = this.activateIfGlobPatterns(desc.id, globPatterns);
 
 		return TPromise.join([fileNamePromise, globPatternPromise]).then(() => { });
 	}
 
-	private async activateIfFileName(extensionId: string, fileName: string): TPromise<void> {
-		// find exact path
+	private async activateIfFileName(extensionId: string, fileName: string): Promise<void> {
 
+		// find exact path
 		for (const { uri } of this._workspace.folders) {
 			if (await pfs.exists(join(URI.revive(uri).fsPath, fileName))) {
 				// the file was found
@@ -253,7 +250,7 @@ export class ExtensionHostMain {
 		return undefined;
 	}
 
-	private async activateIfGlobPatterns(extensionId: string, globPatterns: string[]): TPromise<void> {
+	private async activateIfGlobPatterns(extensionId: string, globPatterns: string[]): Promise<void> {
 		this._extHostLogService.trace(`extensionHostMain#activateIfGlobPatterns: fileSearch, extension: ${extensionId}, entryPoint: workspaceContains`);
 
 		if (globPatterns.length === 0) {
@@ -265,7 +262,7 @@ export class ExtensionHostMain {
 			this._diskSearch = new DiskSearch(false, 1000);
 		}
 
-		let includes: glob.IExpression = {};
+		const includes: glob.IExpression = {};
 		globPatterns.forEach((globPattern) => {
 			includes[globPattern] = true;
 		});
@@ -284,7 +281,7 @@ export class ExtensionHostMain {
 			ignoreSymlinks: !followSymlinks
 		};
 
-		let result = await this._diskSearch.search(query);
+		const result = await this._diskSearch.search(query);
 		if (result.limitHit) {
 			// a file was found matching one of the glob patterns
 			return (
diff --git a/src/vs/workbench/node/extensionHostProcess.ts b/src/vs/workbench/node/extensionHostProcess.ts
index fb05c3f3c2e..9035333b54f 100644
--- a/src/vs/workbench/node/extensionHostProcess.ts
+++ b/src/vs/workbench/node/extensionHostProcess.ts
@@ -13,7 +13,7 @@ import { Protocol } from 'vs/base/parts/ipc/node/ipc.net';
 import { createConnection } from 'net';
 import { Event, filterEvent } from 'vs/base/common/event';
 
-// TODO@ben: with Electron 2.x and node.js 8.x the "natives" module
+// With Electron 2.x and node.js 8.x the "natives" module
 // can cause a native crash (see https://github.com/nodejs/node/issues/19891 and
 // https://github.com/electron/electron/issues/10905). To prevent this from
 // happening we essentially blocklist this module from getting loaded in any
diff --git a/src/vs/workbench/parts/backup/common/backupModelTracker.ts b/src/vs/workbench/parts/backup/common/backupModelTracker.ts
index d4b296540d1..df13305cd8d 100644
--- a/src/vs/workbench/parts/backup/common/backupModelTracker.ts
+++ b/src/vs/workbench/parts/backup/common/backupModelTracker.ts
@@ -8,7 +8,7 @@
 import Uri from 'vs/base/common/uri';
 import * as errors from 'vs/base/common/errors';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { ITextFileService, TextFileModelChangeEvent, StateChange } from 'vs/workbench/services/textfile/common/textfiles';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
@@ -17,12 +17,11 @@ import { IFilesConfiguration, AutoSaveConfiguration, CONTENT_CHANGE_EVENT_BUFFER
 
 const AUTO_SAVE_AFTER_DELAY_DISABLED_TIME = CONTENT_CHANGE_EVENT_BUFFER_DELAY + 500;
 
-export class BackupModelTracker implements IWorkbenchContribution {
+export class BackupModelTracker extends Disposable implements IWorkbenchContribution {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private configuredAutoSaveAfterDelay: boolean;
-	private toDispose: IDisposable[];
 
 	constructor(
 		@IBackupFileService private backupFileService: IBackupFileService,
@@ -30,7 +29,7 @@ export class BackupModelTracker implements IWorkbenchContribution {
 		@IUntitledEditorService private untitledEditorService: IUntitledEditorService,
 		@IConfigurationService private configurationService: IConfigurationService
 	) {
-		this.toDispose = [];
+		super();
 
 		this.registerListeners();
 	}
@@ -38,16 +37,16 @@ export class BackupModelTracker implements IWorkbenchContribution {
 	private registerListeners() {
 
 		// Listen for text file model changes
-		this.toDispose.push(this.textFileService.models.onModelContentChanged((e) => this.onTextFileModelChanged(e)));
-		this.toDispose.push(this.textFileService.models.onModelSaved((e) => this.discardBackup(e.resource)));
-		this.toDispose.push(this.textFileService.models.onModelDisposed((e) => this.discardBackup(e)));
+		this._register(this.textFileService.models.onModelContentChanged((e) => this.onTextFileModelChanged(e)));
+		this._register(this.textFileService.models.onModelSaved((e) => this.discardBackup(e.resource)));
+		this._register(this.textFileService.models.onModelDisposed((e) => this.discardBackup(e)));
 
 		// Listen for untitled model changes
-		this.toDispose.push(this.untitledEditorService.onDidChangeContent((e) => this.onUntitledModelChanged(e)));
-		this.toDispose.push(this.untitledEditorService.onDidDisposeModel((e) => this.discardBackup(e)));
+		this._register(this.untitledEditorService.onDidChangeContent((e) => this.onUntitledModelChanged(e)));
+		this._register(this.untitledEditorService.onDidDisposeModel((e) => this.discardBackup(e)));
 
 		// Listen to config changes
-		this.toDispose.push(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChange(this.configurationService.getValue<IFilesConfiguration>())));
+		this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChange(this.configurationService.getValue<IFilesConfiguration>())));
 	}
 
 	private onConfigurationChange(configuration: IFilesConfiguration): void {
@@ -85,8 +84,4 @@ export class BackupModelTracker implements IWorkbenchContribution {
 	private discardBackup(resource: Uri): void {
 		this.backupFileService.discardResourceBackup(resource).done(null, errors.onUnexpectedError);
 	}
-
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
-	}
 }
\ No newline at end of file
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 5e754fb953d..d4526043633 100644
--- a/src/vs/workbench/parts/cli/electron-browser/cli.contribution.ts
+++ b/src/vs/workbench/parts/cli/electron-browser/cli.contribution.ts
@@ -29,12 +29,13 @@ let _source: string = null;
 function getSource(): string {
 	if (!_source) {
 		const root = URI.parse(require.toUrl('')).fsPath;
-		_source = path.resolve(root, '..', 'bin', 'code');
+		_source = path.resolve(root, '..', 'resources', 'darwin', 'bin', 'code.sh');
 	}
 	return _source;
 }
 
 function isAvailable(): TPromise<boolean> {
+	console.log(getSource());
 	return pfs.exists(getSource());
 }
 
@@ -70,20 +71,16 @@ class InstallAction extends Action {
 					if (!isAvailable || isInstalled) {
 						return TPromise.as(null);
 					} else {
-						const createSymlink = () => {
-							return pfs.unlink(this.target)
-								.then(null, ignore('ENOENT'))
-								.then(() => pfs.symlink(getSource(), this.target));
-						};
+						return pfs.unlink(this.target)
+							.then(null, ignore('ENOENT'))
+							.then(() => pfs.symlink(getSource(), this.target))
+							.then(null, err => {
+								if (err.code === 'EACCES' || err.code === 'ENOENT') {
+									return this.createBinFolderAndSymlinkAsAdmin();
+								}
 
-						return createSymlink().then(null, err => {
-							if (err.code === 'EACCES' || err.code === 'ENOENT') {
-								return this.createBinFolder()
-									.then(() => createSymlink());
-							}
-
-							return TPromise.wrapError(err);
-						});
+								return TPromise.wrapError(err);
+							});
 					}
 				})
 				.then(() => {
@@ -101,14 +98,14 @@ class InstallAction extends Action {
 			.then(null, ignore('ENOENT', false));
 	}
 
-	private createBinFolder(): TPromise<void> {
+	private createBinFolderAndSymlinkAsAdmin(): TPromise<void> {
 		return new TPromise<void>((c, e) => {
 			const buttons = [nls.localize('ok', "OK"), nls.localize('cancel2', "Cancel")];
 
 			this.dialogService.show(Severity.Info, nls.localize('warnEscalation', "Code will now prompt with 'osascript' for Administrator privileges to install the shell command."), buttons, { cancelId: 1 }).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"';
+						const command = 'osascript -e "do shell script \\"mkdir -p /usr/local/bin && ln -sf \'' + getSource() + '\' \'' + this.target + '\'\\" with administrator privileges"';
 
 						nfcall(cp.exec, command, {})
 							.then(null, _ => TPromise.wrapError(new Error(nls.localize('cantCreateBinFolder', "Unable to create '/usr/local/bin'."))))
@@ -132,7 +129,8 @@ class UninstallAction extends Action {
 		id: string,
 		label: string,
 		@INotificationService private notificationService: INotificationService,
-		@ILogService private logService: ILogService
+		@ILogService private logService: ILogService,
+		@IDialogService private dialogService: IDialogService
 	) {
 		super(id, label);
 	}
@@ -149,12 +147,42 @@ class UninstallAction extends Action {
 				return undefined;
 			}
 
-			return pfs.unlink(this.target)
-				.then(null, ignore('ENOENT'))
-				.then(() => {
-					this.logService.trace('cli#uninstall', this.target);
-					this.notificationService.info(nls.localize('successFrom', "Shell command '{0}' successfully uninstalled from PATH.", product.applicationName));
-				});
+			const uninstall = () => {
+				return pfs.unlink(this.target)
+					.then(null, ignore('ENOENT'));
+			};
+
+			return uninstall().then(null, err => {
+				if (err.code === 'EACCES') {
+					return this.deleteSymlinkAsAdmin();
+				}
+
+				return TPromise.wrapError(err);
+			}).then(() => {
+				this.logService.trace('cli#uninstall', this.target);
+				this.notificationService.info(nls.localize('successFrom', "Shell command '{0}' successfully uninstalled from PATH.", product.applicationName));
+			});
+		});
+	}
+
+	private deleteSymlinkAsAdmin(): TPromise<void> {
+		return new TPromise<void>((c, e) => {
+			const buttons = [nls.localize('ok', "OK"), nls.localize('cancel2', "Cancel")];
+
+			this.dialogService.show(Severity.Info, nls.localize('warnEscalationUninstall', "Code will now prompt with 'osascript' for Administrator privileges to uninstall the shell command."), buttons, { cancelId: 1 }).then(choice => {
+				switch (choice) {
+					case 0 /* OK */:
+						const command = 'osascript -e "do shell script \\"rm \'' + this.target + '\'\\" with administrator privileges"';
+
+						nfcall(cp.exec, command, {})
+							.then(null, _ => TPromise.wrapError(new Error(nls.localize('cantUninstall', "Unable to uninstall the shell command '{0}'.", this.target))))
+							.done(c, e);
+						break;
+					case 1 /* Cancel */:
+						e(new Error(nls.localize('aborted', "Aborted")));
+						break;
+				}
+			});
 		});
 	}
 }
diff --git a/src/vs/workbench/parts/comments/electron-browser/commentService.ts b/src/vs/workbench/parts/comments/electron-browser/commentService.ts
index 80aa7b9359e..ff0fe6655d1 100644
--- a/src/vs/workbench/parts/comments/electron-browser/commentService.ts
+++ b/src/vs/workbench/parts/comments/electron-browser/commentService.ts
@@ -115,7 +115,7 @@ export class CommentService extends Disposable implements ICommentService {
 		return null;
 	}
 
-	async getComments(resource: URI): TPromise<CommentInfo[]> {
+	getComments(resource: URI): TPromise<CommentInfo[]> {
 		const result = [];
 		for (const handle of keys(this._commentProviders)) {
 			const provider = this._commentProviders.get(handle);
diff --git a/src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts b/src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts
index 7ff7d99f135..e06e3c0ea21 100644
--- a/src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts
+++ b/src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts
@@ -64,7 +64,6 @@ export class CommentNode {
 
 		this._domNode.setAttribute('aria-label', `${comment.userName}, ${comment.body.value}`);
 		this._domNode.setAttribute('role', 'treeitem');
-		this._domNode.title = `${comment.userName}, ${comment.body.value}`;
 		this._clearTimeout = null;
 	}
 
@@ -350,7 +349,7 @@ export class ReviewZoneWidget extends ZoneWidget {
 		this.setCommentEditorDecorations();
 
 		// Only add the additional step of clicking a reply button to expand the textarea when there are existing comments
-		this.createCommentButton();
+		this.createReplyButton();
 
 		this._localToDispose.push(this._commentEditor.onKeyDown((ev: IKeyboardEvent) => {
 			const hasExistingComments = this._commentThread.comments.length > 0;
@@ -384,6 +383,8 @@ export class ReviewZoneWidget extends ZoneWidget {
 					new Range(lineNumber, 1, lineNumber, 1),
 					this._commentEditor.getValue()
 				);
+
+				this.createReplyButton();
 			}
 
 			this._commentEditor.setValue('');
@@ -415,7 +416,7 @@ export class ReviewZoneWidget extends ZoneWidget {
 		}
 	}
 
-	createCommentButton() {
+	createReplyButton() {
 		const hasExistingComments = this._commentThread.comments.length > 0;
 		if (hasExistingComments) {
 			this._reviewThreadReplyButton = <HTMLButtonElement>$('button.review-thread-reply-button').appendTo(this._commentForm).getHTMLElement();
@@ -435,7 +436,10 @@ export class ReviewZoneWidget extends ZoneWidget {
 				}
 			});
 		} else {
-			dom.addClass(this._commentForm, 'expand');
+			if (!dom.hasClass(this._commentForm, 'expand')) {
+				dom.addClass(this._commentForm, 'expand');
+				this._commentEditor.focus();
+			}
 		}
 	}
 
diff --git a/src/vs/workbench/parts/comments/electron-browser/commentsPanel.ts b/src/vs/workbench/parts/comments/electron-browser/commentsPanel.ts
index a9786dfabd0..5e10e22fbb2 100644
--- a/src/vs/workbench/parts/comments/electron-browser/commentsPanel.ts
+++ b/src/vs/workbench/parts/comments/electron-browser/commentsPanel.ts
@@ -73,7 +73,7 @@ export class CommentsPanel extends Panel {
 	public getActions(): IAction[] {
 		if (!this.collapseAllAction) {
 			this.collapseAllAction = this.instantiationService.createInstance(CollapseAllAction, this.tree, this.commentsModel.hasCommentThreads());
-			this.toUnbind.push(this.collapseAllAction);
+			this._register(this.collapseAllAction);
 		}
 
 		return [this.collapseAllAction];
diff --git a/src/vs/workbench/parts/debug/browser/breakpointsView.ts b/src/vs/workbench/parts/debug/browser/breakpointsView.ts
index d02f6dfaf11..77f2cd56085 100644
--- a/src/vs/workbench/parts/debug/browser/breakpointsView.ts
+++ b/src/vs/workbench/parts/debug/browser/breakpointsView.ts
@@ -35,7 +35,7 @@ import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { ViewletPanel } from 'vs/workbench/browser/parts/views/panelViewlet';
+import { ViewletPanel, IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelViewlet';
 
 const $ = dom.$;
 
@@ -58,7 +58,7 @@ export class BreakpointsView extends ViewletPanel {
 		@IContextViewService private contextViewService: IContextViewService,
 		@IConfigurationService configurationService: IConfigurationService
 	) {
-		super(options, keybindingService, contextMenuService, configurationService);
+		super({ ...(options as IViewletPanelOptions), ariaHeaderLabel: nls.localize('breakpointsSection', "Breakpoints Section") }, keybindingService, contextMenuService, configurationService);
 
 		this.minimumBodySize = this.maximumBodySize = this.getExpandedBodySize();
 		this.settings = options.viewletSettings;
@@ -330,16 +330,11 @@ class BreakpointsRenderer implements IRenderer<IBreakpoint, IBreakpointTemplateD
 
 		const { message, className } = getBreakpointMessageAndClassName(this.debugService, this.textFileService, breakpoint);
 		data.icon.className = className + ' icon';
-		data.icon.title = message ? message : '';
+		data.breakpoint.title = breakpoint.message || message || '';
 
 		const debugActive = this.debugService.state === State.Running || this.debugService.state === State.Stopped;
 		if (debugActive && !breakpoint.verified) {
 			dom.addClass(data.breakpoint, 'disabled');
-			if (breakpoint.message) {
-				data.breakpoint.title = breakpoint.message;
-			}
-		} else if (breakpoint.condition || breakpoint.hitCondition) {
-			data.breakpoint.title = breakpoint.condition ? breakpoint.condition : breakpoint.hitCondition;
 		}
 	}
 
@@ -592,21 +587,20 @@ export function getBreakpointMessageAndClassName(debugService: IDebugService, te
 		};
 	}
 
-	if (breakpoint.logMessage) {
-		if (session && !session.raw.capabilities.supportsLogPoints) {
-			return {
-				className: 'debug-breakpoint-unsupported',
-				message: nls.localize('logBreakpointUnsupported', "Logpoints not supported by this debug type"),
-			};
+
+	if (breakpoint.logMessage || breakpoint.condition || breakpoint.hitCondition) {
+		const messages = [];
+		if (breakpoint.logMessage) {
+			if (session && !session.raw.capabilities.supportsLogPoints) {
+				return {
+					className: 'debug-breakpoint-unsupported',
+					message: nls.localize('logBreakpointUnsupported', "Logpoints not supported by this debug type"),
+				};
+			}
+
+			messages.push(nls.localize('logMessage', "Log Message: {0}", breakpoint.logMessage));
 		}
 
-		return {
-			className: 'debug-breakpoint-log',
-			message: appendMessage(breakpoint.logMessage)
-		};
-	}
-
-	if (breakpoint.condition || breakpoint.hitCondition) {
 		if (session && breakpoint.condition && !session.raw.capabilities.supportsConditionalBreakpoints) {
 			return {
 				className: 'debug-breakpoint-unsupported',
@@ -620,16 +614,16 @@ export function getBreakpointMessageAndClassName(debugService: IDebugService, te
 			};
 		}
 
-		if (breakpoint.condition && breakpoint.hitCondition) {
-			return {
-				className: 'debug-breakpoint-conditional',
-				message: appendMessage(`Expression: ${breakpoint.condition}\nHitCount: ${breakpoint.hitCondition}`)
-			};
+		if (breakpoint.condition) {
+			messages.push(nls.localize('expression', "Expression: {0}", breakpoint.condition));
+		}
+		if (breakpoint.hitCondition) {
+			messages.push(nls.localize('hitCount', "Hit Count: {0}", breakpoint.hitCondition));
 		}
 
 		return {
-			className: 'debug-breakpoint-conditional',
-			message: appendMessage(breakpoint.condition ? breakpoint.condition : breakpoint.hitCondition)
+			className: breakpoint.logMessage ? 'debug-breakpoint-log' : 'debug-breakpoint-conditional',
+			message: appendMessage(messages.join('\n'))
 		};
 	}
 
diff --git a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
index a5e8f96b51d..545751a774d 100644
--- a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
+++ b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
@@ -34,7 +34,6 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 
 const DEBUG_ACTIONS_WIDGET_POSITION_KEY = 'debug.actionswidgetposition';
 const DEBUG_ACTIONS_WIDGET_Y_KEY = 'debug.actionswidgety';
-const HEIGHT = 32;
 
 export const debugToolBarBackground = registerColor('debugToolBar.background', {
 	dark: '#333333',
@@ -81,7 +80,7 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 		this.$el.append(actionBarContainter);
 
 		this.activeActions = [];
-		this.actionBar = new ActionBar(actionBarContainter.getHTMLElement(), {
+		this.actionBar = this._register(new ActionBar(actionBarContainter.getHTMLElement(), {
 			orientation: ActionsOrientation.HORIZONTAL,
 			actionItemProvider: (action: IAction) => {
 				if (action.id === FocusSessionAction.ID) {
@@ -90,27 +89,26 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 
 				return null;
 			}
-		});
+		}));
 
-		this.updateScheduler = new RunOnceScheduler(() => {
+		this.updateScheduler = this._register(new RunOnceScheduler(() => {
 			const state = this.debugService.state;
 			const toolBarLocation = this.configurationService.getValue<IDebugConfiguration>('debug').toolBarLocation;
 			if (state === State.Inactive || toolBarLocation === 'docked' || toolBarLocation === 'hidden') {
 				return this.hide();
 			}
 
-			const actions = DebugActionsWidget.getActions(this.allActions, this.toUnbind, this.debugService, this.keybindingService, this.instantiationService);
+			const actions = DebugActionsWidget.getActions(this.allActions, this.toDispose, this.debugService, this.keybindingService, this.instantiationService);
 			if (!arrays.equals(actions, this.activeActions, (first, second) => first.id === second.id)) {
 				this.actionBar.clear();
 				this.actionBar.push(actions, { icon: true, label: false });
 				this.activeActions = actions;
 			}
 			this.show();
-		}, 20);
+		}, 20));
 
 		this.updateStyles();
 
-		this.toUnbind.push(this.actionBar);
 		this.registerListeners();
 
 		this.hide();
@@ -118,10 +116,10 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.debugService.onDidChangeState(() => this.updateScheduler.schedule()));
-		this.toUnbind.push(this.debugService.getViewModel().onDidFocusSession(() => this.updateScheduler.schedule()));
-		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => this.onDidConfigurationChange(e)));
-		this.toUnbind.push(this.actionBar.actionRunner.onDidRun((e: IRunEvent) => {
+		this._register(this.debugService.onDidChangeState(() => this.updateScheduler.schedule()));
+		this._register(this.debugService.getViewModel().onDidFocusSession(() => this.updateScheduler.schedule()));
+		this._register(this.configurationService.onDidChangeConfiguration(e => this.onDidConfigurationChange(e)));
+		this._register(this.actionBar.actionRunner.onDidRun((e: IRunEvent) => {
 			// check for error
 			if (e.error && !errors.isPromiseCanceledError(e.error)) {
 				this.notificationService.error(e.error);
@@ -138,7 +136,7 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 				this.telemetryService.publicLog('workbenchActionExecuted', { id: e.action.id, from: 'debugActionsWidget' });
 			}
 		}));
-		$(window).on(dom.EventType.RESIZE, () => this.setCoordinates(), this.toUnbind);
+		$(window).on(dom.EventType.RESIZE, () => this.setCoordinates(), this.toDispose);
 
 		this.dragArea.on(dom.EventType.MOUSE_UP, (event: MouseEvent) => {
 			const mouseClickEvent = new StandardMouseEvent(event);
@@ -167,8 +165,8 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 			});
 		});
 
-		this.toUnbind.push(this.partService.onTitleBarVisibilityChange(() => this.setYCoordinate()));
-		this.toUnbind.push(browser.onDidChangeZoomLevel(() => this.setYCoordinate()));
+		this._register(this.partService.onTitleBarVisibilityChange(() => this.setYCoordinate()));
+		this._register(browser.onDidChangeZoomLevel(() => this.setYCoordinate()));
 	}
 
 	private storePosition(): void {
@@ -220,10 +218,11 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 		if (y === undefined) {
 			y = this.storageService.getInteger(DEBUG_ACTIONS_WIDGET_Y_KEY, StorageScope.GLOBAL, 0);
 		}
-		if ((y < HEIGHT / 2) || (y > HEIGHT + HEIGHT / 2)) {
-			const moveToTop = y < HEIGHT;
-			this.setYCoordinate(moveToTop ? 0 : HEIGHT);
-			this.storageService.store(DEBUG_ACTIONS_WIDGET_Y_KEY, moveToTop ? 0 : 2 * HEIGHT, StorageScope.GLOBAL);
+		const titleAreaHeight = 35;
+		if ((y < titleAreaHeight / 2) || (y > titleAreaHeight + titleAreaHeight / 2)) {
+			const moveToTop = y < titleAreaHeight;
+			this.setYCoordinate(moveToTop ? 0 : titleAreaHeight);
+			this.storageService.store(DEBUG_ACTIONS_WIDGET_Y_KEY, moveToTop ? 0 : 2 * titleAreaHeight, StorageScope.GLOBAL);
 		}
 	}
 
@@ -235,6 +234,7 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 
 	private show(): void {
 		if (this.isVisible) {
+			this.setCoordinates();
 			return;
 		}
 		if (!this.isBuilt) {
@@ -252,7 +252,7 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 		this.$el.hide();
 	}
 
-	public static getActions(allActions: AbstractDebugAction[], toUnbind: IDisposable[], debugService: IDebugService, keybindingService: IKeybindingService, instantiationService: IInstantiationService): AbstractDebugAction[] {
+	public static getActions(allActions: AbstractDebugAction[], toDispose: IDisposable[], debugService: IDebugService, keybindingService: IKeybindingService, instantiationService: IInstantiationService): AbstractDebugAction[] {
 		if (allActions.length === 0) {
 			allActions.push(new ContinueAction(ContinueAction.ID, ContinueAction.LABEL, debugService, keybindingService));
 			allActions.push(new PauseAction(PauseAction.ID, PauseAction.LABEL, debugService, keybindingService));
@@ -265,9 +265,7 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 			allActions.push(new StepBackAction(StepBackAction.ID, StepBackAction.LABEL, debugService, keybindingService));
 			allActions.push(new ReverseContinueAction(ReverseContinueAction.ID, ReverseContinueAction.LABEL, debugService, keybindingService));
 			allActions.push(instantiationService.createInstance(FocusSessionAction, FocusSessionAction.ID, FocusSessionAction.LABEL));
-			allActions.forEach(a => {
-				toUnbind.push(a);
-			});
+			allActions.forEach(a => toDispose.push(a));
 		}
 
 		const state = debugService.state;
diff --git a/src/vs/workbench/parts/debug/browser/debugCommands.ts b/src/vs/workbench/parts/debug/browser/debugCommands.ts
index 8a36c1e3150..bf06733430f 100644
--- a/src/vs/workbench/parts/debug/browser/debugCommands.ts
+++ b/src/vs/workbench/parts/debug/browser/debugCommands.ts
@@ -23,7 +23,6 @@ import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { openBreakpointSource } from 'vs/workbench/parts/debug/browser/breakpointsView';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { InputFocusedContext } from 'vs/platform/workbench/common/contextkeys';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 
 export function registerCommands(): void {
@@ -225,10 +224,6 @@ export function registerCommands(): void {
 		id: INLINE_BREAKPOINT_COMMAND_ID,
 		handler: inlineBreakpointHandler
 	});
-	CommandsRegistry.registerCommand({
-		id: 'editor.debug.action.toggleColumnBreakpoint',
-		handler: inlineBreakpointHandler
-	});
 
 	MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
 		command: {
diff --git a/src/vs/workbench/parts/debug/browser/debugStatus.ts b/src/vs/workbench/parts/debug/browser/debugStatus.ts
index 755b562c84e..149c9bd8eb8 100644
--- a/src/vs/workbench/parts/debug/browser/debugStatus.ts
+++ b/src/vs/workbench/parts/debug/browser/debugStatus.ts
@@ -6,7 +6,7 @@
 import * as nls from 'vs/nls';
 import * as dom from 'vs/base/browser/dom';
 import * as errors from 'vs/base/common/errors';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable } from 'vs/base/common/lifecycle';
 import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
@@ -18,7 +18,6 @@ import { STATUS_BAR_DEBUGGING_FOREGROUND, isStatusbarInDebugMode } from 'vs/work
 const $ = dom.$;
 
 export class DebugStatus extends Themable implements IStatusbarItem {
-	private toDispose: IDisposable[];
 	private container: HTMLElement;
 	private statusBarItem: HTMLElement;
 	private label: HTMLElement;
@@ -32,17 +31,16 @@ export class DebugStatus extends Themable implements IStatusbarItem {
 		@IConfigurationService configurationService: IConfigurationService
 	) {
 		super(themeService);
-		this.toDispose = [];
-		this.toDispose.push(this.debugService.getConfigurationManager().onDidSelectConfiguration(e => {
+		this._register(this.debugService.getConfigurationManager().onDidSelectConfiguration(e => {
 			this.setLabel();
 		}));
-		this.toDispose.push(this.debugService.onDidChangeState(state => {
+		this._register(this.debugService.onDidChangeState(state => {
 			if (state !== State.Inactive && this.showInStatusBar === 'onFirstSessionStart') {
 				this.doRender();
 			}
 		}));
 		this.showInStatusBar = configurationService.getValue<IDebugConfiguration>('debug').showInStatusBar;
-		this.toDispose.push(configurationService.onDidChangeConfiguration(e => {
+		this._register(configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('debug.showInStatusBar')) {
 				this.showInStatusBar = configurationService.getValue<IDebugConfiguration>('debug').showInStatusBar;
 				if (this.showInStatusBar === 'always') {
@@ -78,7 +76,7 @@ export class DebugStatus extends Themable implements IStatusbarItem {
 	private doRender(): void {
 		if (!this.statusBarItem && this.container) {
 			this.statusBarItem = dom.append(this.container, $('.debug-statusbar-item'));
-			this.toDispose.push(dom.addDisposableListener(this.statusBarItem, 'click', () => {
+			this._register(dom.addDisposableListener(this.statusBarItem, 'click', () => {
 				this.quickOpenService.show('debug ').done(undefined, errors.onUnexpectedError);
 			}));
 			this.statusBarItem.title = nls.localize('selectAndStartDebug', "Select and start debug configuration");
@@ -102,9 +100,4 @@ export class DebugStatus extends Themable implements IStatusbarItem {
 			}
 		}
 	}
-
-	public dispose(): void {
-		super.dispose();
-		this.toDispose = dispose(this.toDispose);
-	}
 }
diff --git a/src/vs/workbench/parts/debug/browser/debugViewlet.ts b/src/vs/workbench/parts/debug/browser/debugViewlet.ts
index e1ea8e7a8f8..30ffc30d939 100644
--- a/src/vs/workbench/parts/debug/browser/debugViewlet.ts
+++ b/src/vs/workbench/parts/debug/browser/debugViewlet.ts
@@ -66,10 +66,10 @@ export class DebugViewlet extends ViewContainerViewlet {
 		}));
 	}
 
-	async create(parent: HTMLElement): TPromise<void> {
-		await super.create(parent);
-
-		DOM.addClass(parent, 'debug-viewlet');
+	create(parent: HTMLElement): TPromise<void> {
+		return super.create(parent).then(() => {
+			DOM.addClass(parent, 'debug-viewlet');
+		});
 	}
 
 	public focus(): void {
@@ -105,7 +105,7 @@ export class DebugViewlet extends ViewContainerViewlet {
 			return [this.startAction, this.configureAction, this.toggleReplAction];
 		}
 
-		return DebugActionsWidget.getActions(this.allActions, this.toUnbind, this.debugService, this.keybindingService, this.instantiationService);
+		return DebugActionsWidget.getActions(this.allActions, this.toDispose, this.debugService, this.keybindingService, this.instantiationService);
 	}
 
 	public get showInitialDebugActions(): boolean {
diff --git a/src/vs/workbench/parts/debug/browser/statusbarColorProvider.ts b/src/vs/workbench/parts/debug/browser/statusbarColorProvider.ts
index ed2b380111e..afb16080fcd 100644
--- a/src/vs/workbench/parts/debug/browser/statusbarColorProvider.ts
+++ b/src/vs/workbench/parts/debug/browser/statusbarColorProvider.ts
@@ -49,8 +49,8 @@ export class StatusBarColorProvider extends Themable implements IWorkbenchContri
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.debugService.onDidChangeState(state => this.updateStyles()));
-		this.toUnbind.push(this.contextService.onDidChangeWorkbenchState(state => this.updateStyles()));
+		this._register(this.debugService.onDidChangeState(state => this.updateStyles()));
+		this._register(this.contextService.onDidChangeWorkbenchState(state => this.updateStyles()));
 	}
 
 	protected updateStyles(): void {
diff --git a/src/vs/workbench/parts/debug/common/debugProtocol.d.ts b/src/vs/workbench/parts/debug/common/debugProtocol.d.ts
index 62b866aa293..1e7e0cad704 100644
--- a/src/vs/workbench/parts/debug/common/debugProtocol.d.ts
+++ b/src/vs/workbench/parts/debug/common/debugProtocol.d.ts
@@ -18,7 +18,7 @@ declare module DebugProtocol {
 		type: string;
 	}
 
-	/** A client or server-initiated request. */
+	/** A client or debug adapter initiated request. */
 	export interface Request extends ProtocolMessage {
 		// type: 'request';
 		/** The command to execute. */
@@ -27,7 +27,7 @@ declare module DebugProtocol {
 		arguments?: any;
 	}
 
-	/** Server-initiated event. */
+	/** A debug adapter initiated event. */
 	export interface Event extends ProtocolMessage {
 		// type: 'event';
 		/** Type of event. */
@@ -36,7 +36,7 @@ declare module DebugProtocol {
 		body?: any;
 	}
 
-	/** Response to a request. */
+	/** Response for a request. */
 	export interface Response extends ProtocolMessage {
 		// type: 'response';
 		/** Sequence number of the corresponding request. */
@@ -51,16 +51,24 @@ declare module DebugProtocol {
 		body?: any;
 	}
 
+	/** On error (whenever 'success' is false), the body can provide more details. */
+	export interface ErrorResponse extends Response {
+		body: {
+			/** An optional, structured error message. */
+			error?: Message;
+		};
+	}
+
 	/** Event message for 'initialized' event type.
 		This event indicates that the debug adapter is ready to accept configuration requests (e.g. SetBreakpointsRequest, SetExceptionBreakpointsRequest).
-		A debug adapter is expected to send this event when it is ready to accept configuration requests (but not before the InitializeRequest has finished).
+		A debug adapter is expected to send this event when it is ready to accept configuration requests (but not before the 'initialize' request has finished).
 		The sequence of events/requests is as follows:
-		- adapters sends InitializedEvent (after the InitializeRequest has returned)
-		- frontend sends zero or more SetBreakpointsRequest
-		- frontend sends one SetFunctionBreakpointsRequest
-		- frontend sends a SetExceptionBreakpointsRequest if one or more exceptionBreakpointFilters have been defined (or if supportsConfigurationDoneRequest is not defined or false)
+		- adapters sends 'initialized' event (after the 'initialize' request has returned)
+		- frontend sends zero or more 'setBreakpoints' requests
+		- frontend sends one 'setFunctionBreakpoints' request
+		- frontend sends a 'setExceptionBreakpoints' request if one or more 'exceptionBreakpointFilters' have been defined (or if 'supportsConfigurationDoneRequest' is not defined or false)
 		- frontend sends other future configuration requests
-		- frontend sends one ConfigurationDoneRequest to indicate the end of the configuration
+		- frontend sends one 'configurationDone' request to indicate the end of the configuration.
 	*/
 	export interface InitializedEvent extends Event {
 		// event: 'initialized';
@@ -75,10 +83,10 @@ declare module DebugProtocol {
 		body: {
 			/** The reason for the event.
 				For backward compatibility this string is shown in the UI if the 'description' attribute is missing (but it must not be translated).
-				Values: 'step', 'breakpoint', 'exception', 'pause', 'entry', etc.
+				Values: 'step', 'breakpoint', 'exception', 'pause', 'entry', 'goto', etc.
 			*/
 			reason: string;
-			/** The full reason for the event, e.g. 'Paused on exception'. This string is shown in the UI as is. */
+			/** The full reason for the event, e.g. 'Paused on exception'. This string is shown in the UI as is and must be translated. */
 			description?: string;
 			/** The thread which was stopped. */
 			threadId?: number;
@@ -86,9 +94,9 @@ declare module DebugProtocol {
 			preserveFocusHint?: boolean;
 			/** Additional information. E.g. if reason is 'exception', text contains the exception name. This string is shown in the UI. */
 			text?: string;
-			/** If allThreadsStopped is true, a debug adapter can announce that all threads have stopped.
-				*  The client should use this information to enable that all threads can be expanded to access their stacktraces.
-				*  If the attribute is missing or false, only the thread with the given threadId can be expanded.
+			/** If 'allThreadsStopped' is true, a debug adapter can announce that all threads have stopped.
+				- The client should use this information to enable that all threads can be expanded to access their stacktraces.
+				- If the attribute is missing or false, only the thread with the given threadId can be expanded.
 			*/
 			allThreadsStopped?: boolean;
 		};
@@ -97,20 +105,20 @@ declare module DebugProtocol {
 	/** Event message for 'continued' event type.
 		The event indicates that the execution of the debuggee has continued.
 		Please note: a debug adapter is not expected to send this event in response to a request that implies that execution continues, e.g. 'launch' or 'continue'.
-		It is only necessary to send a ContinuedEvent if there was no previous request that implied this.
+		It is only necessary to send a 'continued' event if there was no previous request that implied this.
 	*/
 	export interface ContinuedEvent extends Event {
 		// event: 'continued';
 		body: {
 			/** The thread which was continued. */
 			threadId: number;
-			/** If allThreadsContinued is true, a debug adapter can announce that all threads have continued. */
+			/** If 'allThreadsContinued' is true, a debug adapter can announce that all threads have continued. */
 			allThreadsContinued?: boolean;
 		};
 	}
 
 	/** Event message for 'exited' event type.
-		The event indicates that the debuggee has exited.
+		The event indicates that the debuggee has exited and returns its exit code.
 	*/
 	export interface ExitedEvent extends Event {
 		// event: 'exited';
@@ -120,8 +128,8 @@ declare module DebugProtocol {
 		};
 	}
 
-	/** Event message for 'terminated' event types.
-		The event indicates that debugging of the debuggee has terminated.
+	/** Event message for 'terminated' event type.
+		The event indicates that debugging of the debuggee has terminated. This does **not** mean that the debuggee itself has exited.
 	*/
 	export interface TerminatedEvent extends Event {
 		// event: 'terminated';
@@ -160,7 +168,7 @@ declare module DebugProtocol {
 			category?: string;
 			/** The output to report. */
 			output: string;
-			/** If an attribute 'variablesReference' exists and its value is > 0, the output contains objects which can be retrieved by passing variablesReference to the VariablesRequest. */
+			/** If an attribute 'variablesReference' exists and its value is > 0, the output contains objects which can be retrieved by passing 'variablesReference' to the 'variables' request. */
 			variablesReference?: number;
 			/** An optional source location where the output was produced. */
 			source?: Source;
@@ -249,8 +257,8 @@ declare module DebugProtocol {
 		};
 	}
 
-	/** runInTerminal request; value of command field is 'runInTerminal'.
-		With this request a debug adapter can run a command in a terminal.
+	/** RunInTerminal request; value of command field is 'runInTerminal'.
+		This request is sent from the debug adapter to the client to run a command in a terminal. This is typically used to launch the debuggee in a terminal provided by the client.
 	*/
 	export interface RunInTerminalRequest extends Request {
 		// command: 'runInTerminal';
@@ -271,7 +279,7 @@ declare module DebugProtocol {
 		env?: { [key: string]: string | null; };
 	}
 
-	/** Response to Initialize request. */
+	/** Response to 'runInTerminal' request. */
 	export interface RunInTerminalResponse extends Response {
 		body: {
 			/** The process ID. */
@@ -279,15 +287,11 @@ declare module DebugProtocol {
 		};
 	}
 
-	/** On error that is whenever 'success' is false, the body can provide more details. */
-	export interface ErrorResponse extends Response {
-		body: {
-			/** An optional, structured error message. */
-			error?: Message;
-		};
-	}
-
-	/** Initialize request; value of command field is 'initialize'. */
+	/** Initialize request; value of command field is 'initialize'.
+		The 'initialize' request is sent as the first request from the client to the debug adapter in order to configure it with client capabilities and to retrieve capabilities from the debug adapter.
+		Until the debug adapter has responded to with an 'initialize' response, the client must not send any additional requests or events to the debug adapter. In addition the debug adapter is not allowed to send any requests or events to the client until it has responded with an 'initialize' response.
+		The 'initialize' request may only be sent once.
+	*/
 	export interface InitializeRequest extends Request {
 		// command: 'initialize';
 		arguments: InitializeRequestArguments;
@@ -326,16 +330,14 @@ declare module DebugProtocol {
 	}
 
 	/** ConfigurationDone request; value of command field is 'configurationDone'.
-		The client of the debug protocol must send this request at the end of the sequence of configuration requests (which was started by the InitializedEvent).
+		The client of the debug protocol must send this request at the end of the sequence of configuration requests (which was started by the 'initialized' event).
 	*/
 	export interface ConfigurationDoneRequest extends Request {
 		// command: 'configurationDone';
 		arguments?: ConfigurationDoneArguments;
 	}
 
-	/** Arguments for 'configurationDone' request.
-		The configurationDone request has no standardized attributes.
-	*/
+	/** Arguments for 'configurationDone' request. */
 	export interface ConfigurationDoneArguments {
 	}
 
@@ -343,7 +345,9 @@ declare module DebugProtocol {
 	export interface ConfigurationDoneResponse extends Response {
 	}
 
-	/** Launch request; value of command field is 'launch'. */
+	/** Launch request; value of command field is 'launch'.
+		The launch request is sent from the client to the debug adapter to start the debuggee with or without debugging (if 'noDebug' is true). Since launching is debugger/runtime specific, the arguments for this request are not part of this specification.
+	*/
 	export interface LaunchRequest extends Request {
 		// command: 'launch';
 		arguments: LaunchRequestArguments;
@@ -364,7 +368,9 @@ declare module DebugProtocol {
 	export interface LaunchResponse extends Response {
 	}
 
-	/** Attach request; value of command field is 'attach'. */
+	/** Attach request; value of command field is 'attach'.
+		The attach request is sent from the client to the debug adapter to attach to a debuggee that is already running. Since attaching is debugger/runtime specific, the arguments for this request are not part of this specification.
+	*/
 	export interface AttachRequest extends Request {
 		// command: 'attach';
 		arguments: AttachRequestArguments;
@@ -394,9 +400,7 @@ declare module DebugProtocol {
 		arguments?: RestartArguments;
 	}
 
-	/** Arguments for 'restart' request.
-		The restart request has no standardized attributes.
-	*/
+	/** Arguments for 'restart' request. */
 	export interface RestartArguments {
 	}
 
@@ -404,7 +408,9 @@ declare module DebugProtocol {
 	export interface RestartResponse extends Response {
 	}
 
-	/** Disconnect request; value of command field is 'disconnect'. */
+	/** Disconnect request; value of command field is 'disconnect'.
+		The 'disconnect' request is sent from the client to the debug adapter in order to stop debugging. It asks the debug adapter to disconnect from the debuggee and to terminate the debug adapter. If the debuggee has been started with the 'launch' request, the 'disconnect' request terminates the debuggee. If the 'attach' request was used to connect to the debuggee, 'disconnect' does not terminate the debuggee. This behavior can be controlled with the 'terminateDebuggee' (if supported by the debug adapter).
+	*/
 	export interface DisconnectRequest extends Request {
 		// command: 'disconnect';
 		arguments?: DisconnectArguments;
@@ -426,7 +432,7 @@ declare module DebugProtocol {
 	/** SetBreakpoints request; value of command field is 'setBreakpoints'.
 		Sets multiple breakpoints for a single source and clears all previous breakpoints in that source.
 		To clear all breakpoint for a source, specify an empty array.
-		When a breakpoint is hit, a StoppedEvent (event type 'breakpoint') is generated.
+		When a breakpoint is hit, a 'stopped' event (with reason 'breakpoint') is generated.
 	*/
 	export interface SetBreakpointsRequest extends Request {
 		// command: 'setBreakpoints';
@@ -435,7 +441,7 @@ declare module DebugProtocol {
 
 	/** Arguments for 'setBreakpoints' request. */
 	export interface SetBreakpointsArguments {
-		/** The source location of the breakpoints; either source.path or source.reference must be specified. */
+		/** The source location of the breakpoints; either 'source.path' or 'source.reference' must be specified. */
 		source: Source;
 		/** The code locations of the breakpoints. */
 		breakpoints?: SourceBreakpoint[];
@@ -449,11 +455,11 @@ declare module DebugProtocol {
 		Returned is information about each breakpoint created by this request.
 		This includes the actual code location and whether the breakpoint could be verified.
 		The breakpoints returned are in the same order as the elements of the 'breakpoints'
-		(or the deprecated 'lines') in the SetBreakpointsArguments.
+		(or the deprecated 'lines') array in the arguments.
 	*/
 	export interface SetBreakpointsResponse extends Response {
 		body: {
-			/** Information about the breakpoints. The array elements are in the same order as the elements of the 'breakpoints' (or the deprecated 'lines') in the SetBreakpointsArguments. */
+			/** Information about the breakpoints. The array elements are in the same order as the elements of the 'breakpoints' (or the deprecated 'lines') array in the arguments. */
 			breakpoints: Breakpoint[];
 		};
 	}
@@ -461,7 +467,7 @@ declare module DebugProtocol {
 	/** SetFunctionBreakpoints request; value of command field is 'setFunctionBreakpoints'.
 		Sets multiple function breakpoints and clears all previous function breakpoints.
 		To clear all function breakpoint, specify an empty array.
-		When a function breakpoint is hit, a StoppedEvent (event type 'function breakpoint') is generated.
+		When a function breakpoint is hit, a 'stopped' event (event type 'function breakpoint') is generated.
 	*/
 	export interface SetFunctionBreakpointsRequest extends Request {
 		// command: 'setFunctionBreakpoints';
@@ -485,7 +491,7 @@ declare module DebugProtocol {
 	}
 
 	/** SetExceptionBreakpoints request; value of command field is 'setExceptionBreakpoints'.
-		The request configures the debuggers response to thrown exceptions. If an exception is configured to break, a StoppedEvent is fired (event type 'exception').
+		The request configures the debuggers response to thrown exceptions. If an exception is configured to break, a 'stopped' event is fired (with reason 'exception').
 	*/
 	export interface SetExceptionBreakpointsRequest extends Request {
 		// command: 'setExceptionBreakpoints';
@@ -514,21 +520,21 @@ declare module DebugProtocol {
 
 	/** Arguments for 'continue' request. */
 	export interface ContinueArguments {
-		/** Continue execution for the specified thread (if possible). If the backend cannot continue on a single thread but will continue on all threads, it should set the allThreadsContinued attribute in the response to true. */
+		/** Continue execution for the specified thread (if possible). If the backend cannot continue on a single thread but will continue on all threads, it should set the 'allThreadsContinued' attribute in the response to true. */
 		threadId: number;
 	}
 
 	/** Response to 'continue' request. */
 	export interface ContinueResponse extends Response {
 		body: {
-			/** If true, the continue request has ignored the specified thread and continued all threads instead. If this attribute is missing a value of 'true' is assumed for backward compatibility. */
+			/** If true, the 'continue' request has ignored the specified thread and continued all threads instead. If this attribute is missing a value of 'true' is assumed for backward compatibility. */
 			allThreadsContinued?: boolean;
 		};
 	}
 
 	/** Next request; value of command field is 'next'.
 		The request starts the debuggee to run again for one step.
-		The debug adapter first sends the NextResponse and then a StoppedEvent (event type 'step') after the step has completed.
+		The debug adapter first sends the response and then a 'stopped' event (with reason 'step') after the step has completed.
 	*/
 	export interface NextRequest extends Request {
 		// command: 'next';
@@ -548,7 +554,7 @@ declare module DebugProtocol {
 	/** StepIn request; value of command field is 'stepIn'.
 		The request starts the debuggee to step into a function/method if possible.
 		If it cannot step into a target, 'stepIn' behaves like 'next'.
-		The debug adapter first sends the StepInResponse and then a StoppedEvent (event type 'step') after the step has completed.
+		The debug adapter first sends the response and then a 'stopped' event (with reason 'step') after the step has completed.
 		If there are multiple function/method calls (or other targets) on the source line,
 		the optional argument 'targetId' can be used to control into which target the 'stepIn' should occur.
 		The list of possible targets for a given source line can be retrieved via the 'stepInTargets' request.
@@ -572,7 +578,7 @@ declare module DebugProtocol {
 
 	/** StepOut request; value of command field is 'stepOut'.
 		The request starts the debuggee to run again for one step.
-		The debug adapter first sends the StepOutResponse and then a StoppedEvent (event type 'step') after the step has completed.
+		The debug adapter first sends the response and then a 'stopped' event (with reason 'step') after the step has completed.
 	*/
 	export interface StepOutRequest extends Request {
 		// command: 'stepOut';
@@ -591,7 +597,7 @@ declare module DebugProtocol {
 
 	/** StepBack request; value of command field is 'stepBack'.
 		The request starts the debuggee to run one step backwards.
-		The debug adapter first sends the StepBackResponse and then a StoppedEvent (event type 'step') after the step has completed. Clients should only call this request if the capability supportsStepBack is true.
+		The debug adapter first sends the response and then a 'stopped' event (with reason 'step') after the step has completed. Clients should only call this request if the capability 'supportsStepBack' is true.
 	*/
 	export interface StepBackRequest extends Request {
 		// command: 'stepBack';
@@ -609,7 +615,7 @@ declare module DebugProtocol {
 	}
 
 	/** ReverseContinue request; value of command field is 'reverseContinue'.
-		The request starts the debuggee to run backward. Clients should only call this request if the capability supportsStepBack is true.
+		The request starts the debuggee to run backward. Clients should only call this request if the capability 'supportsStepBack' is true.
 	*/
 	export interface ReverseContinueRequest extends Request {
 		// command: 'reverseContinue';
@@ -628,7 +634,7 @@ declare module DebugProtocol {
 
 	/** RestartFrame request; value of command field is 'restartFrame'.
 		The request restarts execution of the specified stackframe.
-		The debug adapter first sends the RestartFrameResponse and then a StoppedEvent (event type 'restart') after the restart has completed.
+		The debug adapter first sends the response and then a 'stopped' event (with reason 'restart') after the restart has completed.
 	*/
 	export interface RestartFrameRequest extends Request {
 		// command: 'restartFrame';
@@ -649,7 +655,7 @@ declare module DebugProtocol {
 		The request sets the location where the debuggee will continue to run.
 		This makes it possible to skip the execution of code or to executed code again.
 		The code between the current location and the goto target is not executed but skipped.
-		The debug adapter first sends the GotoResponse and then a StoppedEvent (event type 'goto').
+		The debug adapter first sends the response and then a 'stopped' event with reason 'goto'.
 	*/
 	export interface GotoRequest extends Request {
 		// command: 'goto';
@@ -670,7 +676,7 @@ declare module DebugProtocol {
 
 	/** Pause request; value of command field is 'pause'.
 		The request suspenses the debuggee.
-		The debug adapter first sends the PauseResponse and then a StoppedEvent (event type 'pause') after the thread has been paused successfully.
+		The debug adapter first sends the response and then a 'stopped' event (with reason 'pause') after the thread has been paused successfully.
 	*/
 	export interface PauseRequest extends Request {
 		// command: 'pause';
@@ -687,7 +693,9 @@ declare module DebugProtocol {
 	export interface PauseResponse extends Response {
 	}
 
-	/** StackTrace request; value of command field is 'stackTrace'. The request returns a stacktrace from the current execution state. */
+	/** StackTrace request; value of command field is 'stackTrace'.
+		The request returns a stacktrace from the current execution state.
+	*/
 	export interface StackTraceRequest extends Request {
 		// command: 'stackTrace';
 		arguments: StackTraceArguments;
@@ -770,7 +778,7 @@ declare module DebugProtocol {
 		};
 	}
 
-	/** setVariable request; value of command field is 'setVariable'.
+	/** SetVariable request; value of command field is 'setVariable'.
 		Set the variable with the given name in the variable container to a new value.
 	*/
 	export interface SetVariableRequest extends Request {
@@ -836,7 +844,7 @@ declare module DebugProtocol {
 		};
 	}
 
-	/** Thread request; value of command field is 'threads'.
+	/** Threads request; value of command field is 'threads'.
 		The request retrieves a list of all threads.
 	*/
 	export interface ThreadsRequest extends Request {
@@ -851,7 +859,7 @@ declare module DebugProtocol {
 		};
 	}
 
-	/** Terminate thread request; value of command field is 'terminateThreads'.
+	/** TerminateThreads request; value of command field is 'terminateThreads'.
 		The request terminates the threads with the given ids.
 	*/
 	export interface TerminateThreadsRequest extends Request {
@@ -869,7 +877,9 @@ declare module DebugProtocol {
 	export interface TerminateThreadsResponse extends Response {
 	}
 
-	/** Modules can be retrieved from the debug adapter with the ModulesRequest which can either return all modules or a range of modules to support paging. */
+	/** Modules request; value of command field is 'modules'.
+		Modules can be retrieved from the debug adapter with the ModulesRequest which can either return all modules or a range of modules to support paging.
+	*/
 	export interface ModulesRequest extends Request {
 		// command: 'modules';
 		arguments: ModulesArguments;
@@ -893,15 +903,15 @@ declare module DebugProtocol {
 		};
 	}
 
-	/** Retrieves the set of all sources currently loaded by the debugged process. */
+	/** LoadedSources request; value of command field is 'loadedSources'.
+		Retrieves the set of all sources currently loaded by the debugged process.
+	*/
 	export interface LoadedSourcesRequest extends Request {
 		// command: 'loadedSources';
 		arguments?: LoadedSourcesArguments;
 	}
 
-	/** Arguments for 'loadedSources' request.
-		The 'loadedSources' request has no standardized arguments.
-	*/
+	/** Arguments for 'loadedSources' request. */
 	export interface LoadedSourcesArguments {
 	}
 
@@ -1057,7 +1067,7 @@ declare module DebugProtocol {
 		};
 	}
 
-	/** CompletionsRequest request; value of command field is 'completions'.
+	/** Completions request; value of command field is 'completions'.
 		Returns a list of possible completions for a given caret position and text.
 		The CompletionsRequest may only be called if the 'supportsCompletionsRequest' capability exists and is true.
 	*/
@@ -1086,8 +1096,8 @@ declare module DebugProtocol {
 		};
 	}
 
-	/** ExceptionInfoRequest request; value of command field is 'exceptionInfo'.
-		Retrieves the details of the exception that caused the StoppedEvent to be raised.
+	/** ExceptionInfo request; value of command field is 'exceptionInfo'.
+		Retrieves the details of the exception that caused this event to be raised.
 	*/
 	export interface ExceptionInfoRequest extends Request {
 		// command: 'exceptionInfo';
@@ -1269,7 +1279,7 @@ declare module DebugProtocol {
 	export interface Source {
 		/** The short name of the source. Every source returned from the debug adapter has a name. When sending a source to the debug adapter this name is optional. */
 		name?: string;
-		/** The path of the source to be shown in the UI. It is only used to locate and load the content of the source if no sourceReference is specified (or its vaule is 0). */
+		/** The path of the source to be shown in the UI. It is only used to locate and load the content of the source if no sourceReference is specified (or its value is 0). */
 		path?: string;
 		/** If sourceReference > 0 the contents of the source must be retrieved through the SourceRequest (even if a path is specified). A sourceReference is only valid for a session, so it must not be used to persist a source. */
 		sourceReference?: number;
diff --git a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
index bbf587bfb00..69c19b227fc 100644
--- a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
@@ -27,9 +27,7 @@ import uri from 'vs/base/common/uri';
 import { SuggestRegistry, ISuggestResult, SuggestContext } from 'vs/editor/common/modes';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { ITextModel } from 'vs/editor/common/model';
-import { wireCancellationToken } from 'vs/base/common/async';
 import { provideSuggestionItems } from 'vs/editor/contrib/suggest/suggest';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { transparent, editorForeground } from 'vs/platform/theme/common/colorRegistry';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
@@ -218,9 +216,9 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 
 		this.toDispose.push(SuggestRegistry.register({ scheme: DEBUG_SCHEME, hasAccessToAllModels: true }, {
 			provideCompletionItems: (model: ITextModel, position: Position, _context: SuggestContext, token: CancellationToken): Thenable<ISuggestResult> => {
-				let suggestionsPromise: TPromise<ISuggestResult>;
+				let suggestionsPromise: Promise<ISuggestResult>;
 				if (this.context === Context.CONDITION || this.context === Context.LOG_MESSAGE && this.isCurlyBracketOpen()) {
-					suggestionsPromise = provideSuggestionItems(this.editor.getModel(), new Position(this.lineNumber, 1), 'none', undefined, _context).then(suggestions => {
+					suggestionsPromise = provideSuggestionItems(this.editor.getModel(), new Position(this.lineNumber, 1), 'none', undefined, _context, token).then(suggestions => {
 
 						let overwriteBefore = 0;
 						if (this.context === Context.CONDITION) {
@@ -242,10 +240,10 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 						};
 					});
 				} else {
-					suggestionsPromise = TPromise.as({ suggestions: [] });
+					suggestionsPromise = Promise.resolve({ suggestions: [] });
 				}
 
-				return wireCancellationToken(token, suggestionsPromise);
+				return suggestionsPromise;
 			}
 		}));
 	}
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
index da5740eba43..3daf1bd37ca 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
@@ -472,7 +472,7 @@ class Launch implements ILaunch {
 				});
 			}).then(content => {
 				if (!content) {
-					return undefined;
+					return { editor: undefined, created: false };
 				}
 				const index = content.indexOf(`"${this.configurationManager.selectedConfiguration.name}"`);
 				let startLineNumber = 1;
@@ -486,7 +486,6 @@ class Launch implements ILaunch {
 				return this.editorService.openEditor({
 					resource: resource,
 					options: {
-						forceOpen: true,
 						selection,
 						pinned: created,
 						revealIfVisible: true
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts b/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
index 60d0dda6202..992050fd338 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
@@ -46,6 +46,7 @@ import { ContextSubMenu } from 'vs/base/browser/contextmenu';
 import { memoize } from 'vs/base/common/decorators';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { getHover } from 'vs/editor/contrib/hover/getHover';
+import { IEditorHoverOptions } from 'vs/editor/common/config/editorOptions';
 
 const HOVER_DELAY = 300;
 const LAUNCH_JSON_REGEX = /launch\.json$/;
@@ -281,7 +282,9 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 	private _applyHoverConfiguration(model: ITextModel, stackFrame: IStackFrame): void {
 		if (stackFrame && model && model.uri.toString() === stackFrame.source.uri.toString()) {
 			this.editor.updateOptions({
-				hover: !stackFrame || !model || model.uri.toString() !== stackFrame.source.uri.toString()
+				hover: {
+					enabled: !stackFrame || !model || model.uri.toString() !== stackFrame.source.uri.toString()
+				}
 			});
 		} else {
 			let overrides: IConfigurationOverrides;
@@ -291,9 +294,13 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 					overrideIdentifier: model.getLanguageIdentifier().language
 				};
 			}
-			const defaultConfiguration = this.configurationService.getValue('editor.hover', overrides);
+			const defaultConfiguration = this.configurationService.getValue<IEditorHoverOptions>('editor.hover', overrides);
 			this.editor.updateOptions({
-				hover: defaultConfiguration
+				hover: {
+					enabled: defaultConfiguration.enabled,
+					delay: defaultConfiguration.delay,
+					sticky: defaultConfiguration.sticky
+				}
 			});
 		}
 	}
diff --git a/src/vs/workbench/parts/debug/electron-browser/repl.ts b/src/vs/workbench/parts/debug/electron-browser/repl.ts
index 8574e52a10e..35b974a511b 100644
--- a/src/vs/workbench/parts/debug/electron-browser/repl.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/repl.ts
@@ -24,7 +24,7 @@ import { registerEditorAction, ServicesAccessor, EditorAction, EditorCommand, re
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { MenuId } from 'vs/platform/actions/common/actions';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { IContextKeyService, ContextKeyExpr, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
@@ -84,6 +84,7 @@ export class Repl extends Panel implements IPrivateReplService, IHistoryNavigati
 	private dimension: dom.Dimension;
 	private replInputHeight: number;
 	private model: ITextModel;
+	private historyNavigationEnablement: IContextKey<boolean>;
 
 	constructor(
 		@IDebugService private debugService: IDebugService,
@@ -103,10 +104,10 @@ export class Repl extends Panel implements IPrivateReplService, IHistoryNavigati
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.debugService.getModel().onDidChangeReplElements(() => {
+		this._register(this.debugService.getModel().onDidChangeReplElements(() => {
 			this.refreshReplElements(this.debugService.getModel().getReplElements().length === 0);
 		}));
-		this.toUnbind.push(this.panelService.onDidPanelOpen(panel => this.refreshReplElements(true)));
+		this._register(this.panelService.onDidPanelOpen(panel => this.refreshReplElements(true)));
 	}
 
 	private refreshReplElements(noDelay: boolean): void {
@@ -153,7 +154,7 @@ export class Repl extends Panel implements IPrivateReplService, IHistoryNavigati
 		if (!visible) {
 			dispose(this.model);
 		} else {
-			this.model = this.modelService.createModel('', null, uri.parse(`${DEBUG_SCHEME}:input`), true);
+			this.model = this.modelService.createModel('', null, uri.parse(`${DEBUG_SCHEME}:replinput`), true);
 			this.replInput.setModel(this.model);
 		}
 
@@ -164,18 +165,19 @@ export class Repl extends Panel implements IPrivateReplService, IHistoryNavigati
 		this.replInputContainer = dom.append(container, $('.repl-input-wrapper'));
 
 		const { scopedContextKeyService, historyNavigationEnablement } = createAndBindHistoryNavigationWidgetScopedContextKeyService(this.contextKeyService, { target: this.replInputContainer, historyNavigator: this });
-		this.toUnbind.push(scopedContextKeyService);
+		this.historyNavigationEnablement = historyNavigationEnablement;
+		this._register(scopedContextKeyService);
 		CONTEXT_IN_DEBUG_REPL.bindTo(scopedContextKeyService).set(true);
 
 		const scopedInstantiationService = this.instantiationService.createChild(new ServiceCollection(
 			[IContextKeyService, scopedContextKeyService], [IPrivateReplService, this]));
 		this.replInput = scopedInstantiationService.createInstance(CodeEditorWidget, this.replInputContainer, SimpleDebugEditor.getEditorOptions(), SimpleDebugEditor.getCodeEditorWidgetOptions());
 
-		modes.SuggestRegistry.register({ scheme: DEBUG_SCHEME, hasAccessToAllModels: true }, {
+		modes.SuggestRegistry.register({ scheme: DEBUG_SCHEME, pattern: '**/replinput', hasAccessToAllModels: true }, {
 			triggerCharacters: ['.'],
 			provideCompletionItems: (model: ITextModel, position: Position, _context: modes.SuggestContext, token: CancellationToken): Thenable<modes.ISuggestResult> => {
 				// Disable history navigation because up and down are used to navigate through the suggest widget
-				historyNavigationEnablement.set(false);
+				this.historyNavigationEnablement.set(false);
 				const word = this.replInput.getModel().getWordAtPosition(position);
 				const overwriteBefore = word ? word.word.length : 0;
 				const text = this.replInput.getModel().getLineContent(position.lineNumber);
@@ -189,19 +191,19 @@ export class Repl extends Panel implements IPrivateReplService, IHistoryNavigati
 			}
 		});
 
-		this.toUnbind.push(this.replInput.onDidScrollChange(e => {
+		this._register(this.replInput.onDidScrollChange(e => {
 			if (!e.scrollHeightChanged) {
 				return;
 			}
 			this.replInputHeight = Math.max(Repl.REPL_INPUT_INITIAL_HEIGHT, Math.min(Repl.REPL_INPUT_MAX_HEIGHT, e.scrollHeight, this.dimension.height));
 			this.layout(this.dimension);
 		}));
-		this.toUnbind.push(this.replInput.onDidChangeModelContent(() => {
-			historyNavigationEnablement.set(this.replInput.getModel().getLineCount() === 1);
+		this._register(this.replInput.onDidChangeModelContent(() => {
+			this.historyNavigationEnablement.set(this.replInput.getModel().getValue() === '');
 		}));
 
-		this.toUnbind.push(dom.addStandardDisposableListener(this.replInputContainer, dom.EventType.FOCUS, () => dom.addClass(this.replInputContainer, 'synthetic-focus')));
-		this.toUnbind.push(dom.addStandardDisposableListener(this.replInputContainer, dom.EventType.BLUR, () => dom.removeClass(this.replInputContainer, 'synthetic-focus')));
+		this._register(dom.addStandardDisposableListener(this.replInputContainer, dom.EventType.FOCUS, () => dom.addClass(this.replInputContainer, 'synthetic-focus')));
+		this._register(dom.addStandardDisposableListener(this.replInputContainer, dom.EventType.BLUR, () => dom.removeClass(this.replInputContainer, 'synthetic-focus')));
 	}
 
 	private navigateHistory(previous: boolean): void {
@@ -210,6 +212,7 @@ export class Repl extends Panel implements IPrivateReplService, IHistoryNavigati
 			this.replInput.setValue(historyInput);
 			// always leave cursor at the end.
 			this.replInput.setPosition({ lineNumber: 1, column: historyInput.length + 1 });
+			this.historyNavigationEnablement.set(true);
 		}
 	}
 
@@ -279,9 +282,7 @@ export class Repl extends Panel implements IPrivateReplService, IHistoryNavigati
 				this.instantiationService.createInstance(ClearReplAction, ClearReplAction.ID, ClearReplAction.LABEL)
 			];
 
-			this.actions.forEach(a => {
-				this.toUnbind.push(a);
-			});
+			this.actions.forEach(a => this._register(a));
 		}
 
 		return this.actions;
diff --git a/src/vs/workbench/parts/debug/electron-browser/replViewer.ts b/src/vs/workbench/parts/debug/electron-browser/replViewer.ts
index 3a3d928fb31..c76295bd8f7 100644
--- a/src/vs/workbench/parts/debug/electron-browser/replViewer.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/replViewer.ts
@@ -24,6 +24,8 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { LinkDetector } from 'vs/workbench/parts/debug/browser/linkDetector';
 import { handleANSIOutput } from 'vs/workbench/parts/debug/browser/debugANSIHandling';
+import { getPathLabel } from 'vs/base/common/labels';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
 const $ = dom.$;
 
@@ -95,7 +97,8 @@ export class ReplExpressionsRenderer implements IRenderer {
 
 	constructor(
 		@IEditorService private editorService: IEditorService,
-		@IInstantiationService private instantiationService: IInstantiationService
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IEnvironmentService private environmentService: IEnvironmentService
 	) {
 		this.linkDetector = this.instantiationService.createInstance(LinkDetector);
 	}
@@ -258,7 +261,7 @@ export class ReplExpressionsRenderer implements IRenderer {
 
 		dom.addClass(templateData.value, (element.severity === severity.Warning) ? 'warn' : (element.severity === severity.Error) ? 'error' : (element.severity === severity.Ignore) ? 'ignore' : 'info');
 		templateData.source.textContent = element.sourceData ? `${element.sourceData.source.name}:${element.sourceData.lineNumber}` : '';
-		templateData.source.title = element.sourceData ? element.sourceData.source.uri.toString() : '';
+		templateData.source.title = element.sourceData ? getPathLabel(element.sourceData.source.uri, this.environmentService) : '';
 		templateData.getReplElementSource = () => element.sourceData;
 	}
 
diff --git a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
index f05ab8af4a4..91fc2c53456 100644
--- a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
@@ -22,7 +22,7 @@ export class TerminalLauncher implements ITerminalLauncher {
 	) {
 	}
 
-	async runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {
+	runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {
 
 		if (args.kind === 'external') {
 			return this.nativeTerminalService.runInTerminal(args.title, args.cwd, args.args, args.env || {});
diff --git a/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts b/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts
index c1b3079a4c2..5a517047652 100644
--- a/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts
@@ -50,7 +50,7 @@ export class WatchExpressionsView extends TreeViewsViewletPanel {
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IConfigurationService configurationService: IConfigurationService
 	) {
-		super({ ...(options as IViewletPanelOptions), ariaHeaderLabel: nls.localize('expressionsSection', "Expressions Section") }, keybindingService, contextMenuService, configurationService);
+		super({ ...(options as IViewletPanelOptions), ariaHeaderLabel: nls.localize('watchExpressionsSection', "Watch Expressions Section") }, keybindingService, contextMenuService, configurationService);
 		this.settings = options.viewletSettings;
 
 		this.onWatchExpressionsUpdatedScheduler = new RunOnceScheduler(() => {
diff --git a/src/vs/workbench/parts/debug/node/debugAdapter.ts b/src/vs/workbench/parts/debug/node/debugAdapter.ts
index 0e59f09acdd..a322f0d8779 100644
--- a/src/vs/workbench/parts/debug/node/debugAdapter.ts
+++ b/src/vs/workbench/parts/debug/node/debugAdapter.ts
@@ -321,6 +321,10 @@ export class DebugAdapter extends StreamDebugAdapter {
 
 	stopSession(): TPromise<void> {
 
+		if (!this.serverProcess) {
+			return TPromise.as(null);
+		}
+
 		// when killing a process in windows its child
 		// processes are *not* killed but become root
 		// processes. Therefore we use TASKKILL.EXE
diff --git a/src/vs/workbench/parts/experiments/electron-browser/experimentalPrompt.ts b/src/vs/workbench/parts/experiments/electron-browser/experimentalPrompt.ts
new file mode 100644
index 00000000000..9c59b4b6784
--- /dev/null
+++ b/src/vs/workbench/parts/experiments/electron-browser/experimentalPrompt.ts
@@ -0,0 +1,92 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
+import { INotificationService, Severity, IPromptChoice } from 'vs/platform/notification/common/notification';
+import { IExperimentService, IExperiment, ExperimentActionType, IExperimentActionPromptProperties, ExperimentState } from 'vs/workbench/parts/experiments/node/experimentService';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IExtensionsViewlet } from 'vs/workbench/parts/extensions/common/extensions';
+import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
+import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
+
+export class ExperimentalPrompts extends Disposable implements IWorkbenchContribution {
+	private _disposables: IDisposable[] = [];
+
+	constructor(
+		@IExperimentService private experimentService: IExperimentService,
+		@IViewletService private viewletService: IViewletService,
+		@INotificationService private notificationService: INotificationService,
+		@ITelemetryService private telemetryService: ITelemetryService
+
+	) {
+		super();
+		this.experimentService.onExperimentEnabled(e => {
+			if (e.action && e.action.type === ExperimentActionType.Prompt && e.state === ExperimentState.Run) {
+				this.showExperimentalPrompts(e);
+			}
+		}, this, this._disposables);
+	}
+
+	private showExperimentalPrompts(experiment: IExperiment): void {
+		if (!experiment || !experiment.enabled || !experiment.action || experiment.state !== ExperimentState.Run) {
+			return;
+		}
+
+		const logTelemetry = (commandText?: string) => {
+			/* __GDPR__
+				"experimentalPrompts" : {
+					"experimentId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"commandText": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"cancelled": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
+				}
+			*/
+			this.telemetryService.publicLog('experimentalPrompts', {
+				experimentId: experiment.id,
+				commandText,
+				cancelled: !commandText
+			});
+		};
+
+		const actionProperties = (<IExperimentActionPromptProperties>experiment.action.properties);
+		if (!actionProperties || !actionProperties.promptText) {
+			return;
+		}
+		if (!actionProperties.commands) {
+			actionProperties.commands = [];
+		}
+
+		const choices: IPromptChoice[] = actionProperties.commands.map(command => {
+			return {
+				label: command.text,
+				run: () => {
+					logTelemetry(command.text);
+					if (command.externalLink) {
+						window.open(command.externalLink);
+						return;
+					}
+					if (command.curatedExtensionsKey && Array.isArray(command.curatedExtensionsList)) {
+						this.viewletService.openViewlet('workbench.view.extensions', true)
+							.then(viewlet => viewlet as IExtensionsViewlet)
+							.then(viewlet => {
+								if (viewlet) {
+									viewlet.search('curated:' + command.curatedExtensionsKey);
+								}
+							});
+						return;
+					}
+
+					this.experimentService.markAsCompleted(experiment.id);
+
+				}
+			};
+		});
+
+		this.notificationService.prompt(Severity.Info, actionProperties.promptText, choices, logTelemetry);
+	}
+
+	dispose() {
+		this._disposables = dispose(this._disposables);
+	}
+}
diff --git a/src/vs/workbench/parts/experiments/electron-browser/experiments.contribution.ts b/src/vs/workbench/parts/experiments/electron-browser/experiments.contribution.ts
new file mode 100644
index 00000000000..93811199b24
--- /dev/null
+++ b/src/vs/workbench/parts/experiments/electron-browser/experiments.contribution.ts
@@ -0,0 +1,16 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { IExperimentService, ExperimentService } from 'vs/workbench/parts/experiments/node/experimentService';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
+import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { ExperimentalPrompts } from 'vs/workbench/parts/experiments/electron-browser/experimentalPrompt';
+
+registerSingleton(IExperimentService, ExperimentService);
+
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(ExperimentalPrompts, LifecyclePhase.Eventually);
diff --git a/src/vs/workbench/parts/experiments/node/experimentService.ts b/src/vs/workbench/parts/experiments/node/experimentService.ts
new file mode 100644
index 00000000000..66d54a3904b
--- /dev/null
+++ b/src/vs/workbench/parts/experiments/node/experimentService.ts
@@ -0,0 +1,397 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import product from 'vs/platform/node/product';
+
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+
+import { IExtensionManagementService, LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IRequestService } from 'vs/platform/request/node/request';
+
+import { TPromise } from 'vs/base/common/winjs.base';
+import { language } from 'vs/base/common/platform';
+import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { match } from 'vs/base/common/glob';
+import { asJson } from 'vs/base/node/request';
+
+import { ITextFileService, StateChange } from 'vs/workbench/services/textfile/common/textfiles';
+import { WorkspaceStats } from 'vs/workbench/parts/stats/node/workspaceStats';
+import { Emitter, Event } from 'vs/base/common/event';
+
+
+interface IExperimentStorageState {
+	enabled: boolean;
+	state: ExperimentState;
+	editCount?: number;
+	lastEditedDate?: string;
+}
+
+export enum ExperimentState {
+	Evaluating,
+	NoRun,
+	Run,
+	Complete
+}
+
+interface IRawExperiment {
+	id: string;
+	enabled?: boolean;
+	condition?: {
+		insidersOnly?: boolean;
+		displayLanguage?: string;
+		installedExtensions?: {
+			excludes?: string[];
+			includes?: string[];
+		},
+		fileEdits?: {
+			filePathPattern?: string;
+			workspaceIncludes?: string[];
+			workspaceExcludes?: string[];
+			minEditCount: number;
+		},
+		userProbability?: number;
+	};
+	action?: { type: string; properties: any };
+}
+
+export interface IExperimentActionPromptProperties {
+	promptText: string;
+	commands: IExperimentActionPromptCommand[];
+}
+
+interface IExperimentActionPromptCommand {
+	text: string;
+	externalLink?: string;
+	dontShowAgain?: boolean;
+	curatedExtensionsKey?: string;
+	curatedExtensionsList?: string[];
+}
+
+export interface IExperiment {
+	id: string;
+	enabled: boolean;
+	state: ExperimentState;
+	action?: IExperimentAction;
+}
+
+export enum ExperimentActionType {
+	Custom,
+	Prompt,
+	AddToRecommendations
+}
+
+interface IExperimentAction {
+	type: ExperimentActionType;
+	properties: any;
+}
+
+export interface IExperimentService {
+	_serviceBrand: any;
+	getExperimentById(id: string): TPromise<IExperiment>;
+	getExperimentsToRunByType(type: ExperimentActionType): TPromise<IExperiment[]>;
+	getCuratedExtensionsList(curatedExtensionsKey: string): TPromise<string[]>;
+	markAsCompleted(experimentId: string): void;
+
+	onExperimentEnabled: Event<IExperiment>;
+}
+
+export const IExperimentService = createDecorator<IExperimentService>('experimentService');
+
+export class ExperimentService extends Disposable implements IExperimentService {
+	_serviceBrand: any;
+	private _experiments: IExperiment[] = [];
+	private _loadExperimentsPromise: TPromise<void>;
+	private _curatedMapping = Object.create(null);
+	private _disposables: IDisposable[] = [];
+
+	private readonly _onExperimentEnabled: Emitter<IExperiment> = new Emitter<IExperiment>();
+
+	onExperimentEnabled: Event<IExperiment> = this._onExperimentEnabled.event;
+	constructor(
+		@IStorageService private storageService: IStorageService,
+		@IExtensionManagementService private extensionManagementService: IExtensionManagementService,
+		@ITextFileService private textFileService: ITextFileService,
+		@IEnvironmentService private environmentService: IEnvironmentService,
+		@ITelemetryService private telemetryService: ITelemetryService,
+		@ILifecycleService private lifecycleService: ILifecycleService,
+		@IRequestService private requestService: IRequestService
+	) {
+		super();
+
+		this._loadExperimentsPromise = TPromise.wrap(this.lifecycleService.when(LifecyclePhase.Eventually)).then(() => this.loadExperiments());
+	}
+
+	public getExperimentById(id: string): TPromise<IExperiment> {
+		return this._loadExperimentsPromise.then(() => {
+			return this._experiments.filter(x => x.id === id)[0];
+		});
+	}
+
+	public getExperimentsToRunByType(type: ExperimentActionType): TPromise<IExperiment[]> {
+		return this._loadExperimentsPromise.then(() => {
+			if (type === ExperimentActionType.Custom) {
+				return this._experiments.filter(x => x.enabled && x.state === ExperimentState.Run && (!x.action || x.action.type === type));
+			}
+			return this._experiments.filter(x => x.enabled && x.state === ExperimentState.Run && x.action && x.action.type === type);
+		});
+	}
+
+	public getCuratedExtensionsList(curatedExtensionsKey: string): TPromise<string[]> {
+		return this._loadExperimentsPromise.then(() => {
+			for (let i = 0; i < this._experiments.length; i++) {
+				if (this._experiments[i].enabled
+					&& this._experiments[i].state === ExperimentState.Run
+					&& this._curatedMapping[this._experiments[i].id]
+					&& this._curatedMapping[this._experiments[i].id].curatedExtensionsKey === curatedExtensionsKey) {
+					return this._curatedMapping[this._experiments[i].id].curatedExtensionsList;
+				}
+			}
+			return [];
+		});
+	}
+
+	public markAsCompleted(experimentId: string): void {
+		const storageKey = 'experiments.' + experimentId;
+		const experimentState: IExperimentStorageState = safeParse(this.storageService.get(storageKey, StorageScope.GLOBAL), {});
+		experimentState.state = ExperimentState.Complete;
+		this.storageService.store(storageKey, JSON.stringify(experimentState), StorageScope.GLOBAL);
+	}
+
+	protected getExperiments(): TPromise<IRawExperiment[]> {
+		if (!product.experimentsUrl) {
+			return TPromise.as([]);
+		}
+		return this.requestService.request({ type: 'GET', url: product.experimentsUrl }).then(context => {
+			if (context.res.statusCode !== 200) {
+				return TPromise.as(null);
+			}
+			return asJson(context).then(result => {
+				return Array.isArray<IRawExperiment>(result['experiments']) ? result['experiments'] : [];
+			});
+		}, () => TPromise.as(null));
+	}
+
+	private loadExperiments(): TPromise<any> {
+		return this.getExperiments().then(rawExperiments => {
+			// Offline mode
+			if (!rawExperiments) {
+				const allExperimentIdsFromStorage = safeParse(this.storageService.get('allExperiments', StorageScope.GLOBAL), []);
+				if (Array.isArray(allExperimentIdsFromStorage)) {
+					allExperimentIdsFromStorage.forEach(experimentId => {
+						const storageKey = 'experiments.' + experimentId;
+						const experimentState: IExperimentStorageState = safeParse(this.storageService.get(storageKey, StorageScope.GLOBAL), null);
+						if (experimentState) {
+							this._experiments.push({
+								id: experimentId,
+								enabled: experimentState.enabled,
+								state: experimentState.state
+							});
+						}
+					});
+				}
+				return TPromise.as(null);
+			}
+
+			// Clear disbaled/deleted experiments from storage
+			const allExperimentIdsFromStorage = safeParse(this.storageService.get('allExperiments', StorageScope.GLOBAL), []);
+			const enabledExperiments = rawExperiments.filter(experiment => !!experiment.enabled).map(experiment => experiment.id.toLowerCase());
+			if (Array.isArray(allExperimentIdsFromStorage)) {
+				allExperimentIdsFromStorage.forEach(experiment => {
+					if (enabledExperiments.indexOf(experiment) === -1) {
+						this.storageService.remove('experiments.' + experiment);
+					}
+				});
+			}
+			this.storageService.store('allExperiments', JSON.stringify(enabledExperiments), StorageScope.GLOBAL);
+
+			const promises = rawExperiments.map(experiment => {
+				const processedExperiment: IExperiment = {
+					id: experiment.id,
+					enabled: !!experiment.enabled,
+					state: !!experiment.enabled ? ExperimentState.Evaluating : ExperimentState.NoRun
+				};
+
+				if (experiment.action) {
+					processedExperiment.action = {
+						type: ExperimentActionType[experiment.action.type] || ExperimentActionType.Custom,
+						properties: experiment.action.properties
+					};
+					if (processedExperiment.action.type === ExperimentActionType.Prompt) {
+						((<IExperimentActionPromptProperties>processedExperiment.action.properties).commands || []).forEach(x => {
+							if (x.curatedExtensionsKey && Array.isArray(x.curatedExtensionsList)) {
+								this._curatedMapping[experiment.id] = x;
+							}
+						});
+					}
+				}
+				this._experiments.push(processedExperiment);
+
+				if (!processedExperiment.enabled) {
+					return TPromise.as(null);
+				}
+
+				const storageKey = 'experiments.' + experiment.id;
+				const experimentState: IExperimentStorageState = safeParse(this.storageService.get(storageKey, StorageScope.GLOBAL), {});
+				if (!experimentState.hasOwnProperty('enabled')) {
+					experimentState.enabled = processedExperiment.enabled;
+				}
+				if (!experimentState.hasOwnProperty('state')) {
+					experimentState.state = processedExperiment.enabled ? ExperimentState.Evaluating : ExperimentState.NoRun;
+				} else {
+					processedExperiment.state = experimentState.state;
+				}
+
+				return this.shouldRunExperiment(experiment, processedExperiment).then((state: ExperimentState) => {
+					experimentState.state = processedExperiment.state = state;
+					this.storageService.store(storageKey, JSON.stringify(experimentState));
+
+					if (state === ExperimentState.Run) {
+						this._onExperimentEnabled.fire(processedExperiment);
+					}
+					return TPromise.as(null);
+				});
+
+			});
+			return TPromise.join(promises).then(() => {
+				this.telemetryService.publicLog('experiments', this._experiments);
+			});
+		});
+	}
+
+	private shouldRunExperiment(experiment: IRawExperiment, processedExperiment: IExperiment): TPromise<ExperimentState> {
+		if (processedExperiment.state !== ExperimentState.Evaluating) {
+			return TPromise.wrap(processedExperiment.state);
+		}
+
+		if (!experiment.enabled) {
+			return TPromise.wrap(ExperimentState.NoRun);
+		}
+
+		if (!experiment.condition) {
+			return TPromise.wrap(ExperimentState.Run);
+		}
+
+		if (this.environmentService.appQuality === 'stable' && experiment.condition.insidersOnly === true) {
+			return TPromise.wrap(ExperimentState.NoRun);
+		}
+
+		if (typeof experiment.condition.displayLanguage === 'string') {
+			let localeToCheck = experiment.condition.displayLanguage.toLowerCase();
+			let displayLanguage = language.toLowerCase();
+
+			if (localeToCheck !== displayLanguage) {
+				const a = displayLanguage.indexOf('-');
+				const b = localeToCheck.indexOf('-');
+				if (a > -1) {
+					displayLanguage = displayLanguage.substr(0, a);
+				}
+				if (b > -1) {
+					localeToCheck = localeToCheck.substr(0, b);
+				}
+				if (displayLanguage !== localeToCheck) {
+					return TPromise.wrap(ExperimentState.NoRun);
+				}
+			}
+		}
+
+		if (!experiment.condition.userProbability) {
+			experiment.condition.userProbability = 1;
+		}
+
+		let extensionsCheckPromise = TPromise.as(true);
+		if (experiment.condition.installedExtensions) {
+			extensionsCheckPromise = this.extensionManagementService.getInstalled(LocalExtensionType.User).then(locals => {
+				let includesCheck = true;
+				let excludesCheck = true;
+				const localExtensions = locals.map(local => `${local.manifest.publisher.toLowerCase()}.${local.manifest.name.toLowerCase()}`);
+				if (Array.isArray(experiment.condition.installedExtensions.includes) && experiment.condition.installedExtensions.includes.length) {
+					const extensionIncludes = experiment.condition.installedExtensions.includes.map(e => e.toLowerCase());
+					includesCheck = localExtensions.some(e => extensionIncludes.indexOf(e) > -1);
+				}
+				if (Array.isArray(experiment.condition.installedExtensions.excludes) && experiment.condition.installedExtensions.excludes.length) {
+					const extensionExcludes = experiment.condition.installedExtensions.excludes.map(e => e.toLowerCase());
+					excludesCheck = !localExtensions.some(e => extensionExcludes.indexOf(e) > -1);
+				}
+				return includesCheck && excludesCheck;
+			});
+		}
+
+		const storageKey = 'experiments.' + experiment.id;
+		const experimentState: IExperimentStorageState = safeParse(this.storageService.get(storageKey, StorageScope.GLOBAL), {});
+
+		return extensionsCheckPromise.then(success => {
+			if (!success || !experiment.condition.fileEdits || typeof experiment.condition.fileEdits.minEditCount !== 'number') {
+				const runExperiment = success && Math.random() < experiment.condition.userProbability;
+				return runExperiment ? ExperimentState.Run : ExperimentState.NoRun;
+			}
+
+			experimentState.editCount = experimentState.editCount || 0;
+			if (experimentState.editCount >= experiment.condition.fileEdits.minEditCount) {
+				return ExperimentState.Run;
+			}
+
+			const onSaveHandler = this.textFileService.models.onModelsSaved(e => {
+				const date = new Date().toDateString();
+				const latestExperimentState: IExperimentStorageState = safeParse(this.storageService.get(storageKey, StorageScope.GLOBAL), {});
+				if (latestExperimentState.state !== ExperimentState.Evaluating) {
+					onSaveHandler.dispose();
+					return;
+				}
+				e.forEach(event => {
+					if (event.kind !== StateChange.SAVED
+						|| latestExperimentState.state !== ExperimentState.Evaluating
+						|| date === latestExperimentState.lastEditedDate
+						|| latestExperimentState.editCount >= experiment.condition.fileEdits.minEditCount) {
+						return;
+					}
+					let filePathCheck = true;
+					let workspaceCheck = true;
+
+					if (typeof experiment.condition.fileEdits.filePathPattern === 'string') {
+						filePathCheck = match(experiment.condition.fileEdits.filePathPattern, event.resource.fsPath);
+					}
+					if (Array.isArray(experiment.condition.fileEdits.workspaceIncludes) && experiment.condition.fileEdits.workspaceIncludes.length) {
+						workspaceCheck = experiment.condition.fileEdits.workspaceIncludes.some(x => !!WorkspaceStats.tags[x]);
+					}
+					if (workspaceCheck && Array.isArray(experiment.condition.fileEdits.workspaceExcludes) && experiment.condition.fileEdits.workspaceExcludes.length) {
+						workspaceCheck = !experiment.condition.fileEdits.workspaceExcludes.some(x => !!WorkspaceStats.tags[x]);
+					}
+					if (filePathCheck && workspaceCheck) {
+						latestExperimentState.editCount = (latestExperimentState.editCount || 0) + 1;
+						latestExperimentState.lastEditedDate = date;
+						this.storageService.store(storageKey, JSON.stringify(latestExperimentState), StorageScope.GLOBAL);
+					}
+				});
+				if (latestExperimentState.editCount >= experiment.condition.fileEdits.minEditCount) {
+					processedExperiment.state = latestExperimentState.state = Math.random() < experiment.condition.userProbability ? ExperimentState.Run : ExperimentState.NoRun;
+					this.storageService.store(storageKey, JSON.stringify(latestExperimentState), StorageScope.GLOBAL);
+					if (latestExperimentState.state === ExperimentState.Run && ExperimentActionType[experiment.action.type] === ExperimentActionType.Prompt) {
+						this._onExperimentEnabled.fire(processedExperiment);
+					}
+				}
+			});
+			this._disposables.push(onSaveHandler);
+			return ExperimentState.Evaluating;
+		});
+	}
+
+	dispose() {
+		this._disposables = dispose(this._disposables);
+	}
+}
+
+
+function safeParse(text: string, defaultObject: any) {
+	try {
+		return JSON.parse(text) || defaultObject;
+	}
+	catch (e) {
+		return defaultObject;
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/experiments/test/electron-browser/experimentalPrompts.test.ts b/src/vs/workbench/parts/experiments/test/electron-browser/experimentalPrompts.test.ts
new file mode 100644
index 00000000000..3edba678b81
--- /dev/null
+++ b/src/vs/workbench/parts/experiments/test/electron-browser/experimentalPrompts.test.ts
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { IExperiment, ExperimentActionType, IExperimentService, ExperimentState } from 'vs/workbench/parts/experiments/node/experimentService';
+
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { Emitter } from 'vs/base/common/event';
+import { TestExperimentService } from 'vs/workbench/parts/experiments/test/node/experimentService.test';
+import { ExperimentalPrompts } from 'vs/workbench/parts/experiments/electron-browser/experimentalPrompt';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { INotificationService, Severity, IPromptChoice } from 'vs/platform/notification/common/notification';
+import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
+import { TestLifecycleService } from 'vs/workbench/test/workbenchTestServices';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
+import { TPromise } from 'vs/base/common/winjs.base';
+
+suite('Experimental Prompts', () => {
+	let instantiationService: TestInstantiationService;
+	let experimentService: TestExperimentService;
+	let experimentalPrompt: ExperimentalPrompts;
+	let onExperimentEnabledEvent: Emitter<IExperiment>;
+
+	let storageData = {};
+	const promptText = 'Hello there! Can you see this?';
+	const experiment: IExperiment =
+	{
+		id: 'experiment1',
+		enabled: true,
+		state: ExperimentState.Run,
+		action: {
+			type: ExperimentActionType.Prompt,
+			properties: {
+				promptText,
+				commands: [
+					{
+						text: 'Yes',
+						dontShowAgain: true
+					},
+					{
+						text: 'No'
+					}
+				]
+			}
+		}
+	};
+
+	suiteSetup(() => {
+		instantiationService = new TestInstantiationService();
+
+		instantiationService.stub(ILifecycleService, new TestLifecycleService());
+		instantiationService.stub(ITelemetryService, NullTelemetryService);
+
+		onExperimentEnabledEvent = new Emitter<IExperiment>();
+
+	});
+
+	setup(() => {
+		storageData = {};
+		instantiationService.stub(IStorageService, {
+			get: (a, b, c) => a === 'experiments.experiment1' ? JSON.stringify(storageData) : c,
+			store: (a, b, c) => {
+				if (a === 'experiments.experiment1') {
+					storageData = JSON.parse(b);
+				}
+			}
+		});
+		instantiationService.stub(INotificationService, new TestNotificationService());
+		experimentService = instantiationService.createInstance(TestExperimentService);
+		experimentService.onExperimentEnabled = onExperimentEnabledEvent.event;
+		instantiationService.stub(IExperimentService, experimentService);
+	});
+
+	teardown(() => {
+		if (experimentService) {
+			experimentService.dispose();
+		}
+		if (experimentalPrompt) {
+			experimentalPrompt.dispose();
+		}
+	});
+
+
+	test('Show experimental prompt if experiment should be run. Choosing an option should mark experiment as complete', () => {
+
+		storageData = {
+			enabled: true,
+			state: ExperimentState.Run
+		};
+
+		instantiationService.stub(INotificationService, {
+			prompt: (a: Severity, b: string, c: IPromptChoice[], d) => {
+				assert.equal(b, promptText);
+				assert.equal(c.length, 2);
+				c[0].run();
+			}
+		});
+
+		experimentalPrompt = instantiationService.createInstance(ExperimentalPrompts);
+		onExperimentEnabledEvent.fire(experiment);
+
+		return TPromise.as(null).then(result => {
+			assert.equal(storageData['state'], ExperimentState.Complete);
+		});
+
+	});
+});
\ No newline at end of file
diff --git a/src/vs/workbench/parts/experiments/test/node/experimentService.test.ts b/src/vs/workbench/parts/experiments/test/node/experimentService.test.ts
new file mode 100644
index 00000000000..fe37e429d49
--- /dev/null
+++ b/src/vs/workbench/parts/experiments/test/node/experimentService.test.ts
@@ -0,0 +1,650 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ExperimentService, ExperimentActionType, ExperimentState } from 'vs/workbench/parts/experiments/node/experimentService';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { TestLifecycleService } from 'vs/workbench/test/workbenchTestServices';
+import {
+	IExtensionManagementService, DidInstallExtensionEvent, DidUninstallExtensionEvent, InstallExtensionEvent, IExtensionIdentifier,
+	IExtensionEnablementService, ILocalExtension, LocalExtensionType
+} from 'vs/platform/extensionManagement/common/extensionManagement';
+import { ExtensionManagementService, getLocalExtensionIdFromManifest } from 'vs/platform/extensionManagement/node/extensionManagementService';
+import { Emitter } from 'vs/base/common/event';
+import { TestExtensionEnablementService } from 'vs/platform/extensionManagement/test/common/extensionEnablementService.test';
+import { URLService } from 'vs/platform/url/common/urlService';
+import { IURLService } from 'vs/platform/url/common/url';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
+import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { assign } from 'vs/base/common/objects';
+import URI from 'vs/base/common/uri';
+
+let experimentData = {
+	experiments: []
+};
+
+const local = aLocalExtension('installedExtension1', { version: '1.0.0' });
+
+function aLocalExtension(name: string = 'someext', manifest: any = {}, properties: any = {}): ILocalExtension {
+	const localExtension = <ILocalExtension>Object.create({ manifest: {} });
+	assign(localExtension, { type: LocalExtensionType.User, manifest: {}, location: URI.file(`pub.${name}`) }, properties);
+	assign(localExtension.manifest, { name, publisher: 'pub', version: '1.0.0' }, manifest);
+	localExtension.identifier = { id: getLocalExtensionIdFromManifest(localExtension.manifest) };
+	localExtension.metadata = { id: localExtension.identifier.id, publisherId: localExtension.manifest.publisher, publisherDisplayName: 'somename' };
+	return localExtension;
+}
+
+export class TestExperimentService extends ExperimentService {
+	public getExperiments(): TPromise<any[]> {
+		return TPromise.wrap(experimentData.experiments);
+	}
+}
+
+suite('Experiment Service', () => {
+	let instantiationService: TestInstantiationService;
+	let testConfigurationService: TestConfigurationService;
+	let testObject: ExperimentService;
+	let installEvent: Emitter<InstallExtensionEvent>,
+		didInstallEvent: Emitter<DidInstallExtensionEvent>,
+		uninstallEvent: Emitter<IExtensionIdentifier>,
+		didUninstallEvent: Emitter<DidUninstallExtensionEvent>;
+
+	suiteSetup(() => {
+		instantiationService = new TestInstantiationService();
+		installEvent = new Emitter<InstallExtensionEvent>();
+		didInstallEvent = new Emitter<DidInstallExtensionEvent>();
+		uninstallEvent = new Emitter<IExtensionIdentifier>();
+		didUninstallEvent = new Emitter<DidUninstallExtensionEvent>();
+
+		instantiationService.stub(IExtensionManagementService, ExtensionManagementService);
+		instantiationService.stub(IExtensionManagementService, 'onInstallExtension', installEvent.event);
+		instantiationService.stub(IExtensionManagementService, 'onDidInstallExtension', didInstallEvent.event);
+		instantiationService.stub(IExtensionManagementService, 'onUninstallExtension', uninstallEvent.event);
+		instantiationService.stub(IExtensionManagementService, 'onDidUninstallExtension', didUninstallEvent.event);
+		instantiationService.stub(IExtensionEnablementService, new TestExtensionEnablementService(instantiationService));
+		instantiationService.stub(ITelemetryService, NullTelemetryService);
+		instantiationService.stub(IURLService, URLService);
+		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+		testConfigurationService = new TestConfigurationService();
+		instantiationService.stub(IConfigurationService, testConfigurationService);
+		instantiationService.stub(ILifecycleService, new TestLifecycleService());
+		instantiationService.stub(IStorageService, { get: (a, b, c) => c, getBoolean: (a, b, c) => c, store: () => { } });
+
+		setup(() => {
+			instantiationService.stub(IEnvironmentService, {});
+			instantiationService.stub(IStorageService, { get: (a, b, c) => c, getBoolean: (a, b, c) => c, store: () => { } });
+		});
+
+		teardown(() => {
+			if (testObject) {
+				testObject.dispose();
+			}
+		});
+	});
+
+	test('Simple Experiment Test', () => {
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1'
+				},
+				{
+					id: 'experiment2',
+					enabled: false
+				},
+				{
+					id: 'experiment3',
+					enabled: true
+				},
+				{
+					id: 'experiment4',
+					enabled: true,
+					condition: {
+
+					}
+				},
+				{
+					id: 'experiment5',
+					enabled: true,
+					condition: {
+						insidersOnly: true
+					}
+				}
+			]
+		};
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		const tests = [];
+		tests.push(testObject.getExperimentById('experiment1'));
+		tests.push(testObject.getExperimentById('experiment2'));
+		tests.push(testObject.getExperimentById('experiment3'));
+		tests.push(testObject.getExperimentById('experiment4'));
+		tests.push(testObject.getExperimentById('experiment5'));
+
+		return TPromise.join(tests).then(results => {
+			assert.equal(results[0].id, 'experiment1');
+			assert.equal(results[0].enabled, false);
+			assert.equal(results[0].state, ExperimentState.NoRun);
+
+			assert.equal(results[1].id, 'experiment2');
+			assert.equal(results[1].enabled, false);
+			assert.equal(results[1].state, ExperimentState.NoRun);
+
+			assert.equal(results[2].id, 'experiment3');
+			assert.equal(results[2].enabled, true);
+			assert.equal(results[2].state, ExperimentState.Run);
+
+			assert.equal(results[3].id, 'experiment4');
+			assert.equal(results[3].enabled, true);
+			assert.equal(results[3].state, ExperimentState.Run);
+
+			assert.equal(results[4].id, 'experiment5');
+			assert.equal(results[4].enabled, true);
+			assert.equal(results[4].state, ExperimentState.Run);
+		});
+	});
+
+	test('Insiders only experiment shouldnt be enabled in stable', () => {
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: true,
+					condition: {
+						insidersOnly: true
+					}
+				}
+			]
+		};
+
+		instantiationService.stub(IEnvironmentService, { appQuality: 'stable' });
+		testObject = instantiationService.createInstance(TestExperimentService);
+		return testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.enabled, true);
+			assert.equal(result.state, ExperimentState.NoRun);
+		});
+	});
+
+	test('Experiment with no matching display language should be disabled', () => {
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: true,
+					condition: {
+						displayLanguage: 'somethingthat-nooneknows'
+					}
+				}
+			]
+		};
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		return testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.enabled, true);
+			assert.equal(result.state, ExperimentState.NoRun);
+		});
+	});
+
+	test('Experiment with condition type InstalledExtensions is enabled when one of the expected extensions is installed', () => {
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: true,
+					condition: {
+						installedExtensions: {
+							inlcudes: ['pub.installedExtension1', 'uninstalled-extention-id']
+						}
+					}
+				}
+			]
+		};
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		return testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.enabled, true);
+			assert.equal(result.state, ExperimentState.Run);
+		});
+	});
+
+	test('Experiment with condition type InstalledExtensions is disabled when none of the expected extensions is installed', () => {
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: true,
+					condition: {
+						installedExtensions: {
+							includes: ['uninstalled-extention-id1', 'uninstalled-extention-id2']
+						}
+					}
+				}
+			]
+		};
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		return testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.enabled, true);
+			assert.equal(result.state, ExperimentState.NoRun);
+		});
+	});
+
+	test('Experiment with condition type InstalledExtensions is disabled when one of the exlcuded extensions is installed', () => {
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: true,
+					condition: {
+						installedExtensions: {
+							excludes: ['pub.installedExtension1', 'uninstalled-extention-id2']
+						}
+					}
+				}
+			]
+		};
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		return testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.enabled, true);
+			assert.equal(result.state, ExperimentState.NoRun);
+		});
+	});
+
+	test('Experiment that is marked as complete should be disabled regardless of the conditions', () => {
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: true,
+					condition: {
+						installedExtensions: {
+							includes: ['pub.installedExtension1', 'uninstalled-extention-id2']
+						}
+					}
+				}
+			]
+		};
+
+		instantiationService.stub(IStorageService, {
+			get: (a, b, c) => a === 'experiments.experiment1' ? JSON.stringify({ state: ExperimentState.Complete }) : c,
+			store: (a, b, c) => { }
+		});
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		return testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.enabled, true);
+			assert.equal(result.state, ExperimentState.Complete);
+		});
+	});
+
+	test('Experiment with evaluate only once should read enablement from storage service', () => {
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: true,
+					condition: {
+						installedExtensions: {
+							excludes: ['pub.installedExtension1', 'uninstalled-extention-id2']
+						},
+						evaluateOnlyOnce: true
+					}
+				}
+			]
+		};
+
+		instantiationService.stub(IStorageService, {
+			get: (a, b, c) => a === 'experiments.experiment1' ? JSON.stringify({ enabled: true, state: ExperimentState.Run }) : c,
+			store: (a, b, c) => { }
+		});
+		testObject = instantiationService.createInstance(TestExperimentService);
+		return testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.enabled, true);
+			assert.equal(result.state, ExperimentState.Run);
+		});
+	});
+
+	test('Curated list should be available if experiment is enabled.', () => {
+		const promptText = 'Hello there! Can you see this?';
+		const curatedExtensionsKey = 'AzureDeploy';
+		const curatedExtensionsList = ['uninstalled-extention-id1', 'uninstalled-extention-id2'];
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: true,
+					action: {
+						type: 'Prompt',
+						properties: {
+							promptText,
+							commands: [
+								{
+									text: 'Search Marketplace',
+									dontShowAgain: true,
+									curatedExtensionsKey,
+									curatedExtensionsList
+								},
+								{
+									text: 'No'
+								}
+							]
+						}
+					}
+				}
+			]
+		};
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		return testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.enabled, true);
+			assert.equal(result.state, ExperimentState.Run);
+			return testObject.getCuratedExtensionsList(curatedExtensionsKey).then(curatedList => {
+				assert.equal(curatedList, curatedExtensionsList);
+			});
+		});
+	});
+
+	test('Curated list shouldnt be available if experiment is disabled.', () => {
+		const promptText = 'Hello there! Can you see this?';
+		const curatedExtensionsKey = 'AzureDeploy';
+		const curatedExtensionsList = ['uninstalled-extention-id1', 'uninstalled-extention-id2'];
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: false,
+					action: {
+						type: 'Prompt',
+						properties: {
+							promptText,
+							commands: [
+								{
+									text: 'Search Marketplace',
+									dontShowAgain: true,
+									curatedExtensionsKey,
+									curatedExtensionsList
+								},
+								{
+									text: 'No'
+								}
+							]
+						}
+					}
+				}
+			]
+		};
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		return testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.enabled, false);
+			assert.equal(result.state, ExperimentState.NoRun);
+			return testObject.getCuratedExtensionsList(curatedExtensionsKey).then(curatedList => {
+				assert.equal(curatedList.length, 0);
+			});
+		});
+	});
+
+	test('Experiment that is disabled or deleted should be removed from storage', () => {
+		experimentData = {
+			experiments: [
+				{
+					id: 'experiment1',
+					enabled: false
+				},
+				{
+					id: 'experiment3',
+					enabled: true
+				}
+			]
+		};
+
+		let storageDataExperiment1 = { enabled: false };
+		let storageDataExperiment2 = { enabled: false };
+		let storageDataAllExperiments = ['experiment1', 'experiment2', 'experiment3'];
+		instantiationService.stub(IStorageService, {
+			get: (a, b, c) => {
+				switch (a) {
+					case 'experiments.experiment1':
+						return JSON.stringify(storageDataExperiment1);
+					case 'experiments.experiment2':
+						return JSON.stringify(storageDataExperiment2);
+					case 'allExperiments':
+						return JSON.stringify(storageDataAllExperiments);
+					default:
+						break;
+				}
+				return c;
+			},
+			store: (a, b, c) => {
+				switch (a) {
+					case 'experiments.experiment1':
+						storageDataExperiment1 = JSON.parse(b);
+						break;
+					case 'experiments.experiment2':
+						storageDataExperiment2 = JSON.parse(b);
+						break;
+					case 'allExperiments':
+						storageDataAllExperiments = JSON.parse(b);
+						break;
+					default:
+						break;
+				}
+			},
+			remove: a => {
+				switch (a) {
+					case 'experiments.experiment1':
+						storageDataExperiment1 = null;
+						break;
+					case 'experiments.experiment2':
+						storageDataExperiment2 = null;
+						break;
+					case 'allExperiments':
+						storageDataAllExperiments = null;
+						break;
+					default:
+						break;
+				}
+			}
+		});
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		const disabledExperiment = testObject.getExperimentById('experiment1').then(result => {
+			assert.equal(result.enabled, false);
+			assert.equal(!!storageDataExperiment1, false);
+		});
+		const deletedExperiment = testObject.getExperimentById('experiment2').then(result => {
+			assert.equal(!!result, false);
+			assert.equal(!!storageDataExperiment2, false);
+		});
+		return TPromise.join([disabledExperiment, deletedExperiment]).then(() => {
+			assert.equal(storageDataAllExperiments.length, 1);
+			assert.equal(storageDataAllExperiments[0], 'experiment3');
+		});
+
+	});
+
+	test('Offline mode', () => {
+		experimentData = {
+			experiments: null
+		};
+
+		let storageDataExperiment1 = { enabled: true, state: ExperimentState.Run };
+		let storageDataExperiment2 = { enabled: true, state: ExperimentState.NoRun };
+		let storageDataExperiment3 = { enabled: true, state: ExperimentState.Evaluating };
+		let storageDataExperiment4 = { enabled: true, state: ExperimentState.Complete };
+		let storageDataAllExperiments = ['experiment1', 'experiment2', 'experiment3', 'experiment4'];
+		instantiationService.stub(IStorageService, {
+			get: (a, b, c) => {
+				switch (a) {
+					case 'experiments.experiment1':
+						return JSON.stringify(storageDataExperiment1);
+					case 'experiments.experiment2':
+						return JSON.stringify(storageDataExperiment2);
+					case 'experiments.experiment3':
+						return JSON.stringify(storageDataExperiment3);
+					case 'experiments.experiment4':
+						return JSON.stringify(storageDataExperiment4);
+					case 'allExperiments':
+						return JSON.stringify(storageDataAllExperiments);
+					default:
+						break;
+				}
+				return c;
+			},
+			store: (a, b, c) => {
+				switch (a) {
+					case 'experiments.experiment1':
+						storageDataExperiment1 = JSON.parse(b);
+						break;
+					case 'experiments.experiment2':
+						storageDataExperiment2 = JSON.parse(b);
+						break;
+					case 'experiments.experiment3':
+						storageDataExperiment3 = JSON.parse(b);
+						break;
+					case 'experiments.experiment4':
+						storageDataExperiment4 = JSON.parse(b);
+						break;
+					case 'allExperiments':
+						storageDataAllExperiments = JSON.parse(b);
+						break;
+					default:
+						break;
+				}
+			},
+			remove: a => {
+				switch (a) {
+					case 'experiments.experiment1':
+						storageDataExperiment1 = null;
+						break;
+					case 'experiments.experiment2':
+						storageDataExperiment2 = null;
+						break;
+					case 'experiments.experiment3':
+						storageDataExperiment3 = null;
+						break;
+					case 'experiments.experiment4':
+						storageDataExperiment4 = null;
+						break;
+					case 'allExperiments':
+						storageDataAllExperiments = null;
+						break;
+					default:
+						break;
+				}
+			}
+		});
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+
+		const tests = [];
+		tests.push(testObject.getExperimentById('experiment1'));
+		tests.push(testObject.getExperimentById('experiment2'));
+		tests.push(testObject.getExperimentById('experiment3'));
+		tests.push(testObject.getExperimentById('experiment4'));
+
+		return TPromise.join(tests).then(results => {
+			assert.equal(results[0].id, 'experiment1');
+			assert.equal(results[0].enabled, true);
+			assert.equal(results[0].state, ExperimentState.Run);
+
+			assert.equal(results[1].id, 'experiment2');
+			assert.equal(results[1].enabled, true);
+			assert.equal(results[1].state, ExperimentState.NoRun);
+
+			assert.equal(results[2].id, 'experiment3');
+			assert.equal(results[2].enabled, true);
+			assert.equal(results[2].state, ExperimentState.Evaluating);
+
+			assert.equal(results[3].id, 'experiment4');
+			assert.equal(results[3].enabled, true);
+			assert.equal(results[3].state, ExperimentState.Complete);
+		});
+
+	});
+
+	test('getExperimentByType', () => {
+		const customProperties = {
+			some: 'random-value'
+		};
+		experimentData = {
+			experiments: [
+				{
+					id: 'simple-experiment',
+					enabled: true
+				},
+				{
+					id: 'custom-experiment',
+					enabled: true,
+					action: {
+						type: 'Custom',
+						properties: customProperties
+					}
+				},
+				{
+					id: 'prompt-with-no-commands',
+					enabled: true,
+					action: {
+						type: 'Prompt',
+						properties: {
+							promptText: 'someText'
+						}
+					}
+				},
+				{
+					id: 'prompt-with-commands',
+					enabled: true,
+					action: {
+						type: 'Prompt',
+						properties: {
+							promptText: 'someText',
+							commands: [
+								{
+									text: 'Hello'
+								}
+							]
+						}
+					}
+				}
+			]
+		};
+
+		testObject = instantiationService.createInstance(TestExperimentService);
+		const custom = testObject.getExperimentsToRunByType(ExperimentActionType.Custom).then(result => {
+			assert.equal(result.length, 2);
+			assert.equal(result[0].id, 'simple-experiment');
+			assert.equal(result[1].id, 'custom-experiment');
+		});
+		const prompt = testObject.getExperimentsToRunByType(ExperimentActionType.Prompt).then(result => {
+			assert.equal(result.length, 2);
+			assert.equal(result[0].id, 'prompt-with-no-commands');
+			assert.equal(result[1].id, 'prompt-with-commands');
+		});
+		return TPromise.join([custom, prompt]);
+	});
+
+
+	// test('Experiment with condition type FileEdit should increment editcount as appropriate', () => {
+
+	// });
+
+	// test('Experiment with condition type WorkspaceEdit should increment editcount as appropriate', () => {
+
+	// });
+
+
+
+});
+
+
diff --git a/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.ts b/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.ts
index 1147e42ff1b..7f719e46e5f 100644
--- a/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.ts
+++ b/src/vs/workbench/parts/extensions/common/extensionsFileTemplate.ts
@@ -26,7 +26,7 @@ export const ExtensionsConfigurationSchema: IJSONSchema = {
 		},
 		unwantedRecommendations: {
 			type: 'array',
-			description: localize('app.extensions.json.unwantedRecommendations', "List of extensions that will be skipped from the recommendations that VS Code makes for the users of this workspace. These are extensions that you may consider to be irrelevant, redundant, or otherwise unwanted. The identifier of an extension is always '${publisher}.${name}'. For example: 'vscode.csharp'."),
+			description: localize('app.extensions.json.unwantedRecommendations', "List of extensions recommended by VS Code that should not be recommended for users of this workspace. The identifier of an extension is always '${publisher}.${name}'. For example: 'vscode.csharp'."),
 			items: {
 				type: 'string',
 				pattern: EXTENSION_IDENTIFIER_PATTERN,
@@ -45,7 +45,7 @@ export const ExtensionsConfigurationInitialContent: string = [
 	'\t"recommendations": [',
 	'\t\t',
 	'\t],',
-	'\t// List of extensions that will be skipped from the recommendations that VS Code makes for the users of this workspace. These are extensions that you may consider to be irrelevant, redundant, or otherwise unwanted.',
+	'\t// List of extensions recommended by VS Code that should not be recommended for users of this workspace.',
 	'\t"unwantedRecommendations": [',
 	'\t\t',
 	'\t]',
diff --git a/src/vs/workbench/parts/extensions/common/extensionsInput.ts b/src/vs/workbench/parts/extensions/common/extensionsInput.ts
index 23d3e199d16..3a7642cd39a 100644
--- a/src/vs/workbench/parts/extensions/common/extensionsInput.ts
+++ b/src/vs/workbench/parts/extensions/common/extensionsInput.ts
@@ -44,7 +44,7 @@ export class ExtensionsInput extends EditorInput {
 		return this.extension === otherExtensionInput.extension;
 	}
 
-	resolve(refresh?: boolean): TPromise<any> {
+	resolve(): TPromise<any> {
 		return TPromise.as(null);
 	}
 
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
index 966191a9793..f3a1da645e0 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
@@ -31,7 +31,7 @@ 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, ReloadAction, MaliciousStatusLabelAction, DisabledStatusLabelAction, MultiServerInstallAction, MultiServerUpdateAction, IgnoreExtensionRecommendationAction } from 'vs/workbench/parts/extensions/electron-browser/extensionsActions';
+import { CombinedInstallAction, UpdateAction, EnableAction, DisableAction, ReloadAction, MaliciousStatusLabelAction, DisabledStatusLabelAction, MultiServerInstallAction, MultiServerUpdateAction, IgnoreExtensionRecommendationAction, UndoIgnoreExtensionRecommendationAction } from 'vs/workbench/parts/extensions/electron-browser/extensionsActions';
 import { WebviewElement } from 'vs/workbench/parts/webview/electron-browser/webviewElement';
 import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
@@ -164,7 +164,7 @@ export class ExtensionEditor extends BaseEditor {
 	private navbar: NavBar;
 	private content: HTMLElement;
 	private recommendation: HTMLElement;
-	private recommendationText: any;
+	private recommendationText: HTMLElement;
 	private ignoreActionbar: ActionBar;
 	private header: HTMLElement;
 
@@ -307,14 +307,19 @@ export class ExtensionEditor extends BaseEditor {
 		this.description.textContent = extension.description;
 
 		removeClass(this.header, 'recommendation-ignored');
+		removeClass(this.header, 'recommended');
+
 		const extRecommendations = this.extensionTipsService.getAllRecommendationsWithReason();
 		let recommendationsData = {};
 		if (extRecommendations[extension.id.toLowerCase()]) {
 			addClass(this.header, 'recommended');
 			this.recommendationText.textContent = extRecommendations[extension.id.toLowerCase()].reasonText;
 			recommendationsData = { recommendationReason: extRecommendations[extension.id.toLowerCase()].reasonId };
-		} else {
-			removeClass(this.header, 'recommended');
+		} else if (this.extensionTipsService.getAllIgnoredRecommendations().global.indexOf(extension.id.toLowerCase()) !== -1) {
+			addClass(this.header, 'recommendation-ignored');
+			this.recommendationText.textContent = localize('recommendationHasBeenIgnored', "You have chosen not to receive recommendations for this extension.");
+		}
+		else {
 			this.recommendationText.textContent = '';
 		}
 
@@ -389,19 +394,30 @@ export class ExtensionEditor extends BaseEditor {
 		this.transientDisposables.push(enableAction, updateAction, reloadAction, disableAction, installAction, maliciousStatusAction, disabledStatusAction);
 
 		const ignoreAction = this.instantiationService.createInstance(IgnoreExtensionRecommendationAction);
+		const undoIgnoreAction = this.instantiationService.createInstance(UndoIgnoreExtensionRecommendationAction);
 		ignoreAction.extension = extension;
+		undoIgnoreAction.extension = extension;
 
 		this.extensionTipsService.onRecommendationChange(change => {
-			if (change.extensionId.toLowerCase() === extension.id.toLowerCase() && change.isRecommended === false) {
-				addClass(this.header, 'recommendation-ignored');
-				removeClass(this.header, 'recommended');
-				this.recommendationText.textContent = localize('recommendationHasBeenIgnored', "You have chosen not to receive recommendations for this extension.");
+			if (change.extensionId.toLowerCase() === extension.id.toLowerCase()) {
+				if (change.isRecommended) {
+					removeClass(this.header, 'recommendation-ignored');
+					const extRecommendations = this.extensionTipsService.getAllRecommendationsWithReason();
+					if (extRecommendations[extension.id.toLowerCase()]) {
+						addClass(this.header, 'recommended');
+						this.recommendationText.textContent = extRecommendations[extension.id.toLowerCase()].reasonText;
+					}
+				} else {
+					addClass(this.header, 'recommendation-ignored');
+					removeClass(this.header, 'recommended');
+					this.recommendationText.textContent = localize('recommendationHasBeenIgnored', "You have chosen not to receive recommendations for this extension.");
+				}
 			}
 		});
 
 		this.ignoreActionbar.clear();
-		this.ignoreActionbar.push([ignoreAction], { icon: true, label: true });
-		this.transientDisposables.push(ignoreAction);
+		this.ignoreActionbar.push([ignoreAction, undoIgnoreAction], { icon: true, label: true });
+		this.transientDisposables.push(ignoreAction, undoIgnoreAction);
 
 		this.content.innerHTML = ''; // Clear content before setting navbar actions.
 
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
index 6d9c8399e3d..784c508d624 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
@@ -10,7 +10,10 @@ import { forEach } from 'vs/base/common/collections';
 import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import { match } from 'vs/base/common/glob';
 import * as json from 'vs/base/common/json';
-import { IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService, ExtensionRecommendationReason, LocalExtensionType, EXTENSION_IDENTIFIER_PATTERN, IIgnoredRecommendations, IExtensionsConfigContent, RecommendationChangeNotification, IExtensionRecommendation, ExtensionRecommendationSource, IExtensionManagementServerService, InstallOperation } from 'vs/platform/extensionManagement/common/extensionManagement';
+import {
+	IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService, ExtensionRecommendationReason, LocalExtensionType, EXTENSION_IDENTIFIER_PATTERN,
+	IExtensionsConfigContent, RecommendationChangeNotification, IExtensionRecommendation, ExtensionRecommendationSource, IExtensionManagementServerService, InstallOperation
+} from 'vs/platform/extensionManagement/common/extensionManagement';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { ITextModel } from 'vs/editor/common/model';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
@@ -39,8 +42,8 @@ import { Emitter, Event } from 'vs/base/common/event';
 import { assign } from 'vs/base/common/objects';
 import URI from 'vs/base/common/uri';
 import { areSameExtensions, getGalleryExtensionIdFromLocal } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { IExperimentService, ExperimentActionType } from 'vs/workbench/parts/experiments/node/experimentService';
 
-const empty: { [key: string]: any; } = Object.create(null);
 const milliSecondsInADay = 1000 * 60 * 60 * 24;
 const choiceNever = localize('neverShowAgain', "Don't Show Again");
 const searchMarketplace = localize('searchMarketplace', "Search Marketplace");
@@ -52,8 +55,11 @@ interface IDynamicWorkspaceRecommendations {
 }
 
 function caseInsensitiveGet<T>(obj: { [key: string]: T }, key: string): T | undefined {
+	if (!obj) {
+		return undefined;
+	}
 	for (const _key in obj) {
-		if (obj.hasOwnProperty(_key) && _key.toLowerCase() === key.toLowerCase()) {
+		if (Object.hasOwnProperty.call(obj, _key) && _key.toLowerCase() === key.toLowerCase()) {
 			return obj[_key];
 		}
 	}
@@ -69,6 +75,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 	private _availableRecommendations: { [pattern: string]: string[] } = Object.create(null);
 	private _allWorkspaceRecommendedExtensions: IExtensionRecommendation[] = [];
 	private _dynamicWorkspaceRecommendations: string[] = [];
+	private _experimentalRecommendations: { [id: string]: string } = Object.create(null);
 	private _allIgnoredRecommendations: string[] = [];
 	private _globallyIgnoredRecommendations: string[] = [];
 	private _workspaceIgnoredRecommendations: string[] = [];
@@ -96,10 +103,12 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		@IViewletService private viewletService: IViewletService,
 		@INotificationService private notificationService: INotificationService,
 		@IExtensionManagementService private extensionManagementService: IExtensionManagementService,
-		@IExtensionManagementServerService private extensionManagementServiceService: IExtensionManagementServerService
+		@IExtensionManagementServerService private extensionManagementServiceService: IExtensionManagementServerService,
+		@IExperimentService private experimentService: IExperimentService,
 	) {
 		super();
 
+
 		if (!this.isEnabled()) {
 			return;
 		}
@@ -114,12 +123,13 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		this.loadRecommendationsPromise = this.getWorkspaceRecommendations()
 			.then(() => {
 				// these must be called after workspace configs have been refreshed.
-				this.getCachedDynamicWorkspaceRecommendations();
-				this._suggestFileBasedRecommendations();
-				return this._suggestWorkspaceRecommendations();
+				this.fetchCachedDynamicWorkspaceRecommendations();
+				this.fetchFileBasedRecommendations();
+				this.fetchExperimentalRecommendations();
+				return this.promptWorkspaceRecommendations();
 			}).then(() => {
-				this._modelService.onModelAdded(this._suggest, this, this._disposables);
-				this._modelService.getModels().forEach(model => this._suggest(model));
+				this._modelService.onModelAdded(this.promptFiletypeBasedRecommendations, this, this._disposables);
+				this._modelService.getModels().forEach(model => this.promptFiletypeBasedRecommendations(model));
 			});
 
 		if (!this.configurationService.getValue<boolean>(ShowRecommendationsOnlyOnDemandKey)) {
@@ -161,7 +171,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 
 			fetchPromise = new TPromise((c, e) => {
 				setTimeout(() => {
-					TPromise.join([this._suggestBasedOnExecutables(), this.getDynamicWorkspaceRecommendations()]).then(() => c(null));
+					TPromise.join([this.fetchExecutableRecommendations(), this.fetchDynamicWorkspaceRecommendations()]).then(() => c(null));
 				}, calledDuringStartup ? 10000 : 0);
 			});
 
@@ -180,9 +190,15 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 			return output;
 		}
 
+		forEach(this._experimentalRecommendations, entry => output[entry.key.toLowerCase()] = {
+			reasonId: ExtensionRecommendationReason.Experimental,
+			reasonText: entry.value
+		});
+
 		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()] = {
+
+			this._dynamicWorkspaceRecommendations.forEach(id => output[id.toLowerCase()] = {
 				reasonId: ExtensionRecommendationReason.DynamicWorkspace,
 				reasonText: localize('dynamicWorkspaceRecommendation', "This extension may interest you because it's popular among users of the {0} repository.", currentRepo)
 			});
@@ -193,7 +209,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 			reasonText: localize('exeBasedRecommendation', "This extension is recommended because you have {0} installed.", entry.value)
 		});
 
-		Object.keys(this._fileBasedRecommendations).forEach(x => output[x.toLowerCase()] = {
+		forEach(this._fileBasedRecommendations, entry => output[entry.key.toLowerCase()] = {
 			reasonId: ExtensionRecommendationReason.File,
 			reasonText: localize('fileBasedRecommendation', "This extension is recommended based on the files you recently opened.")
 		});
@@ -203,17 +219,27 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 			reasonText: localize('workspaceRecommendation', "This extension is recommended by users of the current workspace.")
 		});
 
+		for (const id of this._allIgnoredRecommendations) {
+			delete output[id];
+		}
+
 		return output;
 	}
 
+	getAllIgnoredRecommendations(): { global: string[], workspace: string[] } {
+		return {
+			global: this._globallyIgnoredRecommendations,
+			workspace: this._workspaceIgnoredRecommendations
+		};
+	}
+
 	getWorkspaceRecommendations(): TPromise<IExtensionRecommendation[]> {
 		if (!this.isEnabled()) { return TPromise.as([]); }
-		return this.fetchWorkspaceRecommendations().then(() => this._allWorkspaceRecommendedExtensions);
+		return this.fetchWorkspaceRecommendations()
+			.then(() => this._allWorkspaceRecommendedExtensions.filter(rec => this.isExtensionAllowedToBeRecommended(rec.extensionId)));
 	}
 
 	private fetchWorkspaceRecommendations(): TPromise<void> {
-		this._workspaceIgnoredRecommendations = [];
-		this._allWorkspaceRecommendedExtensions = [];
 
 		if (!this.isEnabled) { return TPromise.as(null); }
 
@@ -227,6 +253,9 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 
 					const seenUnWantedRecommendations: { [id: string]: boolean } = {};
 
+					this._allWorkspaceRecommendedExtensions = [];
+					this._workspaceIgnoredRecommendations = [];
+
 					for (const contentsBySource of result) {
 						if (contentsBySource.contents.unwantedRecommendations) {
 							for (const r of contentsBySource.contents.unwantedRecommendations) {
@@ -254,10 +283,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 							}
 						}
 					}
-
 					this._allIgnoredRecommendations = distinct([...this._globallyIgnoredRecommendations, ...this._workspaceIgnoredRecommendations]);
-					this.refilterAllRecommendations();
-
 				}));
 	}
 
@@ -337,31 +363,6 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		});
 	}
 
-	private refilterAllRecommendations() {
-		this._allWorkspaceRecommendedExtensions = this._allWorkspaceRecommendedExtensions.filter(({ extensionId }) => this.isExtensionAllowedToBeRecommended(extensionId));
-		this._dynamicWorkspaceRecommendations = this._dynamicWorkspaceRecommendations.filter((id) => this.isExtensionAllowedToBeRecommended(id));
-
-		this._allIgnoredRecommendations.forEach(x => {
-			delete this._fileBasedRecommendations[x];
-			delete this._exeBasedRecommendations[x];
-		});
-
-		if (this._availableRecommendations) {
-			for (const key in this._availableRecommendations) {
-				if (Object.prototype.hasOwnProperty.call(this._availableRecommendations, key)) {
-					this._availableRecommendations[key] = this._availableRecommendations[key].filter(id => this.isExtensionAllowedToBeRecommended(id));
-				}
-			}
-		}
-	}
-
-	getAllIgnoredRecommendations(): IIgnoredRecommendations {
-		return {
-			workspace: this._workspaceIgnoredRecommendations,
-			global: this._globallyIgnoredRecommendations
-		};
-	}
-
 	private isExtensionAllowedToBeRecommended(id: string): boolean {
 		return this._allIgnoredRecommendations.indexOf(id.toLowerCase()) === -1;
 	}
@@ -373,7 +374,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 				.then(currentWorkspaceRecommended => {
 					// Suggest only if at least one of the newly added recommendations was not suggested before
 					if (currentWorkspaceRecommended.some(current => oldWorkspaceRecommended.every(old => current.extensionId !== old.extensionId))) {
-						this._suggestWorkspaceRecommendations();
+						this.promptWorkspaceRecommendations();
 					}
 				});
 		}
@@ -393,12 +394,17 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 				}
 				return this._fileBasedRecommendations[a].recommendedTime > this._fileBasedRecommendations[b].recommendedTime ? -1 : 1;
 			})
+			.filter(extensionId => this.isExtensionAllowedToBeRecommended(extensionId))
 			.map(extensionId => (<IExtensionRecommendation>{ extensionId, sources: this._fileBasedRecommendations[extensionId].sources }));
 	}
 
 	getOtherRecommendations(): TPromise<IExtensionRecommendation[]> {
 		return this.fetchProactiveRecommendations().then(() => {
-			const others = distinct([...Object.keys(this._exeBasedRecommendations), ...this._dynamicWorkspaceRecommendations]);
+			const others = distinct([
+				...Object.keys(this._exeBasedRecommendations),
+				...this._dynamicWorkspaceRecommendations,
+				...Object.keys(this._experimentalRecommendations),
+			]).filter(extensionId => this.isExtensionAllowedToBeRecommended(extensionId));
 			shuffle(others);
 			return others.map(extensionId => {
 				const sources: ExtensionRecommendationSource[] = [];
@@ -414,19 +420,24 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 	}
 
 	getKeymapRecommendations(): IExtensionRecommendation[] {
-		return (product.keymapExtensionTips || []).map(extensionId => (<IExtensionRecommendation>{ extensionId, sources: ['application'] }));
+		return (product.keymapExtensionTips || [])
+			.filter(extensionId => this.isExtensionAllowedToBeRecommended(extensionId))
+			.map(extensionId => (<IExtensionRecommendation>{ extensionId, sources: ['application'] }));
 	}
 
 	getAllRecommendations(): TPromise<IExtensionRecommendation[]> {
+		if (!this.proactiveRecommendationsFetched) {
+			return TPromise.as([]);
+		}
 		return TPromise.join([
 			this.getWorkspaceRecommendations(),
 			TPromise.as(this.getFileBasedRecommendations()),
 			this.getOtherRecommendations(),
 			TPromise.as(this.getKeymapRecommendations())
-		]).then(result => flatten(result));
+		]).then(result => flatten(result).filter(e => this.isExtensionAllowedToBeRecommended(e.extensionId)));
 	}
 
-	private _suggestFileBasedRecommendations() {
+	private fetchFileBasedRecommendations() {
 		const extensionTips = product.extensionTips;
 		if (!extensionTips) {
 			return;
@@ -436,26 +447,22 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		this._availableRecommendations = Object.create(null);
 		forEach(extensionTips, entry => {
 			let { key: id, value: pattern } = entry;
-			if (this.isExtensionAllowedToBeRecommended(id)) {
-				let ids = this._availableRecommendations[pattern];
-				if (!ids) {
-					this._availableRecommendations[pattern] = [id.toLowerCase()];
-				} else {
-					ids.push(id.toLowerCase());
-				}
+			let ids = this._availableRecommendations[pattern];
+			if (!ids) {
+				this._availableRecommendations[pattern] = [id.toLowerCase()];
+			} else {
+				ids.push(id.toLowerCase());
 			}
 		});
 
 		forEach(product.extensionImportantTips, entry => {
 			let { key: id, value } = entry;
-			if (this.isExtensionAllowedToBeRecommended(id)) {
-				const { pattern } = value;
-				let ids = this._availableRecommendations[pattern];
-				if (!ids) {
-					this._availableRecommendations[pattern] = [id.toLowerCase()];
-				} else {
-					ids.push(id.toLowerCase());
-				}
+			const { pattern } = value;
+			let ids = this._availableRecommendations[pattern];
+			if (!ids) {
+				this._availableRecommendations[pattern] = [id.toLowerCase()];
+			} else {
+				ids.push(id.toLowerCase());
 			}
 		});
 
@@ -489,10 +496,10 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		});
 	}
 
-	private _suggest(model: ITextModel): void {
-		const uri = model.uri;
+	private promptFiletypeBasedRecommendations(model: ITextModel): void {
 		let hasSuggestion = false;
 
+		const uri = model.uri;
 		if (!uri) {
 			return;
 		}
@@ -515,7 +522,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 				let { key: pattern, value: ids } = entry;
 				if (match(pattern, uri.path)) {
 					for (let id of ids) {
-						if (Object.keys(product.extensionImportantTips || []).map(x => x.toLowerCase()).indexOf(id.toLowerCase()) > -1) {
+						if (caseInsensitiveGet(product.extensionImportantTips, id)) {
 							recommendationsToSuggest.push(id);
 						}
 						const filedBasedRecommendation = this._fileBasedRecommendations[id.toLowerCase()] || { recommendedTime: now, sources: [] };
@@ -539,11 +546,12 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 			}
 
 			const importantRecommendationsIgnoreList = <string[]>JSON.parse(this.storageService.get('extensionsAssistant/importantRecommendationsIgnore', StorageScope.GLOBAL, '[]'));
-			recommendationsToSuggest = recommendationsToSuggest.filter(id => importantRecommendationsIgnoreList.indexOf(id) === -1);
+			recommendationsToSuggest = recommendationsToSuggest.filter(id => importantRecommendationsIgnoreList.indexOf(id) === -1 && this.isExtensionAllowedToBeRecommended(id));
 
 			const server = this.extensionManagementServiceService.getExtensionManagementServer(model.uri);
 			const importantTipsPromise = recommendationsToSuggest.length === 0 ? TPromise.as(null) : server.extensionManagementService.getInstalled(LocalExtensionType.User).then(local => {
-				recommendationsToSuggest = recommendationsToSuggest.filter(id => local.every(local => `${local.manifest.publisher}.${local.manifest.name}` !== id));
+				const localExtensions = local.map(e => `${e.manifest.publisher.toLowerCase()}.${e.manifest.name.toLowerCase()}`);
+				recommendationsToSuggest = recommendationsToSuggest.filter(id => localExtensions.every(local => local !== id.toLowerCase()));
 				if (!recommendationsToSuggest.length) {
 					return;
 				}
@@ -606,7 +614,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 								}
 							*/
 							this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'neverShowAgain', extensionId: name });
-							this.ignoreExtensionRecommendations();
+							this.promptIgnoreExtensionRecommendations();
 						}
 					}],
 					() => {
@@ -701,17 +709,20 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		});
 	}
 
-	private _suggestWorkspaceRecommendations(): void {
+	private promptWorkspaceRecommendations(): void {
 		const storageKey = 'extensionsAssistant/workspaceRecommendationsIgnore';
 		const config = this.configurationService.getValue<IExtensionsConfiguration>(ConfigurationKey);
+		const filteredRecs = this._allWorkspaceRecommendedExtensions.filter(rec => this.isExtensionAllowedToBeRecommended(rec.extensionId));
 
-		if (!this._allWorkspaceRecommendedExtensions.length || config.ignoreRecommendations || config.showRecommendationsOnlyOnDemand || this.storageService.getBoolean(storageKey, StorageScope.WORKSPACE, false)) {
+		if (filteredRecs.length === 0
+			|| config.ignoreRecommendations
+			|| config.showRecommendationsOnlyOnDemand
+			|| this.storageService.getBoolean(storageKey, StorageScope.WORKSPACE, false)) {
 			return;
 		}
 
 		return this.extensionsService.getInstalled(LocalExtensionType.User).done(local => {
-			const recommendations = this._allWorkspaceRecommendedExtensions
-				.filter(({ extensionId }) => local.every(local => !areSameExtensions({ id: extensionId }, { id: getGalleryExtensionIdFromLocal(local) })));
+			const recommendations = filteredRecs.filter(({ extensionId }) => local.every(local => !areSameExtensions({ id: extensionId }, { id: getGalleryExtensionIdFromLocal(local) })));
 
 			if (!recommendations.length) {
 				return TPromise.as(void 0);
@@ -783,7 +794,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		});
 	}
 
-	private ignoreExtensionRecommendations() {
+	private promptIgnoreExtensionRecommendations() {
 		this.notificationService.prompt(
 			Severity.Info,
 			localize('ignoreExtensionRecommendations', "Do you want to ignore all extension recommendations?"),
@@ -797,7 +808,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		);
 	}
 
-	private _suggestBasedOnExecutables(): TPromise<any> {
+	private fetchExecutableRecommendations(): TPromise<any> {
 		const homeDir = os.homedir();
 		let foundExecutables: Set<string> = new Set<string>();
 
@@ -807,7 +818,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 					foundExecutables.add(exeName);
 					(product.exeBasedExtensionTips[exeName]['recommendations'] || [])
 						.forEach(extensionId => {
-							if (product.exeBasedExtensionTips[exeName]['friendlyName'] && this.isExtensionAllowedToBeRecommended(extensionId)) {
+							if (product.exeBasedExtensionTips[exeName]['friendlyName']) {
 								this._exeBasedRecommendations[extensionId.toLowerCase()] = product.exeBasedExtensionTips[exeName]['friendlyName'];
 							}
 						});
@@ -850,7 +861,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		}
 	}
 
-	private getCachedDynamicWorkspaceRecommendations() {
+	private fetchCachedDynamicWorkspaceRecommendations() {
 		if (this.contextService.getWorkbenchState() !== WorkbenchState.FOLDER) {
 			return;
 		}
@@ -867,7 +878,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 			&& isNumber(storedRecommendationsJson['timestamp'])
 			&& storedRecommendationsJson['timestamp'] > 0
 			&& (Date.now() - storedRecommendationsJson['timestamp']) / milliSecondsInADay < 14) {
-			this._dynamicWorkspaceRecommendations = storedRecommendationsJson['recommendations'].filter(id => this.isExtensionAllowedToBeRecommended(id));
+			this._dynamicWorkspaceRecommendations = storedRecommendationsJson['recommendations'];
 			/* __GDPR__
 				"dynamicWorkspaceRecommendations" : {
 					"count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
@@ -878,7 +889,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		}
 	}
 
-	private getDynamicWorkspaceRecommendations(): TPromise<void> {
+	private fetchDynamicWorkspaceRecommendations(): TPromise<void> {
 		if (this.contextService.getWorkbenchState() !== WorkbenchState.FOLDER
 			|| this._dynamicWorkspaceRecommendations.length
 			|| !this._extensionsRecommendationsUrl) {
@@ -928,57 +939,46 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		});
 	}
 
+	private fetchExperimentalRecommendations() {
+		this.experimentService.getExperimentsToRunByType(ExperimentActionType.AddToRecommendations).then(experiments => {
+			(experiments || []).forEach(experiment => {
+				if (experiment.action.properties && Array.isArray(experiment.action.properties.recommendations) && experiment.action.properties.recommendationReason) {
+					experiment.action.properties.recommendations.forEach(id => {
+						this._experimentalRecommendations[id] = experiment.action.properties.recommendationReason;
+					});
+				}
+			});
+		});
+	}
+
 	getKeywordsForExtension(extension: string): string[] {
 		const keywords = product.extensionKeywords || {};
 		return keywords[extension] || [];
 	}
 
-	getRecommendationsForExtension(extension: string): string[] {
-		const str = `.${extension}`;
-		const result = Object.create(null);
-
-		forEach(product.extensionTips || empty, entry => {
-			let { key: id, value: pattern } = entry;
-
-			if (match(pattern, str)) {
-				result[id] = true;
+	toggleIgnoredRecommendation(extensionId: string, shouldIgnore: boolean) {
+		const lowerId = extensionId.toLowerCase();
+		if (shouldIgnore) {
+			const reason = this.getAllRecommendationsWithReason()[lowerId];
+			if (reason && reason.reasonId) {
+				/* __GDPR__
+					"extensionsRecommendations:ignoreRecommendation" : {
+						"recommendationReason": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+						"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+					}
+				*/
+				this.telemetryService.publicLog('extensionsRecommendations:ignoreRecommendation', { id: extensionId, recommendationReason: reason.reasonId });
 			}
-		});
-
-		forEach(product.extensionImportantTips || empty, entry => {
-			let { key: id, value } = entry;
-
-			if (match(value.pattern, str)) {
-				result[id] = true;
-			}
-		});
-
-		return Object.keys(result);
-	}
-
-	ignoreExtensionRecommendation(extensionId: string): void {
-		/* __GDPR__
-			"extensionsRecommendations:ignoreRecommendation" : {
-				"recommendationReason": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-				"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
-			}
-		*/
-		const reason = this.getAllRecommendationsWithReason()[extensionId.toLowerCase()];
-		if (reason && reason.reasonId) {
-			this.telemetryService.publicLog('extensionsRecommendations:ignoreRecommendation', { id: extensionId, recommendationReason: reason.reasonId });
 		}
 
-
-		this._globallyIgnoredRecommendations = distinct(
-			[...<string[]>JSON.parse(this.storageService.get('extensionsAssistant/ignored_recommendations', StorageScope.GLOBAL, '[]')), extensionId.toLowerCase()]
-				.map(id => id.toLowerCase()));
+		this._globallyIgnoredRecommendations = shouldIgnore ?
+			distinct([...this._globallyIgnoredRecommendations, lowerId].map(id => id.toLowerCase())) :
+			this._globallyIgnoredRecommendations.filter(id => id !== lowerId);
 
 		this.storageService.store('extensionsAssistant/ignored_recommendations', JSON.stringify(this._globallyIgnoredRecommendations), StorageScope.GLOBAL);
-
 		this._allIgnoredRecommendations = distinct([...this._globallyIgnoredRecommendations, ...this._workspaceIgnoredRecommendations]);
 
-		this.refilterAllRecommendations();
-		this._onRecommendationChange.fire({ extensionId: extensionId, isRecommended: false });
+		this._onRecommendationChange.fire({ extensionId: extensionId, isRecommended: !shouldIgnore });
 	}
 
 	dispose() {
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
index 0ef379a0938..88964425ea0 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
@@ -448,7 +448,7 @@ export class UpdateGalleryExtensionAction extends Action {
 
 	private update(): void {
 		this.enabled = this.local && this.gallery && this.local.type === LocalExtensionType.User && semver.gt(this.gallery.version, this.local.manifest.version);
-		this.label = this.enabled ? localize('updateToInServer', "Update to {0} ({1})", this.local.manifest.version, this.server.location.authority) : localize('updateLabelInServer', "Update ({0})", this.server.location.authority);
+		this.label = this.enabled ? localize('updateToInServer', "Update to {0} ({1})", this.gallery.version, this.server.location.authority) : localize('updateLabelInServer', "Update ({0})", this.server.location.authority);
 	}
 
 	run(): TPromise<any> {
@@ -497,7 +497,11 @@ export class MultiServerInstallAction extends Action {
 		this.actions = this.extensionManagementServerService.extensionManagementServers.map(server => this.instantiationService.createInstance(InstallGalleryExtensionAction, `extensions.install.${server.location.authority}`, localize('installInServer', "{0}", server.location.authority), server));
 		this._actionItem = this.instantiationService.createInstance(DropDownMenuActionItem, this, [this.actions]);
 		this.disposables.push(...[this._actionItem, ...this.actions]);
-		this.disposables.push(this.extensionsWorkbenchService.onChange(() => this.extension = this.extension ? this.extensionsWorkbenchService.local.filter(l => areSameExtensions({ id: l.id }, { id: this.extension.id }))[0] : this.extension));
+		this.disposables.push(this.extensionsWorkbenchService.onChange(() => {
+			if (this.extension) {
+				this.extension = this.extensionsWorkbenchService.local.filter(l => areSameExtensions({ id: l.id }, { id: this.extension.id }))[0] || this.extension;
+			}
+		}));
 		this.update();
 	}
 
@@ -509,6 +513,16 @@ export class MultiServerInstallAction extends Action {
 			return;
 		}
 
+		if (this.extension.state === ExtensionState.Installing) {
+			this.label = MultiServerInstallAction.InstallingLabel;
+			this.class = MultiServerInstallAction.InstallingClass;
+			this.tooltip = MultiServerInstallAction.InstallingLabel;
+		} else {
+			this.label = MultiServerInstallAction.InstallLabel;
+			this.class = MultiServerInstallAction.Class;
+			this.tooltip = MultiServerInstallAction.InstallLabel;
+		}
+
 		const isInstalled = this.extension.locals.length > 0;
 
 		if (isInstalled && this.disableWhenInstalled) {
@@ -531,16 +545,6 @@ export class MultiServerInstallAction extends Action {
 		});
 
 		this.enabled = this.extensionsWorkbenchService.canInstall(this.extension) && (isExtensionNotInstalledInRecommendedServer || this.extension.locals.length === 0);
-
-		if (this.extension.state === ExtensionState.Installing) {
-			this.label = MultiServerInstallAction.InstallingLabel;
-			this.class = MultiServerInstallAction.InstallingClass;
-			this.tooltip = MultiServerInstallAction.InstallingLabel;
-		} else {
-			this.label = MultiServerInstallAction.InstallLabel;
-			this.class = MultiServerInstallAction.Class;
-			this.tooltip = MultiServerInstallAction.InstallLabel;
-		}
 	}
 
 	public run(): TPromise<any> {
@@ -820,20 +824,22 @@ export class ManageExtensionAction extends Action {
 	}
 
 	private createMenuActionGroups(): IAction[][] {
-		return [
-			[
-				this.instantiationService.createInstance(EnableGloballyAction, EnableGloballyAction.LABEL),
-				this.instantiationService.createInstance(EnableForWorkspaceAction, EnableForWorkspaceAction.LABEL)
-			],
-			[
-				this.instantiationService.createInstance(DisableGloballyAction, DisableGloballyAction.LABEL),
-				this.instantiationService.createInstance(DisableForWorkspaceAction, DisableForWorkspaceAction.LABEL)
-			],
-			this.extensionManagmentServerService.extensionManagementServers.length > 1 ? [this.instantiationService.createInstance(MultiServerInstallSubMenuAction)] : [],
-			[
-				this.extensionManagmentServerService.extensionManagementServers.length > 1 ? this.instantiationService.createInstance(MultiServerUnInstallSubMenuAction) : this.instantiationService.createInstance(UninstallAction)
-			]
-		];
+		const groups: IAction[][] = [];
+		groups.push([
+			this.instantiationService.createInstance(EnableGloballyAction, EnableGloballyAction.LABEL),
+			this.instantiationService.createInstance(EnableForWorkspaceAction, EnableForWorkspaceAction.LABEL)
+		]);
+		groups.push([
+			this.instantiationService.createInstance(DisableGloballyAction, DisableGloballyAction.LABEL),
+			this.instantiationService.createInstance(DisableForWorkspaceAction, DisableForWorkspaceAction.LABEL)
+		]);
+		if (this.extensionManagmentServerService.extensionManagementServers.length > 1) {
+			groups.push([this.instantiationService.createInstance(MultiServerInstallSubMenuAction)]);
+			groups.push([this.instantiationService.createInstance(MultiServerUnInstallSubMenuAction)]);
+		} else {
+			groups.push([this.instantiationService.createInstance(UninstallAction)]);
+		}
+		return groups;
 	}
 
 	private update(): void {
@@ -1284,6 +1290,7 @@ export class ReloadAction extends Action {
 		@IWindowService private windowService: IWindowService,
 		@IExtensionService private extensionService: IExtensionService,
 		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService,
+		@IExtensionManagementServerService private extensionManagementServerService: IExtensionManagementServerService
 	) {
 		super('extensions.reload', localize('reloadAction', "Reload"), ReloadAction.DisabledClass, false);
 		this.throttler = new Throttler();
@@ -1319,7 +1326,9 @@ export class ReloadAction extends Action {
 
 		if (installed && installed.local) {
 			if (runningExtension) {
-				const isSameLocation = runningExtension.extensionLocation.toString() === installed.local.location.toString();
+				const runningExtensionServer = this.extensionManagementServerService.getExtensionManagementServer(runningExtension.extensionLocation);
+				const installedExtensionServer = this.extensionManagementServerService.getExtensionManagementServer(installed.local.location);
+				const isSameLocation = runningExtensionServer.location.toString() === installedExtensionServer.location.toString();
 				if (isSameLocation) {
 					const isDifferentVersionRunning = this.extension.version !== runningExtension.version;
 					if (isDifferentVersionRunning && !isDisabled) {
@@ -1699,7 +1708,7 @@ export class IgnoreExtensionRecommendationAction extends Action {
 
 	static readonly ID = 'extensions.ignore';
 
-	private static readonly Class = 'extension-action ignore octicon octicon-x';
+	private static readonly Class = 'extension-action ignore';
 
 	private disposables: IDisposable[] = [];
 	extension: IExtension;
@@ -1707,7 +1716,7 @@ export class IgnoreExtensionRecommendationAction extends Action {
 	constructor(
 		@IExtensionTipsService private extensionsTipsService: IExtensionTipsService,
 	) {
-		super(IgnoreExtensionRecommendationAction.ID);
+		super(IgnoreExtensionRecommendationAction.ID, 'Ignore Recommendation');
 
 		this.class = IgnoreExtensionRecommendationAction.Class;
 		this.tooltip = localize('ignoreExtensionRecommendation', "Do not recommend this extension again");
@@ -1715,7 +1724,37 @@ export class IgnoreExtensionRecommendationAction extends Action {
 	}
 
 	public run(): TPromise<any> {
-		this.extensionsTipsService.ignoreExtensionRecommendation(this.extension.id);
+		this.extensionsTipsService.toggleIgnoredRecommendation(this.extension.id, true);
+		return TPromise.as(null);
+	}
+
+	dispose(): void {
+		super.dispose();
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+export class UndoIgnoreExtensionRecommendationAction extends Action {
+
+	static readonly ID = 'extensions.ignore';
+
+	private static readonly Class = 'extension-action undo-ignore';
+
+	private disposables: IDisposable[] = [];
+	extension: IExtension;
+
+	constructor(
+		@IExtensionTipsService private extensionsTipsService: IExtensionTipsService,
+	) {
+		super(UndoIgnoreExtensionRecommendationAction.ID, 'Undo');
+
+		this.class = UndoIgnoreExtensionRecommendationAction.Class;
+		this.tooltip = localize('undo', "Undo");
+		this.enabled = true;
+	}
+
+	public run(): TPromise<any> {
+		this.extensionsTipsService.toggleIgnoredRecommendation(this.extension.id, false);
 		return TPromise.as(null);
 	}
 
@@ -1876,7 +1915,8 @@ export class ConfigureRecommendedExtensionsCommandsContributor extends Disposabl
 
 	private workspaceContextKey = new RawContextKey<boolean>('workspaceRecommendations', true);
 	private workspaceFolderContextKey = new RawContextKey<boolean>('workspaceFolderRecommendations', true);
-	private addToRecommendationsContextKey = new RawContextKey<boolean>('addToRecommendations', false);
+	private addToWorkspaceRecommendationsContextKey = new RawContextKey<boolean>('addToWorkspaceRecommendations', false);
+	private addToWorkspaceFolderRecommendationsContextKey = new RawContextKey<boolean>('addToWorkspaceFolderRecommendations', false);
 
 	constructor(
 		@IContextKeyService contextKeyService: IContextKeyService,
@@ -1892,9 +1932,16 @@ export class ConfigureRecommendedExtensionsCommandsContributor extends Disposabl
 		boundWorkspaceFolderContextKey.set(workspaceContextService.getWorkspace().folders.length > 0);
 		this._register(workspaceContextService.onDidChangeWorkspaceFolders(() => boundWorkspaceFolderContextKey.set(workspaceContextService.getWorkspace().folders.length > 0)));
 
-		const boundAddToRecommendationsContextKey = this.addToRecommendationsContextKey.bindTo(contextKeyService);
-		boundAddToRecommendationsContextKey.set(editorService.activeEditor instanceof ExtensionsInput);
-		this._register(editorService.onDidActiveEditorChange(() => boundAddToRecommendationsContextKey.set(editorService.activeEditor instanceof ExtensionsInput)));
+		const boundAddToWorkspaceRecommendationsContextKey = this.addToWorkspaceRecommendationsContextKey.bindTo(contextKeyService);
+		boundAddToWorkspaceRecommendationsContextKey.set(editorService.activeEditor instanceof ExtensionsInput && workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE);
+		this._register(editorService.onDidActiveEditorChange(() => boundAddToWorkspaceRecommendationsContextKey.set(
+			editorService.activeEditor instanceof ExtensionsInput && workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE)));
+		this._register(workspaceContextService.onDidChangeWorkbenchState(() => boundAddToWorkspaceRecommendationsContextKey.set(
+			editorService.activeEditor instanceof ExtensionsInput && workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE)));
+
+		const boundAddToWorkspaceFolderRecommendationsContextKey = this.addToWorkspaceFolderRecommendationsContextKey.bindTo(contextKeyService);
+		boundAddToWorkspaceFolderRecommendationsContextKey.set(editorService.activeEditor instanceof ExtensionsInput);
+		this._register(editorService.onDidActiveEditorChange(() => boundAddToWorkspaceFolderRecommendationsContextKey.set(editorService.activeEditor instanceof ExtensionsInput)));
 
 		this.registerCommands();
 	}
@@ -1922,22 +1969,58 @@ export class ConfigureRecommendedExtensionsCommandsContributor extends Disposabl
 			when: this.workspaceFolderContextKey
 		});
 
-		CommandsRegistry.registerCommand(AddToWorkspaceRecommendationsAction.ID, serviceAccesor => {
-			serviceAccesor.get(IInstantiationService).createInstance(AddToWorkspaceRecommendationsAction, AddToWorkspaceRecommendationsAction.ID, AddToWorkspaceRecommendationsAction.LABEL).run();
+		CommandsRegistry.registerCommand(AddToWorkspaceRecommendationsAction.ADD_ID, serviceAccessor => {
+			serviceAccessor.get(IInstantiationService)
+				.createInstance(AddToWorkspaceRecommendationsAction, AddToWorkspaceRecommendationsAction.ADD_ID, AddToWorkspaceRecommendationsAction.ADD_LABEL)
+				.run(AddToWorkspaceRecommendationsAction.ADD);
 		});
 		MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
 			command: {
-				id: AddToWorkspaceRecommendationsAction.ID,
-				title: `${ExtensionsLabel}: ${AddToWorkspaceRecommendationsAction.LABEL}`
+				id: AddToWorkspaceRecommendationsAction.ADD_ID,
+				title: `${ExtensionsLabel}: ${AddToWorkspaceRecommendationsAction.ADD_LABEL}`
 			},
-			when: this.addToRecommendationsContextKey
+			when: this.addToWorkspaceRecommendationsContextKey
+		});
+
+		CommandsRegistry.registerCommand(AddToWorkspaceFolderRecommendationsAction.ADD_ID, serviceAccessor => {
+			serviceAccessor.get(IInstantiationService)
+				.createInstance(AddToWorkspaceFolderRecommendationsAction, AddToWorkspaceFolderRecommendationsAction.ADD_ID, AddToWorkspaceFolderRecommendationsAction.ADD_LABEL)
+				.run(AddToWorkspaceRecommendationsAction.ADD);
+		});
+		MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+			command: {
+				id: AddToWorkspaceFolderRecommendationsAction.ADD_ID,
+				title: `${ExtensionsLabel}: ${AddToWorkspaceFolderRecommendationsAction.ADD_LABEL}`
+			},
+			when: this.addToWorkspaceFolderRecommendationsContextKey
+		});
+
+		CommandsRegistry.registerCommand(AddToWorkspaceRecommendationsAction.IGNORE_ID, serviceAccessor => {
+			serviceAccessor.get(IInstantiationService)
+				.createInstance(AddToWorkspaceRecommendationsAction, AddToWorkspaceRecommendationsAction.IGNORE_ID, AddToWorkspaceRecommendationsAction.IGNORE_LABEL)
+				.run(AddToWorkspaceRecommendationsAction.IGNORE);
+		});
+		MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+			command: {
+				id: AddToWorkspaceRecommendationsAction.IGNORE_ID,
+				title: `${ExtensionsLabel}: ${AddToWorkspaceRecommendationsAction.IGNORE_LABEL}`
+			},
+			when: this.addToWorkspaceRecommendationsContextKey
+		});
+
+		CommandsRegistry.registerCommand(AddToWorkspaceFolderRecommendationsAction.IGNORE_ID, serviceAccessor => {
+			serviceAccessor.get(IInstantiationService)
+				.createInstance(AddToWorkspaceFolderRecommendationsAction, AddToWorkspaceFolderRecommendationsAction.IGNORE_ID, AddToWorkspaceFolderRecommendationsAction.IGNORE_LABEL)
+				.run(AddToWorkspaceRecommendationsAction.IGNORE);
+		});
+		MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+			command: {
+				id: AddToWorkspaceFolderRecommendationsAction.IGNORE_ID,
+				title: `${ExtensionsLabel}: ${AddToWorkspaceFolderRecommendationsAction.IGNORE_LABEL}`
+			},
+			when: this.addToWorkspaceFolderRecommendationsContextKey
 		});
 	}
-
-}
-
-interface IExtensionsContent {
-	recommendations: string[];
 }
 
 export abstract class AbstractConfigureRecommendedExtensionsAction extends Action {
@@ -1961,7 +2044,6 @@ export abstract class AbstractConfigureRecommendedExtensionsAction extends Actio
 					.then(selection => this.editorService.openEditor({
 						resource: extensionsFileResource,
 						options: {
-							forceOpen: true,
 							pinned: created,
 							selection
 						}
@@ -1975,67 +2057,93 @@ export abstract class AbstractConfigureRecommendedExtensionsAction extends Actio
 			.then(selection => this.editorService.openEditor({
 				resource: workspaceConfigurationFile,
 				options: {
-					forceOpen: true,
-					selection
+					selection,
+					forceReload: true // because content has changed
 				}
 			}));
 	}
 
-	protected addRecommendedExtensionToFolder(extensionsFileResource: URI, extensionId: string): TPromise<any> {
+	protected addExtensionToWorkspaceConfig(workspaceConfigurationFile: URI, extensionId: string, shouldRecommend: boolean) {
+		return this.getOrUpdateWorkspaceConfigurationFile(workspaceConfigurationFile)
+			.then(content => {
+				const extensionIdLowerCase = extensionId.toLowerCase();
+				const workspaceExtensionsConfigContent: IExtensionsConfigContent = (json.parse(content.value) || {})['extensions'] || {};
+				let insertInto = shouldRecommend ? workspaceExtensionsConfigContent.recommendations || [] : workspaceExtensionsConfigContent.unwantedRecommendations || [];
+				let removeFrom = shouldRecommend ? workspaceExtensionsConfigContent.unwantedRecommendations || [] : workspaceExtensionsConfigContent.recommendations || [];
+
+				if (insertInto.some(e => e.toLowerCase() === extensionIdLowerCase)) {
+					return TPromise.as(null);
+				}
+
+				insertInto.push(extensionId);
+				removeFrom = removeFrom.filter(x => x.toLowerCase() !== extensionIdLowerCase);
+
+				return this.jsonEditingService.write(workspaceConfigurationFile,
+					{
+						key: 'extensions',
+						value: {
+							recommendations: shouldRecommend ? insertInto : removeFrom,
+							unwantedRecommendations: shouldRecommend ? removeFrom : insertInto
+						}
+					},
+					true);
+			});
+	}
+
+	protected addExtensionToWorkspaceFolderConfig(extensionsFileResource: URI, extensionId: string, shouldRecommend: boolean): TPromise<any> {
 		return this.getOrCreateExtensionsFile(extensionsFileResource)
 			.then(({ content }) => {
 				const extensionIdLowerCase = extensionId.toLowerCase();
-				const jsonContent: IExtensionsConfigContent = json.parse(content) || {};
-				const folderRecommendations = jsonContent.recommendations || [];
+				const extensionsConfigContent: IExtensionsConfigContent = json.parse(content) || {};
+				let insertInto = shouldRecommend ? extensionsConfigContent.recommendations || [] : extensionsConfigContent.unwantedRecommendations || [];
+				let removeFrom = shouldRecommend ? extensionsConfigContent.unwantedRecommendations || [] : extensionsConfigContent.recommendations || [];
 
-				if (folderRecommendations.some(e => e.toLowerCase() === extensionIdLowerCase)) {
+				if (insertInto.some(e => e.toLowerCase() === extensionIdLowerCase)) {
 					return TPromise.as(null);
 				}
-				folderRecommendations.push(extensionId);
 
-				const folderUnwantedRecommedations = jsonContent.unwantedRecommendations || [];
-				let index = -1;
-				for (let i = 0; i < folderUnwantedRecommedations.length; i++) {
-					if (folderUnwantedRecommedations[i].toLowerCase() === extensionIdLowerCase) {
-						index = i;
-						break;
-					}
-				}
+				insertInto.push(extensionId);
 
-				let removeFromUnwantedPromise = TPromise.wrap(null);
-				if (index > -1) {
-					folderUnwantedRecommedations.splice(index, 1);
-					removeFromUnwantedPromise = this.jsonEditingService.write(extensionsFileResource,
+				let removeFromPromise = TPromise.wrap(null);
+				if (removeFrom.some(e => e.toLowerCase() === extensionIdLowerCase)) {
+					removeFrom = removeFrom.filter(x => x.toLowerCase() !== extensionIdLowerCase);
+					removeFromPromise = this.jsonEditingService.write(extensionsFileResource,
 						{
-							key: 'unwantedRecommendations',
-							value: folderUnwantedRecommedations
+							key: shouldRecommend ? 'unwantedRecommendations' : 'recommendations',
+							value: removeFrom
 						},
 						true);
 				}
 
-				return removeFromUnwantedPromise.then(() =>
+				return removeFromPromise.then(() =>
 					this.jsonEditingService.write(extensionsFileResource,
 						{
-							key: 'recommendations',
-							value: folderRecommendations
+							key: shouldRecommend ? 'recommendations' : 'unwantedRecommendations',
+							value: insertInto
 						},
 						true)
 				);
 			});
 	}
 
-	protected getFolderRecommendedExtensions(extensionsFileResource: URI): TPromise<string[]> {
+	protected getWorkspaceExtensionsConfigContent(extensionsFileResource: URI): TPromise<IExtensionsConfigContent> {
 		return this.fileService.resolveContent(extensionsFileResource)
 			.then(content => {
-				const folderRecommendations = (<IExtensionsContent>json.parse(content.value));
-				return folderRecommendations.recommendations || [];
-			}, err => []);
+				return (json.parse(content.value) || {})['extensions'] || {};
+			}, err => ({ recommendations: [], unwantedRecommendations: [] }));
+	}
+
+	protected getWorkspaceFolderExtensionsConfigContent(extensionsFileResource: URI): TPromise<IExtensionsConfigContent> {
+		return this.fileService.resolveContent(extensionsFileResource)
+			.then(content => {
+				return (<IExtensionsConfigContent>json.parse(content.value));
+			}, err => ({ recommendations: [], unwantedRecommendations: [] }));
 	}
 
 	private getOrUpdateWorkspaceConfigurationFile(workspaceConfigurationFile: URI): TPromise<IContent> {
 		return this.fileService.resolveContent(workspaceConfigurationFile)
 			.then(content => {
-				const workspaceRecommendations = <IExtensionsContent>json.parse(content.value)['extensions'];
+				const workspaceRecommendations = <IExtensionsConfigContent>json.parse(content.value)['extensions'];
 				if (!workspaceRecommendations || !workspaceRecommendations.recommendations) {
 					return this.jsonEditingService.write(workspaceConfigurationFile, { key: 'extensions', value: { recommendations: [] } }, true)
 						.then(() => this.fileService.resolveContent(workspaceConfigurationFile));
@@ -2162,10 +2270,13 @@ export class ConfigureWorkspaceFolderRecommendedExtensionsAction extends Abstrac
 	}
 }
 
-export class AddToWorkspaceRecommendationsAction extends AbstractConfigureRecommendedExtensionsAction {
-
-	static readonly ID = 'workbench.extensions.action.addToWorkspaceRecommendations';
-	static LABEL = localize('addToWorkspaceRecommendations', "Add to workspace recommendations");
+export class AddToWorkspaceFolderRecommendationsAction extends AbstractConfigureRecommendedExtensionsAction {
+	static readonly ADD = true;
+	static readonly IGNORE = false;
+	static readonly ADD_ID = 'workbench.extensions.action.addToWorkspaceFolderRecommendations';
+	static readonly ADD_LABEL = localize('addToWorkspaceFolderRecommendations', "Add to Recommended Extensions (Workspace Folder)");
+	static readonly IGNORE_ID = 'workbench.extensions.action.addToWorkspaceFolderIgnoredRecommendations';
+	static readonly IGNORE_LABEL = localize('addToWorkspaceFolderIgnoredRecommendations', "Ignore Recommended Extension (Workspace Folder)");
 
 	constructor(
 		id: string,
@@ -2178,24 +2289,16 @@ export class AddToWorkspaceRecommendationsAction extends AbstractConfigureRecomm
 		@ICommandService private commandService: ICommandService,
 		@INotificationService private notificationService: INotificationService
 	) {
-		super(
-			id,
-			label,
-			contextService,
-			fileService,
-			editorService,
-			jsonEditingService,
-			textModelResolverService
-		);
+		super(id, label, contextService, fileService, editorService, jsonEditingService, textModelResolverService);
 	}
 
-	run(): TPromise<void> {
+	run(shouldRecommend: boolean): TPromise<void> {
 		if (!(this.editorService.activeEditor instanceof ExtensionsInput) || !this.editorService.activeEditor.extension) {
 			return TPromise.as(null);
 		}
 		const folders = this.contextService.getWorkspace().folders;
 		if (!folders || !folders.length) {
-			this.notificationService.info(localize('AddToWorkspaceRecommendations.noWorkspace', 'There is no workspace open to add recommendations.'));
+			this.notificationService.info(localize('AddToWorkspaceFolderRecommendations.noWorkspace', 'There are no workspace folders open to add recommendations.'));
 			return TPromise.as(null);
 		}
 
@@ -2209,23 +2312,95 @@ export class AddToWorkspaceRecommendationsAction extends AbstractConfigureRecomm
 					return TPromise.as(null);
 				}
 				const configurationFile = workspaceFolder.toResource(paths.join('.vscode', 'extensions.json'));
-				return this.getFolderRecommendedExtensions(configurationFile).then(recommendations => {
+				return this.getWorkspaceFolderExtensionsConfigContent(configurationFile).then(content => {
 					const extensionIdLowerCase = extensionId.toLowerCase();
-					if (recommendations.some(e => e.toLowerCase() === extensionIdLowerCase)) {
-						this.notificationService.info(localize('AddToWorkspaceRecommendations.alreadyExists', 'This extension is already present in workspace recommendations.'));
-						return TPromise.as(null);
-					}
+					if (shouldRecommend) {
+						if ((content.recommendations || []).some(e => e.toLowerCase() === extensionIdLowerCase)) {
+							this.notificationService.info(localize('AddToWorkspaceFolderRecommendations.alreadyExists', 'This extension is already present in this workspace folder\'s recommendations.'));
+							return TPromise.as(null);
+						}
 
-					return this.addRecommendedExtensionToFolder(configurationFile, extensionId).then(() => {
-						this.notificationService.info(localize('AddToWorkspaceRecommendations.success', 'The extension was successfully added to workspace recommendations.'));
-					}, err => {
-						this.notificationService.error(localize('AddToWorkspaceRecommendations.failure', 'Failed to write to extensions.json. {0}', err));
-					});
+						return this.addExtensionToWorkspaceFolderConfig(configurationFile, extensionId, shouldRecommend).then(() => {
+							this.notificationService.info(localize('AddToWorkspaceFolderRecommendations.success', 'The extension was successfully added to this workspace folder\'s recommendations.'));
+						}, err => {
+							this.notificationService.error(localize('AddToWorkspaceFolderRecommendations.failure', 'Failed to write to extensions.json. {0}', err));
+						});
+					}
+					else {
+						if ((content.unwantedRecommendations || []).some(e => e.toLowerCase() === extensionIdLowerCase)) {
+							this.notificationService.info(localize('AddToWorkspaceFolderIgnoredRecommendations.alreadyExists', 'This extension is already present in this workspace folder\'s unwanted recommendations.'));
+							return TPromise.as(null);
+						}
+
+						return this.addExtensionToWorkspaceFolderConfig(configurationFile, extensionId, shouldRecommend).then(() => {
+							this.notificationService.info(localize('AddToWorkspaceFolderIgnoredRecommendations.success', 'The extension was successfully added to this workspace folder\'s unwanted recommendations.'));
+						}, err => {
+							this.notificationService.error(localize('AddToWorkspaceFolderRecommendations.failure', 'Failed to write to extensions.json. {0}', err));
+						});
+					}
 				});
 			});
 	}
 }
 
+export class AddToWorkspaceRecommendationsAction extends AbstractConfigureRecommendedExtensionsAction {
+	static readonly ADD = true;
+	static readonly IGNORE = false;
+	static readonly ADD_ID = 'workbench.extensions.action.addToWorkspaceRecommendations';
+	static readonly ADD_LABEL = localize('addToWorkspaceRecommendations', "Add to Recommended Extensions (Workspace)");
+	static readonly IGNORE_ID = 'workbench.extensions.action.addToWorkspaceIgnoredRecommendations';
+	static readonly IGNORE_LABEL = localize('addToWorkspaceIgnoredRecommendations', "Ignore Recommended Extension (Workspace)");
+
+	constructor(
+		id: string,
+		label: string,
+		@IFileService fileService: IFileService,
+		@IWorkspaceContextService contextService: IWorkspaceContextService,
+		@IEditorService editorService: IEditorService,
+		@IJSONEditingService jsonEditingService: IJSONEditingService,
+		@ITextModelService textModelResolverService: ITextModelService,
+		@INotificationService private notificationService: INotificationService
+	) {
+		super(id, label, contextService, fileService, editorService, jsonEditingService, textModelResolverService);
+	}
+
+	run(shouldRecommend: boolean): TPromise<void> {
+		if (!(this.editorService.activeEditor instanceof ExtensionsInput) || !this.editorService.activeEditor.extension) {
+			return TPromise.as(null);
+		}
+		const workspaceConfig = this.contextService.getWorkspace().configuration;
+
+		const extensionId = this.editorService.activeEditor.extension.id;
+
+		return this.getWorkspaceExtensionsConfigContent(workspaceConfig).then(content => {
+			const extensionIdLowerCase = extensionId.toLowerCase();
+			if (shouldRecommend) {
+				if ((content.recommendations || []).some(e => e.toLowerCase() === extensionIdLowerCase)) {
+					this.notificationService.info(localize('AddToWorkspaceRecommendations.alreadyExists', 'This extension is already present in workspace recommendations.'));
+					return TPromise.as(null);
+				}
+
+				return this.addExtensionToWorkspaceConfig(workspaceConfig, extensionId, shouldRecommend).then(() => {
+					this.notificationService.info(localize('AddToWorkspaceRecommendations.success', 'The extension was successfully added to this workspace\'s recommendations.'));
+				}, err => {
+					this.notificationService.error(localize('AddToWorkspaceRecommendations.failure', 'Failed to write. {0}', err));
+				});
+			} else {
+				if ((content.unwantedRecommendations || []).some(e => e.toLowerCase() === extensionIdLowerCase)) {
+					this.notificationService.info(localize('AddToWorkspaceUnwantedRecommendations.alreadyExists', 'This extension is already present in workspace unwanted recommendations.'));
+					return TPromise.as(null);
+				}
+
+				return this.addExtensionToWorkspaceConfig(workspaceConfig, extensionId, shouldRecommend).then(() => {
+					this.notificationService.info(localize('AddToWorkspaceUnwantedRecommendations.success', 'The extension was successfully added to this workspace\'s unwanted recommendations.'));
+				}, err => {
+					this.notificationService.error(localize('AddToWorkspaceRecommendations.failure', 'Failed to write. {0}', err));
+				});
+			}
+		});
+	}
+}
+
 export class MaliciousStatusLabelAction extends Action {
 
 	private static readonly Class = 'malicious-status';
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsList.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsList.ts
index 8dcd8b1d2b1..1f032611899 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsList.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsList.ts
@@ -154,7 +154,13 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 		const installed = this.extensionsWorkbenchService.local.filter(e => e.id === extension.id)[0];
 
 		this.extensionService.getExtensions().then(runningExtensions => {
-			toggleClass(data.root, 'disabled', installed && installed.local ? runningExtensions.every(e => !(installed.local.location.toString() === e.extensionLocation.toString() && areSameExtensions(e, extension))) : false);
+			if (installed && installed.local) {
+				const installedExtensionServer = this.extensionManagementServerService.getExtensionManagementServer(installed.local.location);
+				const isSameExtensionRunning = runningExtensions.some(e => areSameExtensions(e, extension) && installedExtensionServer.location.toString() === this.extensionManagementServerService.getExtensionManagementServer(e.extensionLocation).location.toString());
+				toggleClass(data.root, 'disabled', !isSameExtensionRunning);
+			} else {
+				removeClass(data.root, 'disabled');
+			}
 		});
 
 		const onError = once(domEvent(data.icon, 'error'));
@@ -170,7 +176,7 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 
 		this.updateRecommendationStatus(extension, data);
 		data.extensionDisposables.push(this.extensionTipsService.onRecommendationChange(change => {
-			if (change.extensionId.toLowerCase() === extension.id.toLowerCase() && change.isRecommended === false) {
+			if (change.extensionId.toLowerCase() === extension.id.toLowerCase()) {
 				this.updateRecommendationStatus(extension, data);
 			}
 		}));
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
index 40be6b379cd..507bf50decd 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
@@ -301,7 +301,7 @@ export class ExtensionsViewlet extends ViewContainerViewlet implements IExtensio
 		}, this, this.disposables);
 	}
 
-	async create(parent: HTMLElement): TPromise<void> {
+	create(parent: HTMLElement): TPromise<void> {
 		addClass(parent, 'extensions-viewlet');
 		this.root = parent;
 
@@ -326,14 +326,14 @@ export class ExtensionsViewlet extends ViewContainerViewlet implements IExtensio
 
 		this.onSearchChange = mapEvent(onSearchInput, e => e.target.value);
 
-		await super.create(this.extensionsBox);
-
-		const installed = await this.extensionManagementService.getInstalled(LocalExtensionType.User);
-
-		if (installed.length === 0) {
-			this.searchBox.value = '@sort:installs';
-			this.searchExtensionsContextKey.set(true);
-		}
+		return super.create(this.extensionsBox)
+			.then(() => this.extensionManagementService.getInstalled(LocalExtensionType.User))
+			.then(installed => {
+				if (installed.length === 0) {
+					this.searchBox.value = '@sort:installs';
+					this.searchExtensionsContextKey.set(true);
+				}
+			});
 	}
 
 	public updateStyles(): void {
@@ -429,7 +429,7 @@ export class ExtensionsViewlet extends ViewContainerViewlet implements IExtensio
 			.done(null, err => this.onError(err));
 	}
 
-	private async doSearch(): TPromise<any> {
+	private doSearch(): TPromise<any> {
 		const value = this.searchBox.value || '';
 		this.searchExtensionsContextKey.set(!!value);
 		this.searchInstalledExtensionsContextKey.set(InstalledExtensionsView.isInstalledExtensionsQuery(value));
@@ -439,8 +439,9 @@ export class ExtensionsViewlet extends ViewContainerViewlet implements IExtensio
 		this.nonEmptyWorkspaceContextKey.set(this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY);
 
 		if (value) {
-			this.progress(TPromise.join(this.panels.map(view => (<ExtensionsListView>view).show(this.searchBox.value))));
+			return this.progress(TPromise.join(this.panels.map(view => (<ExtensionsListView>view).show(this.searchBox.value))));
 		}
+		return TPromise.as(null);
 	}
 
 	protected onDidAddViews(added: IAddedViewDescriptorRef[]): ViewletPanel[] {
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
index b22cdb46bd2..a03d325d251 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
@@ -5,6 +5,7 @@
 
 'use strict';
 
+
 import { localize } from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { dispose } from 'vs/base/common/lifecycle';
@@ -39,6 +40,7 @@ import { ViewletPanel, IViewletPanelOptions } from 'vs/workbench/browser/parts/v
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { distinct } from 'vs/base/common/arrays';
 import URI from 'vs/base/common/uri';
+import { IExperimentService } from 'vs/workbench/parts/experiments/node/experimentService';
 
 export class ExtensionsListView extends ViewletPanel {
 
@@ -63,7 +65,8 @@ export class ExtensionsListView extends ViewletPanel {
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IWorkspaceContextService protected contextService: IWorkspaceContextService,
-		@IExtensionManagementServerService protected extensionManagementServerService: IExtensionManagementServerService
+		@IExtensionManagementServerService protected extensionManagementServerService: IExtensionManagementServerService,
+		@IExperimentService private experimentService: IExperimentService
 	) {
 		super({ ...(options as IViewletPanelOptions), ariaHeaderLabel: options.title }, keybindingService, contextMenuService, configurationService);
 	}
@@ -83,7 +86,8 @@ export class ExtensionsListView extends ViewletPanel {
 		const delegate = new Delegate();
 		const renderer = this.instantiationService.createInstance(Renderer);
 		this.list = this.instantiationService.createInstance(WorkbenchPagedList, this.extensionsList, delegate, [renderer], {
-			ariaLabel: localize('extensions', "Extensions")
+			ariaLabel: localize('extensions', "Extensions"),
+			multipleSelectionSupport: false
 		}) as WorkbenchPagedList<IExtension>;
 		this.disposables.push(this.list);
 
@@ -103,7 +107,7 @@ export class ExtensionsListView extends ViewletPanel {
 		this.list.layout(size);
 	}
 
-	async show(query: string): TPromise<IPagedModel<IExtension>> {
+	async show(query: string): Promise<IPagedModel<IExtension>> {
 		const model = await this.query(query);
 		this.setModel(model);
 		return model;
@@ -137,7 +141,7 @@ export class ExtensionsListView extends ViewletPanel {
 		return this.list.length;
 	}
 
-	private async query(value: string): TPromise<IPagedModel<IExtension>> {
+	private async query(value: string): Promise<IPagedModel<IExtension>> {
 		const query = Query.parse(value);
 
 		let options: IQueryOptions = {
@@ -272,6 +276,10 @@ export class ExtensionsListView extends ViewletPanel {
 			return this.getRecommendationsModel(query, options);
 		}
 
+		if (/\bcurated:([^\s]+)\b/.test(query.value)) {
+			return this.getCuratedModel(query, options);
+		}
+
 		let text = query.value;
 		const extensionRegex = /\bext:([^\s]+)\b/g;
 
@@ -368,6 +376,21 @@ export class ExtensionsListView extends ViewletPanel {
 			});
 	}
 
+	private getCuratedModel(query: Query, options: IQueryOptions): TPromise<IPagedModel<IExtension>> {
+		const value = query.value.replace(/curated:/g, '').trim();
+		return this.experimentService.getCuratedExtensionsList(value).then(names => {
+			if (Array.isArray(names) && names.length) {
+				options.source = `curated:${value}`;
+				return this.extensionsWorkbenchService.queryGallery(assign(options, { names, pageSize: names.length }))
+					.then(pager => {
+						this.sortFirstPage(pager, names);
+						return new PagedModel(pager || []);
+					});
+			}
+			return TPromise.as(new PagedModel([]));
+		});
+	}
+
 	private getRecommendationsModel(query: Query, options: IQueryOptions): TPromise<IPagedModel<IExtension>> {
 		const value = query.value.replace(/@recommended/g, '').trim().toLowerCase();
 
@@ -629,7 +652,7 @@ export class InstalledExtensionsView extends ExtensionsListView {
 			|| ExtensionsListView.isEnabledExtensionsQuery(query);
 	}
 
-	async show(query: string): TPromise<IPagedModel<IExtension>> {
+	async show(query: string): Promise<IPagedModel<IExtension>> {
 		if (InstalledExtensionsView.isInstalledExtensionsQuery(query)) {
 			return super.show(query);
 		}
@@ -641,7 +664,7 @@ export class InstalledExtensionsView extends ExtensionsListView {
 
 export class GroupByServerExtensionsView extends ExtensionsListView {
 
-	async show(query: string): TPromise<IPagedModel<IExtension>> {
+	async show(query: string): Promise<IPagedModel<IExtension>> {
 		query = query.replace(/@group:server/g, '').trim();
 		query = query ? query : '@installed';
 		if (!InstalledExtensionsView.isInstalledExtensionsQuery(query) && !ExtensionsListView.isBuiltInExtensionsQuery(query)) {
@@ -653,21 +676,21 @@ export class GroupByServerExtensionsView extends ExtensionsListView {
 
 export class EnabledExtensionsView extends ExtensionsListView {
 
-	async show(query: string): TPromise<IPagedModel<IExtension>> {
+	async show(query: string): Promise<IPagedModel<IExtension>> {
 		return super.show('@enabled');
 	}
 }
 
 export class DisabledExtensionsView extends ExtensionsListView {
 
-	async show(query: string): TPromise<IPagedModel<IExtension>> {
+	async show(query: string): Promise<IPagedModel<IExtension>> {
 		return super.show('@disabled');
 	}
 }
 
 export class BuiltInExtensionsView extends ExtensionsListView {
 
-	async show(query: string): TPromise<IPagedModel<IExtension>> {
+	async show(query: string): Promise<IPagedModel<IExtension>> {
 		return super.show(query.replace('@builtin', '@builtin:features'));
 	}
 
@@ -675,14 +698,14 @@ export class BuiltInExtensionsView extends ExtensionsListView {
 
 export class BuiltInThemesExtensionsView extends ExtensionsListView {
 
-	async show(query: string): TPromise<IPagedModel<IExtension>> {
+	async show(query: string): Promise<IPagedModel<IExtension>> {
 		return super.show(query.replace('@builtin', '@builtin:themes'));
 	}
 }
 
 export class BuiltInBasicsExtensionsView extends ExtensionsListView {
 
-	async show(query: string): TPromise<IPagedModel<IExtension>> {
+	async show(query: string): Promise<IPagedModel<IExtension>> {
 		return super.show(query.replace('@builtin', '@builtin:basics'));
 	}
 }
@@ -697,7 +720,7 @@ export class DefaultRecommendedExtensionsView extends ExtensionsListView {
 		}));
 	}
 
-	async show(query: string): TPromise<IPagedModel<IExtension>> {
+	async show(query: string): Promise<IPagedModel<IExtension>> {
 		return super.show('@recommended:all');
 	}
 
@@ -714,7 +737,7 @@ export class RecommendedExtensionsView extends ExtensionsListView {
 		}));
 	}
 
-	async show(query: string): TPromise<IPagedModel<IExtension>> {
+	async show(query: string): Promise<IPagedModel<IExtension>> {
 		return super.show('@recommended');
 	}
 }
@@ -754,7 +777,7 @@ export class WorkspaceRecommendedExtensionsView extends ExtensionsListView {
 		this.disposables.push(...[this.installAllAction, configureWorkspaceFolderAction, actionbar]);
 	}
 
-	async show(): TPromise<IPagedModel<IExtension>> {
+	async show(): Promise<IPagedModel<IExtension>> {
 		let model = await super.show('@recommended:workspace');
 		this.setExpanded(model.length > 0);
 		return model;
@@ -772,6 +795,6 @@ export class WorkspaceRecommendedExtensionsView extends ExtensionsListView {
 
 	private getRecommendationsToInstall(): TPromise<IExtensionRecommendation[]> {
 		return this.tipsService.getWorkspaceRecommendations()
-			.then(recommendations => recommendations.filter(({ extensionId }) => this.extensionsWorkbenchService.local.some(i => areSameExtensions({ id: extensionId }, { id: i.id }))));
+			.then(recommendations => recommendations.filter(({ extensionId }) => !this.extensionsWorkbenchService.local.some(i => areSameExtensions({ id: extensionId }, { id: i.id }))));
 	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/parts/extensions/electron-browser/media/extensionActions.css b/src/vs/workbench/parts/extensions/electron-browser/media/extensionActions.css
index b33e9f8095a..43bcde8a007 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/media/extensionActions.css
+++ b/src/vs/workbench/parts/extensions/electron-browser/media/extensionActions.css
@@ -76,24 +76,3 @@
 .extension-editor > .header.recommended > .details > .recommendation > .monaco-action-bar .actions-container {
 	justify-content: flex-start;
 }
-
-.extension-editor > .header.recommended > .details > .recommendation > .monaco-action-bar .action-item .action-label.extension-action.ignore {
-	height: 13px;
-	width: 8px;
-	border: none;
-	outline-offset: 0;
-	margin-left: 6px;
-	padding-left: 0;
-	margin-top: 3px;
-	background-color: transparent;
-	color: hsl(0, 66%, 50%);
-}
-
-.hc-black .extension-editor > .header.recommended > .details > .recommendation > .monaco-action-bar .action-item .action-label.extension-action.ignore,
-.vs-dark .extension-editor > .header.recommended > .details > .recommendation > .monaco-action-bar .action-item .action-label.extension-action.ignore {
-	color: hsla(0, 66%, 77%, 1);
-}
-
-.extension-editor > .header.recommended > .details > .recommendation > .monaco-action-bar .action-item .action-label.extension-action.ignore:hover {
-	filter: brightness(.8);
-}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/extensions/electron-browser/media/extensionEditor.css b/src/vs/workbench/parts/extensions/electron-browser/media/extensionEditor.css
index a97d3d273e1..10efc9daede 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/media/extensionEditor.css
+++ b/src/vs/workbench/parts/extensions/electron-browser/media/extensionEditor.css
@@ -14,18 +14,14 @@
 
 .extension-editor > .header {
 	display: flex;
-	height: 128px;
-	padding: 20px;
+	padding-top: 20px;
+	padding-bottom: 14px;
+	padding-left: 20px;
+	padding-right: 20px;
 	overflow: hidden;
 	font-size: 14px;
 }
 
-.extension-editor > .header.recommended,
-.extension-editor > .header.recommendation-ignored
-{
-	height: 140px;
-}
-
 .extension-editor > .header > .icon {
 	height: 128px;
 	width: 128px;
@@ -33,7 +29,6 @@
 }
 
 .extension-editor > .header > .details {
-	flex: 1;
 	padding-left: 20px;
 	overflow: hidden;
 	user-select: text;
@@ -130,23 +125,51 @@
 	padding: 1px 6px;
 }
 
-
-.extension-editor > .header.recommended > .details > .recommendation,
-.extension-editor > .header.recommendation-ignored > .details > .recommendation {
-	display: flex;
-	margin-top: 2px;
-	font-size: 13px;
-}
-
 .extension-editor > .header > .details > .recommendation {
 	display: none;
 }
 
-.extension-editor > .header.recommendation-ignored > .details > .recommendation > .recommendation-text {
+.extension-editor > .header.recommended > .details > .recommendation,
+.extension-editor > .header.recommendation-ignored > .details > .recommendation {
+	display: block;
+	float: left;
+	margin-top: 0;
+	font-size: 13px;
 	font-style: italic;
 }
 
+.extension-editor > .header.recommended > .details > .recommendation > .monaco-action-bar,
 .extension-editor > .header.recommendation-ignored > .details > .recommendation > .monaco-action-bar {
+	float: left;
+	margin-top: 2px;
+	font-style: normal;
+}
+
+.extension-editor > .header > .details > .recommendation > .recommendation-text {
+	float:left;
+	margin-top: 5px;
+	margin-right: 4px;
+}
+.extension-editor > .header > .details > .recommendation > .monaco-action-bar .action-label {
+	margin-top: 4px;
+	margin-left: 4px;
+	padding-top: 0;
+	padding-bottom: 2px;
+}
+
+.extension-editor > .header.recommendation-ignored > .details > .recommendation > .monaco-action-bar .ignore {
+	display: none;
+}
+
+.extension-editor > .header.recommendation-ignored > .details > .recommendation > .monaco-action-bar .undo-ignore {
+	display: block;
+}
+
+.extension-editor > .header.recommended > .details > .recommendation > .monaco-action-bar .ignore {
+	display: block;
+}
+
+.extension-editor > .header.recommended > .details > .recommendation > .monaco-action-bar .undo-ignore {
 	display: none;
 }
 
diff --git a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
index ae90082e58a..ed9c80d3b1a 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
@@ -443,7 +443,7 @@ export class RuntimeExtensionsInput extends EditorInput {
 		return true;
 	}
 
-	resolve(refresh?: boolean): TPromise<any> {
+	resolve(): TPromise<any> {
 		return TPromise.as(null);
 	}
 
@@ -573,7 +573,11 @@ class SaveExtensionHostProfileAction extends Action {
 		});
 	}
 
-	async run(): TPromise<any> {
+	run(): TPromise<any> {
+		return TPromise.wrap(this._asyncRun());
+	}
+
+	private async _asyncRun(): Promise<any> {
 		let picked = await this._windowService.showSaveDialog({
 			title: 'Save Extension Host Profile',
 			buttonLabel: 'Save',
diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
index c8cf45c8644..03a9cc7540c 100644
--- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
@@ -18,7 +18,7 @@ import { IPager, mapPager, singlePagePager } from 'vs/base/common/paging';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import {
 	IExtensionManagementService, IExtensionGalleryService, ILocalExtension, IGalleryExtension, IQueryOptions, IExtensionManifest,
-	InstallExtensionEvent, DidInstallExtensionEvent, LocalExtensionType, DidUninstallExtensionEvent, IExtensionEnablementService, IExtensionIdentifier, EnablementState, IExtensionTipsService, ExtensionRecommendationSource, IExtensionRecommendation
+	InstallExtensionEvent, DidInstallExtensionEvent, LocalExtensionType, DidUninstallExtensionEvent, IExtensionEnablementService, IExtensionIdentifier, EnablementState, IExtensionTipsService, ExtensionRecommendationSource, IExtensionRecommendation, IExtensionManagementServerService
 } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { getGalleryExtensionIdFromLocal, getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData, areSameExtensions, getMaliciousExtensionsSet } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -352,7 +352,8 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 		@ILogService private logService: ILogService,
 		@IProgressService2 private progressService: IProgressService2,
 		@IExtensionService private runtimeExtensionService: IExtensionService,
-		@IExtensionTipsService private extensionTipsService: IExtensionTipsService
+		@IExtensionTipsService private extensionTipsService: IExtensionTipsService,
+		@IExtensionManagementServerService private extensionManagementServerService: IExtensionManagementServerService
 	) {
 		this.stateProvider = ext => this.getExtensionState(ext);
 
@@ -752,7 +753,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 			for (const extension of extensions) {
 				let dependents = this.getDependentsAfterDisablement(extension, allExtensions, this.local, enablementState);
 				if (dependents.length) {
-					return TPromise.wrapError<void>(new Error(this.getDependentsErrorMessage(extension, dependents)));
+					return TPromise.wrapError<void>(new Error(this.getDependentsErrorMessage(extension, allExtensions, dependents)));
 				}
 			}
 		}
@@ -805,7 +806,17 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 		});
 	}
 
-	private getDependentsErrorMessage(extension: IExtension, dependents: IExtension[]): string {
+	private getDependentsErrorMessage(extension: IExtension, allDisabledExtensions: IExtension[], dependents: IExtension[]): string {
+		for (const e of [extension, ...allDisabledExtensions]) {
+			let dependentsOfTheExtension = dependents.filter(d => d.dependencies.some(id => areSameExtensions({ id }, e)));
+			if (dependentsOfTheExtension.length) {
+				return this.getErrorMessageForDisablingAnExtensionWithDependents(e, dependentsOfTheExtension);
+			}
+		}
+		return '';
+	}
+
+	private getErrorMessageForDisablingAnExtensionWithDependents(extension: IExtension, dependents: IExtension[]): string {
 		if (dependents.length === 1) {
 			return nls.localize('singleDependentError', "Cannot disable extension '{0}'. Extension '{1}' depends on this.", extension.displayName, dependents[0].displayName);
 		}
@@ -877,7 +888,8 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 			if (!error) {
 				const installed = this.installed.filter(e => e.id === extension.id)[0];
 				if (installed) {
-					const existingLocal = installed.locals.filter(l => l.location.toString() === local.location.toString())[0];
+					const server = this.extensionManagementServerService.getExtensionManagementServer(local.location);
+					const existingLocal = installed.locals.filter(l => this.extensionManagementServerService.getExtensionManagementServer(l.location).location.toString() === server.location.toString())[0];
 					if (existingLocal) {
 						const locals = [...installed.locals];
 						locals.splice(installed.locals.indexOf(existingLocal), 1, local);
@@ -962,13 +974,13 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 		this.notificationService.error(err);
 	}
 
-	async handleURL(uri: URI): TPromise<boolean> {
+	handleURL(uri: URI): TPromise<boolean> {
 		if (!/^extension/.test(uri.path)) {
-			return false;
+			return TPromise.as(false);
 		}
 
 		this.onOpenExtensionUrl(uri);
-		return true;
+		return TPromise.as(true);
 	}
 
 	private onOpenExtensionUrl(uri: URI): void {
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 8308b8fc640..926f041931e 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
@@ -14,7 +14,7 @@ import * as ExtensionsActions from 'vs/workbench/parts/extensions/electron-brows
 import { ExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/node/extensionsWorkbenchService';
 import {
 	IExtensionManagementService, IExtensionGalleryService, IExtensionEnablementService, IExtensionTipsService, ILocalExtension, LocalExtensionType, IGalleryExtension,
-	DidInstallExtensionEvent, DidUninstallExtensionEvent, InstallExtensionEvent, IExtensionIdentifier, EnablementState, InstallOperation, IExtensionManagementServerService
+	DidInstallExtensionEvent, DidUninstallExtensionEvent, InstallExtensionEvent, IExtensionIdentifier, EnablementState, InstallOperation, IExtensionManagementServerService, IExtensionManagementServer
 } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ExtensionManagementService, getLocalExtensionIdFromGallery, getLocalExtensionIdFromManifest } from 'vs/platform/extensionManagement/node/extensionManagementService';
@@ -35,7 +35,8 @@ import { ILogService, NullLogService } from 'vs/platform/log/common/log';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { URLService } from 'vs/platform/url/common/urlService';
 import URI from 'vs/base/common/uri';
-import { ExtensionManagementServerService } from 'vs/workbench/services/extensions/node/extensionManagementServerService';
+import { SingleServerExtensionManagementServerService } from 'vs/workbench/services/extensions/node/extensionManagementServerService';
+import { Schemas } from 'vs/base/common/network';
 
 suite('ExtensionsActions Test', () => {
 
@@ -70,7 +71,7 @@ suite('ExtensionsActions Test', () => {
 		instantiationService.stub(IExtensionManagementService, 'onUninstallExtension', uninstallEvent.event);
 		instantiationService.stub(IExtensionManagementService, 'onDidUninstallExtension', didUninstallEvent.event);
 
-		instantiationService.stub(IExtensionManagementServerService, instantiationService.createInstance(ExtensionManagementServerService, instantiationService.get(IExtensionManagementService)));
+		instantiationService.stub(IExtensionManagementServerService, instantiationService.createInstance(SingleServerExtensionManagementServerService, <IExtensionManagementServer>{ location: URI.from({ scheme: Schemas.file }), extensionManagementService: instantiationService.get(IExtensionManagementService) }));
 
 		instantiationService.stub(IExtensionEnablementService, new TestExtensionEnablementService(instantiationService));
 
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 1aafa089302..faa0bf3f29f 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
@@ -48,6 +48,8 @@ import { IModelService } from 'vs/editor/common/services/modelService';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { INotificationService, Severity, IPromptChoice } from 'vs/platform/notification/common/notification';
 import { URLService } from 'vs/platform/url/common/urlService';
+import { IExperimentService } from 'vs/workbench/parts/experiments/node/experimentService';
+import { TestExperimentService } from 'vs/workbench/parts/experiments/test/node/experimentService.test';
 
 const mockExtensionGallery: IGalleryExtension[] = [
 	aGalleryExtension('MockExtension1', {
@@ -175,6 +177,7 @@ suite('ExtensionsTipsService Test', () => {
 		didUninstallEvent: Emitter<DidUninstallExtensionEvent>;
 	let prompted: boolean;
 	let onModelAddedEvent: Emitter<ITextModel>;
+	let experimentService: TestExperimentService;
 
 	suiteSetup(() => {
 		instantiationService = new TestInstantiationService();
@@ -196,6 +199,9 @@ suite('ExtensionsTipsService Test', () => {
 		instantiationService.stub(ITelemetryService, NullTelemetryService);
 		instantiationService.stub(IURLService, URLService);
 
+		experimentService = instantiationService.createInstance(TestExperimentService);
+		instantiationService.stub(IExperimentService, experimentService);
+
 		onModelAddedEvent = new Emitter<ITextModel>();
 
 		product.extensionTips = {
@@ -215,6 +221,12 @@ suite('ExtensionsTipsService Test', () => {
 		};
 	});
 
+	suiteTeardown(() => {
+		if (experimentService) {
+			experimentService.dispose();
+		}
+	});
+
 	setup(() => {
 		instantiationService.stub(IEnvironmentService, { extensionDevelopmentPath: false });
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', []);
@@ -424,17 +436,16 @@ suite('ExtensionsTipsService Test', () => {
 		return setUpFolderWorkspace('myFolder', mockTestData.validRecommendedExtensions, workspaceIgnoredRecommendations).then(() => {
 			testObject = instantiationService.createInstance(ExtensionTipsService);
 			return testObject.loadRecommendationsPromise.then(() => {
-				const recommendations = testObject.getAllIgnoredRecommendations();
-				assert.deepStrictEqual(recommendations,
-					{
-						global: ['mockpublisher2.mockextension2'],
-						workspace: ['ms-vscode.csharp']
-					});
+				const recommendations = testObject.getAllRecommendationsWithReason();
+				assert.ok(recommendations['ms-python.python']);
+
+				assert.ok(!recommendations['mockpublisher2.mockextension2']);
+				assert.ok(!recommendations['ms-vscode.csharp']);
 			});
 		});
 	});
 
-	test('ExtensionTipsService: Able to dynamically ignore global recommendations', () => {
+	test('ExtensionTipsService: Able to dynamically ignore/unignore global recommendations', () => {
 		const storageGetterStub = (a, _, c) => {
 			const storedRecommendations = '["ms-vscode.csharp", "ms-python.python"]';
 			const globallyIgnoredRecommendations = '["mockpublisher2.mockextension2"]'; // ignore a workspace recommendation.
@@ -452,20 +463,27 @@ suite('ExtensionsTipsService Test', () => {
 		return setUpFolderWorkspace('myFolder', mockTestData.validRecommendedExtensions).then(() => {
 			testObject = instantiationService.createInstance(ExtensionTipsService);
 			return testObject.loadRecommendationsPromise.then(() => {
-				const recommendations = testObject.getAllIgnoredRecommendations();
-				assert.deepStrictEqual(recommendations,
-					{
-						global: ['mockpublisher2.mockextension2'],
-						workspace: []
-					});
-				return testObject.ignoreExtensionRecommendation('mockpublisher1.mockextension1');
+				const recommendations = testObject.getAllRecommendationsWithReason();
+				assert.ok(recommendations['ms-python.python']);
+				assert.ok(recommendations['mockpublisher1.mockextension1']);
+
+				assert.ok(!recommendations['mockpublisher2.mockextension2']);
+
+				return testObject.toggleIgnoredRecommendation('mockpublisher1.mockextension1', true);
 			}).then(() => {
-				const recommendations = testObject.getAllIgnoredRecommendations();
-				assert.deepStrictEqual(recommendations,
-					{
-						global: ['mockpublisher2.mockextension2', 'mockpublisher1.mockextension1'],
-						workspace: []
-					});
+				const recommendations = testObject.getAllRecommendationsWithReason();
+				assert.ok(recommendations['ms-python.python']);
+
+				assert.ok(!recommendations['mockpublisher1.mockextension1']);
+				assert.ok(!recommendations['mockpublisher2.mockextension2']);
+
+				return testObject.toggleIgnoredRecommendation('mockpublisher1.mockextension1', false);
+			}).then(() => {
+				const recommendations = testObject.getAllRecommendationsWithReason();
+				assert.ok(recommendations['ms-python.python']);
+
+				assert.ok(recommendations['mockpublisher1.mockextension1']);
+				assert.ok(!recommendations['mockpublisher2.mockextension2']);
 			});
 		});
 	});
@@ -484,7 +502,7 @@ suite('ExtensionsTipsService Test', () => {
 		return setUpFolderWorkspace('myFolder', []).then(() => {
 			testObject = instantiationService.createInstance(ExtensionTipsService);
 			testObject.onRecommendationChange(changeHandlerTarget);
-			testObject.ignoreExtensionRecommendation(ignoredExtensionId);
+			testObject.toggleIgnoredRecommendation(ignoredExtensionId, true);
 
 			assert.ok(changeHandlerTarget.calledOnce);
 			assert.ok(changeHandlerTarget.getCall(0).calledWithMatch({ extensionId: 'Some.Extension', isRecommended: false }));
diff --git a/src/vs/workbench/parts/feedback/electron-browser/feedback.ts b/src/vs/workbench/parts/feedback/electron-browser/feedback.ts
index c9b4a6a03bc..2224b8c6846 100644
--- a/src/vs/workbench/parts/feedback/electron-browser/feedback.ts
+++ b/src/vs/workbench/parts/feedback/electron-browser/feedback.ts
@@ -342,7 +342,7 @@ export class FeedbackDropdown extends Dropdown {
 		return element;
 	}
 
-	public show(): void {
+	show(): void {
 		super.show();
 
 		if (this.options.onFeedbackVisibilityChange) {
@@ -356,7 +356,7 @@ export class FeedbackDropdown extends Dropdown {
 		}
 	}
 
-	public hide(): void {
+	hide(): void {
 		if (this.feedbackDescriptionInput) {
 			this.feedback = this.feedbackDescriptionInput.value;
 		}
@@ -373,7 +373,7 @@ export class FeedbackDropdown extends Dropdown {
 		super.hide();
 	}
 
-	public onEvent(e: Event, activeElement: HTMLElement): void {
+	onEvent(e: Event, activeElement: HTMLElement): void {
 		if (e instanceof KeyboardEvent) {
 			const keyboardEvent = <KeyboardEvent>e;
 			if (keyboardEvent.keyCode === 27) { // Escape
diff --git a/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts b/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts
index 1a659b36d9a..38b00d07f94 100644
--- a/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts
+++ b/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts
@@ -32,14 +32,14 @@ class TwitterFeedbackService implements IFeedbackService {
 		return TwitterFeedbackService.HASHTAGS.join(',');
 	}
 
-	public submitFeedback(feedback: IFeedback): void {
+	submitFeedback(feedback: IFeedback): void {
 		const queryString = `?${feedback.sentiment === 1 ? `hashtags=${this.combineHashTagsAsString()}&` : null}ref_src=twsrc%5Etfw&related=twitterapi%2Ctwitter&text=${encodeURIComponent(feedback.feedback)}&tw_p=tweetbutton&via=${TwitterFeedbackService.VIA_NAME}`;
 		const url = TwitterFeedbackService.TWITTER_URL + queryString;
 
 		window.open(url);
 	}
 
-	public getCharacterLimit(sentiment: number): number {
+	getCharacterLimit(sentiment: number): number {
 		let length: number = 0;
 		if (sentiment === 1) {
 			TwitterFeedbackService.HASHTAGS.forEach(element => {
@@ -73,15 +73,14 @@ export class FeedbackStatusbarItem extends Themable implements IStatusbarItem {
 
 		this.enabled = this.configurationService.getValue(FEEDBACK_VISIBLE_CONFIG);
 
-		this.hideAction = this.instantiationService.createInstance(HideAction);
-		this.toUnbind.push(this.hideAction);
+		this.hideAction = this._register(this.instantiationService.createInstance(HideAction));
 
 		this.registerListeners();
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.contextService.onDidChangeWorkbenchState(() => this.updateStyles()));
-		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(e)));
+		this._register(this.contextService.onDidChangeWorkbenchState(() => this.updateStyles()));
+		this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(e)));
 	}
 
 	private onConfigurationUpdated(event: IConfigurationChangeEvent): void {
@@ -99,7 +98,7 @@ export class FeedbackStatusbarItem extends Themable implements IStatusbarItem {
 		}
 	}
 
-	public render(element: HTMLElement): IDisposable {
+	render(element: HTMLElement): IDisposable {
 		this.container = element;
 
 		// Prevent showing dropdown on anything but left click
@@ -107,7 +106,7 @@ export class FeedbackStatusbarItem extends Themable implements IStatusbarItem {
 			if (e.button !== 0) {
 				EventHelper.stop(e, true);
 			}
-		}, this.toUnbind, true);
+		}, this.toDispose, true);
 
 		// Offer context menu to hide status bar entry
 		$(this.container).on('contextmenu', e => {
@@ -117,7 +116,7 @@ export class FeedbackStatusbarItem extends Themable implements IStatusbarItem {
 				getAnchor: () => this.container,
 				getActions: () => TPromise.as([this.hideAction])
 			});
-		}, this.toUnbind);
+		}, this.toDispose);
 
 		return this.update();
 	}
@@ -128,7 +127,7 @@ export class FeedbackStatusbarItem extends Themable implements IStatusbarItem {
 		// Create
 		if (enabled) {
 			if (!this.dropdown) {
-				this.dropdown = this.instantiationService.createInstance(FeedbackDropdown, this.container, {
+				this.dropdown = this._register(this.instantiationService.createInstance(FeedbackDropdown, this.container, {
 					contextViewProvider: this.contextViewService,
 					feedbackService: this.instantiationService.createInstance(TwitterFeedbackService),
 					onFeedbackVisibilityChange: visible => {
@@ -138,8 +137,7 @@ export class FeedbackStatusbarItem extends Themable implements IStatusbarItem {
 							removeClass(this.container, 'has-beak');
 						}
 					}
-				} as IFeedbackDropdownOptions);
-				this.toUnbind.push(this.dropdown);
+				} as IFeedbackDropdownOptions));
 
 				this.updateStyles();
 
@@ -166,7 +164,7 @@ class HideAction extends Action {
 		super('feedback.hide', localize('hide', "Hide"));
 	}
 
-	public run(extensionId: string): TPromise<any> {
+	run(extensionId: string): TPromise<any> {
 		return this.configurationService.updateValue(FEEDBACK_VISIBLE_CONFIG, false);
 	}
 }
diff --git a/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts
index de2b5da49ee..5457bee60b2 100644
--- a/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts
+++ b/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts
@@ -21,7 +21,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
  */
 export class BinaryFileEditor extends BaseBinaryResourceEditor {
 
-	public static readonly ID = BINARY_FILE_EDITOR_ID;
+	static readonly ID = BINARY_FILE_EDITOR_ID;
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -59,7 +59,7 @@ export class BinaryFileEditor extends BaseBinaryResourceEditor {
 		});
 	}
 
-	public getTitle(): string {
+	getTitle(): string {
 		return this.input ? this.input.getName() : nls.localize('binaryFileEditor', "Binary File Viewer");
 	}
 }
diff --git a/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts b/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts
index 5169f040911..8b16509b50c 100644
--- a/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts
+++ b/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts
@@ -6,7 +6,6 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import * as errors from 'vs/base/common/errors';
 import URI from 'vs/base/common/uri';
 import * as paths from 'vs/base/common/paths';
 import { IEditorViewState } from 'vs/editor/common/editorCommon';
@@ -15,12 +14,11 @@ import { ITextFileService, ITextFileEditorModel } from 'vs/workbench/services/te
 import { FileOperationEvent, FileOperation, IFileService, FileChangeType, FileChangesEvent } from 'vs/platform/files/common/files';
 import { FileEditorInput } from 'vs/workbench/parts/files/common/editors/fileEditorInput';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { distinct } from 'vs/base/common/arrays';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { isLinux } from 'vs/base/common/platform';
-import { ResourceQueue } from 'vs/base/common/async';
 import { ResourceMap } from 'vs/base/common/map';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -29,12 +27,13 @@ import { IWindowService } from 'vs/platform/windows/common/windows';
 import { BINARY_FILE_EDITOR_ID } from 'vs/workbench/parts/files/common/files';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService';
+import { ResourceQueue } from 'vs/base/common/async';
+import { onUnexpectedError } from 'vs/base/common/errors';
 
-export class FileEditorTracker implements IWorkbenchContribution {
+export class FileEditorTracker extends Disposable implements IWorkbenchContribution {
 
 	protected closeOnFileDelete: boolean;
 
-	private toUnbind: IDisposable[];
 	private modelLoadQueue: ResourceQueue;
 	private activeOutOfWorkspaceWatchers: ResourceMap<URI>;
 
@@ -49,7 +48,8 @@ export class FileEditorTracker implements IWorkbenchContribution {
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IWindowService private windowService: IWindowService
 	) {
-		this.toUnbind = [];
+		super();
+
 		this.modelLoadQueue = new ResourceQueue();
 		this.activeOutOfWorkspaceWatchers = new ResourceMap<URI>();
 
@@ -61,22 +61,22 @@ export class FileEditorTracker implements IWorkbenchContribution {
 	private registerListeners(): void {
 
 		// Update editors from operation changes
-		this.toUnbind.push(this.fileService.onAfterOperation(e => this.onFileOperation(e)));
+		this._register(this.fileService.onAfterOperation(e => this.onFileOperation(e)));
 
 		// Update editors from disk changes
-		this.toUnbind.push(this.fileService.onFileChanges(e => this.onFileChanges(e)));
+		this._register(this.fileService.onFileChanges(e => this.onFileChanges(e)));
 
 		// Editor changing
-		this.toUnbind.push(this.editorService.onDidVisibleEditorsChange(() => this.handleOutOfWorkspaceWatchers()));
+		this._register(this.editorService.onDidVisibleEditorsChange(() => this.handleOutOfWorkspaceWatchers()));
 
 		// Update visible editors when focus is gained
-		this.toUnbind.push(this.windowService.onDidChangeFocus(e => this.onWindowFocusChange(e)));
+		this._register(this.windowService.onDidChangeFocus(e => this.onWindowFocusChange(e)));
 
 		// Lifecycle
 		this.lifecycleService.onShutdown(this.dispose, this);
 
 		// Configuration
-		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(this.configurationService.getValue<IWorkbenchEditorConfiguration>())));
+		this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(this.configurationService.getValue<IWorkbenchEditorConfiguration>())));
 	}
 
 	private onConfigurationUpdated(configuration: IWorkbenchEditorConfiguration): void {
@@ -125,7 +125,9 @@ export class FileEditorTracker implements IWorkbenchContribution {
 	private onFileChanges(e: FileChangesEvent): void {
 
 		// Handle updates
-		this.handleUpdates(e);
+		if (e.gotAdded() || e.gotUpdated()) {
+			this.handleUpdates(e);
+		}
 
 		// Handle deletes
 		if (e.gotDeleted()) {
@@ -286,31 +288,11 @@ export class FileEditorTracker implements IWorkbenchContribution {
 
 	private handleUpdates(e: FileChangesEvent): void {
 
-		// Handle updates to visible binary editors
-		this.handleUpdatesToVisibleBinaryEditors(e);
-
 		// Handle updates to text models
 		this.handleUpdatesToTextModels(e);
-	}
 
-	private handleUpdatesToVisibleBinaryEditors(e: FileChangesEvent): void {
-		const editors = this.editorService.visibleControls;
-		editors.forEach(editor => {
-			const resource = toResource(editor.input, { supportSideBySide: true });
-
-			// Support side-by-side binary editors too
-			let isBinaryEditor = false;
-			if (editor instanceof SideBySideEditor) {
-				isBinaryEditor = editor.getMasterEditor().getId() === BINARY_FILE_EDITOR_ID;
-			} else {
-				isBinaryEditor = editor.getId() === BINARY_FILE_EDITOR_ID;
-			}
-
-			// Binary editor that should reload from event
-			if (resource && isBinaryEditor && (e.contains(resource, FileChangeType.UPDATED) || e.contains(resource, FileChangeType.ADDED))) {
-				this.editorService.openEditor(editor.input, { forceOpen: true, preserveFocus: true }, editor.group);
-			}
-		});
+		// Handle updates to visible binary editors
+		this.handleUpdatesToVisibleBinaryEditors(e);
 	}
 
 	private handleUpdatesToTextModels(e: FileChangesEvent): void {
@@ -332,10 +314,30 @@ export class FileEditorTracker implements IWorkbenchContribution {
 		// to have a size of 2 (1 running load and 1 queued load).
 		const queue = this.modelLoadQueue.queueFor(model.getResource());
 		if (queue.size <= 1) {
-			queue.queue(() => model.load().then(null, errors.onUnexpectedError));
+			queue.queue(() => model.load().then(null, onUnexpectedError));
 		}
 	}
 
+	private handleUpdatesToVisibleBinaryEditors(e: FileChangesEvent): void {
+		const editors = this.editorService.visibleControls;
+		editors.forEach(editor => {
+			const resource = toResource(editor.input, { supportSideBySide: true });
+
+			// Support side-by-side binary editors too
+			let isBinaryEditor = false;
+			if (editor instanceof SideBySideEditor) {
+				isBinaryEditor = editor.getMasterEditor().getId() === BINARY_FILE_EDITOR_ID;
+			} else {
+				isBinaryEditor = editor.getId() === BINARY_FILE_EDITOR_ID;
+			}
+
+			// Binary editor that should reload from event
+			if (resource && isBinaryEditor && (e.contains(resource, FileChangeType.UPDATED) || e.contains(resource, FileChangeType.ADDED))) {
+				this.editorService.openEditor(editor.input, { forceReload: true, preserveFocus: true }, editor.group);
+			}
+		});
+	}
+
 	private handleOutOfWorkspaceWatchers(): void {
 		const visibleOutOfWorkspacePaths = new ResourceMap<URI>();
 		this.editorService.visibleEditors.map(editorInput => {
@@ -363,8 +365,8 @@ export class FileEditorTracker implements IWorkbenchContribution {
 		});
 	}
 
-	public dispose(): void {
-		this.toUnbind = dispose(this.toUnbind);
+	dispose(): void {
+		super.dispose();
 
 		// Dispose watchers if any
 		this.activeOutOfWorkspaceWatchers.forEach(resource => this.fileService.unwatchFileChanges(resource));
diff --git a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
index 4b71f7e2b42..ee794e4861d 100644
--- a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
+++ b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
@@ -39,7 +39,7 @@ import { IEditorGroupView } from 'vs/workbench/browser/parts/editor/editor';
  */
 export class TextFileEditor extends BaseTextEditor {
 
-	public static readonly ID = TEXT_FILE_EDITOR_ID;
+	static readonly ID = TEXT_FILE_EDITOR_ID;
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -59,7 +59,7 @@ export class TextFileEditor extends BaseTextEditor {
 		super(TextFileEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorService, editorGroupService);
 
 		// Clear view state for deleted files
-		this.toUnbind.push(this.fileService.onFileChanges(e => this.onFilesChanged(e)));
+		this._register(this.fileService.onFileChanges(e => this.onFilesChanged(e)));
 	}
 
 	private onFilesChanged(e: FileChangesEvent): void {
@@ -69,11 +69,11 @@ export class TextFileEditor extends BaseTextEditor {
 		}
 	}
 
-	public getTitle(): string {
+	getTitle(): string {
 		return this.input ? this.input.getName() : nls.localize('textFileEditor', "Text File Editor");
 	}
 
-	public get input(): FileEditorInput {
+	get input(): FileEditorInput {
 		return this._input as FileEditorInput;
 	}
 
@@ -83,28 +83,28 @@ export class TextFileEditor extends BaseTextEditor {
 		// React to editors closing to preserve view state. This needs to happen
 		// in the onWillCloseEditor because at that time the editor has not yet
 		// been disposed and we can safely persist the view state still.
-		this.toUnbind.push((group as IEditorGroupView).onWillCloseEditor(e => {
+		this._register((group as IEditorGroupView).onWillCloseEditor(e => {
 			if (e.editor === this.input) {
 				this.doSaveTextEditorViewState(this.input);
 			}
 		}));
 	}
 
-	public setOptions(options: EditorOptions): void {
+	setOptions(options: EditorOptions): void {
 		const textOptions = <TextEditorOptions>options;
 		if (textOptions && types.isFunction(textOptions.apply)) {
 			textOptions.apply(this.getControl(), ScrollType.Smooth);
 		}
 	}
 
-	public setInput(input: FileEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
+	setInput(input: FileEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
 
 		// Remember view settings if input changes
 		this.doSaveTextEditorViewState(this.input);
 
 		// Set input and resolve
 		return super.setInput(input, options, token).then(() => {
-			return input.resolve(true).then(resolvedModel => {
+			return input.resolve().then(resolvedModel => {
 
 				// Check for cancellation
 				if (token.isCancellationRequested) {
@@ -243,7 +243,7 @@ export class TextFileEditor extends BaseTextEditor {
 		return ariaLabel;
 	}
 
-	public clearInput(): void {
+	clearInput(): void {
 
 		// Keep editor view state in settings to restore when coming back
 		this.doSaveTextEditorViewState(this.input);
@@ -255,7 +255,7 @@ export class TextFileEditor extends BaseTextEditor {
 		super.clearInput();
 	}
 
-	public shutdown(): void {
+	shutdown(): void {
 
 		// Save View State
 		this.doSaveTextEditorViewState(this.input);
diff --git a/src/vs/workbench/parts/files/common/dirtyFilesTracker.ts b/src/vs/workbench/parts/files/common/dirtyFilesTracker.ts
index 34594b0301e..7cfc6f9d7cf 100644
--- a/src/vs/workbench/parts/files/common/dirtyFilesTracker.ts
+++ b/src/vs/workbench/parts/files/common/dirtyFilesTracker.ts
@@ -12,16 +12,15 @@ import { TextFileModelChangeEvent, ITextFileService, AutoSaveMode, ModelState }
 import { platform, Platform } from 'vs/base/common/platform';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import URI from 'vs/base/common/uri';
 import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import * as arrays from 'vs/base/common/arrays';
 import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 
-export class DirtyFilesTracker implements IWorkbenchContribution {
+export class DirtyFilesTracker extends Disposable implements IWorkbenchContribution {
 	private isDocumentedEdited: boolean;
-	private toUnbind: IDisposable[];
 	private lastDirtyCount: number;
 	private badgeHandle: IDisposable;
 
@@ -33,7 +32,8 @@ export class DirtyFilesTracker implements IWorkbenchContribution {
 		@IWindowService private windowService: IWindowService,
 		@IUntitledEditorService private untitledEditorService: IUntitledEditorService
 	) {
-		this.toUnbind = [];
+		super();
+
 		this.isDocumentedEdited = false;
 
 		this.registerListeners();
@@ -42,11 +42,11 @@ export class DirtyFilesTracker implements IWorkbenchContribution {
 	private registerListeners(): void {
 
 		// Local text file changes
-		this.toUnbind.push(this.untitledEditorService.onDidChangeDirty(e => this.onUntitledDidChangeDirty(e)));
-		this.toUnbind.push(this.textFileService.models.onModelsDirty(e => this.onTextFilesDirty(e)));
-		this.toUnbind.push(this.textFileService.models.onModelsSaved(e => this.onTextFilesSaved(e)));
-		this.toUnbind.push(this.textFileService.models.onModelsSaveError(e => this.onTextFilesSaveError(e)));
-		this.toUnbind.push(this.textFileService.models.onModelsReverted(e => this.onTextFilesReverted(e)));
+		this._register(this.untitledEditorService.onDidChangeDirty(e => this.onUntitledDidChangeDirty(e)));
+		this._register(this.textFileService.models.onModelsDirty(e => this.onTextFilesDirty(e)));
+		this._register(this.textFileService.models.onModelsSaved(e => this.onTextFilesSaved(e)));
+		this._register(this.textFileService.models.onModelsSaveError(e => this.onTextFilesSaveError(e)));
+		this._register(this.textFileService.models.onModelsReverted(e => this.onTextFilesReverted(e)));
 
 		// Lifecycle
 		this.lifecycleService.onShutdown(this.dispose, this);
@@ -142,8 +142,4 @@ export class DirtyFilesTracker implements IWorkbenchContribution {
 			this.windowService.setDocumentEdited(hasDirtyFiles);
 		}
 	}
-
-	public dispose(): void {
-		this.toUnbind = dispose(this.toUnbind);
-	}
 }
diff --git a/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts b/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
index e2d09a49e58..29b277207b2 100644
--- a/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
+++ b/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
@@ -18,7 +18,7 @@ import { FileOperationError, FileOperationResult } from 'vs/platform/files/commo
 import { ITextFileService, AutoSaveMode, ModelState, TextFileModelChangeEvent } from 'vs/workbench/services/textfile/common/textfiles';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IDisposable, dispose, IReference } from 'vs/base/common/lifecycle';
+import { IReference } from 'vs/base/common/lifecycle';
 import { telemetryURIDescriptor } from 'vs/platform/telemetry/common/telemetryUtils';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
@@ -35,7 +35,6 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 	private forceOpenAsText: boolean;
 	private textModelReference: TPromise<IReference<ITextEditorModel>>;
 	private name: string;
-	private toUnbind: IDisposable[];
 
 	/**
 	 * An editor input who's contents are retrieved from file services.
@@ -52,8 +51,6 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 	) {
 		super();
 
-		this.toUnbind = [];
-
 		this.setPreferredEncoding(preferredEncoding);
 
 		this.registerListeners();
@@ -62,11 +59,11 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 	private registerListeners(): void {
 
 		// Model changes
-		this.toUnbind.push(this.textFileService.models.onModelDirty(e => this.onDirtyStateChange(e)));
-		this.toUnbind.push(this.textFileService.models.onModelSaveError(e => this.onDirtyStateChange(e)));
-		this.toUnbind.push(this.textFileService.models.onModelSaved(e => this.onDirtyStateChange(e)));
-		this.toUnbind.push(this.textFileService.models.onModelReverted(e => this.onDirtyStateChange(e)));
-		this.toUnbind.push(this.textFileService.models.onModelOrphanedChanged(e => this.onModelOrphanedChanged(e)));
+		this._register(this.textFileService.models.onModelDirty(e => this.onDirtyStateChange(e)));
+		this._register(this.textFileService.models.onModelSaveError(e => this.onDirtyStateChange(e)));
+		this._register(this.textFileService.models.onModelSaved(e => this.onDirtyStateChange(e)));
+		this._register(this.textFileService.models.onModelReverted(e => this.onDirtyStateChange(e)));
+		this._register(this.textFileService.models.onModelOrphanedChanged(e => this.onModelOrphanedChanged(e)));
 	}
 
 	private onDirtyStateChange(e: TextFileModelChangeEvent): void {
@@ -81,11 +78,11 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		}
 	}
 
-	public getResource(): URI {
+	getResource(): URI {
 		return this.resource;
 	}
 
-	public setPreferredEncoding(encoding: string): void {
+	setPreferredEncoding(encoding: string): void {
 		this.preferredEncoding = encoding;
 
 		if (encoding) {
@@ -93,7 +90,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		}
 	}
 
-	public getEncoding(): string {
+	getEncoding(): string {
 		const textModel = this.textFileService.models.get(this.resource);
 		if (textModel) {
 			return textModel.getEncoding();
@@ -102,11 +99,11 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		return this.preferredEncoding;
 	}
 
-	public getPreferredEncoding(): string {
+	getPreferredEncoding(): string {
 		return this.preferredEncoding;
 	}
 
-	public setEncoding(encoding: string, mode: EncodingMode): void {
+	setEncoding(encoding: string, mode: EncodingMode): void {
 		this.preferredEncoding = encoding;
 
 		const textModel = this.textFileService.models.get(this.resource);
@@ -115,21 +112,21 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		}
 	}
 
-	public setForceOpenAsText(): void {
+	setForceOpenAsText(): void {
 		this.forceOpenAsText = true;
 		this.forceOpenAsBinary = false;
 	}
 
-	public setForceOpenAsBinary(): void {
+	setForceOpenAsBinary(): void {
 		this.forceOpenAsBinary = true;
 		this.forceOpenAsText = false;
 	}
 
-	public getTypeId(): string {
+	getTypeId(): string {
 		return FILE_EDITOR_INPUT_ID;
 	}
 
-	public getName(): string {
+	getName(): string {
 		if (!this.name) {
 			this.name = resources.basenameOrAuthority(this.resource);
 		}
@@ -153,7 +150,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		return labels.getPathLabel(resources.dirname(this.resource), this.environmentService, rootProvider);
 	}
 
-	public getDescription(verbosity: Verbosity = Verbosity.MEDIUM): string {
+	getDescription(verbosity: Verbosity = Verbosity.MEDIUM): string {
 		let description: string;
 		switch (verbosity) {
 			case Verbosity.SHORT:
@@ -187,7 +184,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		return labels.getPathLabel(this.resource, this.environmentService, rootProvider);
 	}
 
-	public getTitle(verbosity: Verbosity): string {
+	getTitle(verbosity: Verbosity): string {
 		let title: string;
 		switch (verbosity) {
 			case Verbosity.SHORT:
@@ -213,7 +210,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		return label;
 	}
 
-	public isDirty(): boolean {
+	isDirty(): boolean {
 		const model = this.textFileService.models.get(this.resource);
 		if (!model) {
 			return false;
@@ -230,23 +227,23 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		return model.isDirty();
 	}
 
-	public confirmSave(): TPromise<ConfirmResult> {
+	confirmSave(): TPromise<ConfirmResult> {
 		return this.textFileService.confirmSave([this.resource]);
 	}
 
-	public save(): TPromise<boolean> {
+	save(): TPromise<boolean> {
 		return this.textFileService.save(this.resource);
 	}
 
-	public revert(options?: IRevertOptions): TPromise<boolean> {
+	revert(options?: IRevertOptions): TPromise<boolean> {
 		return this.textFileService.revert(this.resource, options);
 	}
 
-	public getPreferredEditorId(candidates: string[]): string {
+	getPreferredEditorId(candidates: string[]): string {
 		return this.forceOpenAsBinary ? BINARY_FILE_EDITOR_ID : TEXT_FILE_EDITOR_ID;
 	}
 
-	public resolve(refresh?: boolean): TPromise<TextFileEditorModel | BinaryEditorModel> {
+	resolve(): TPromise<TextFileEditorModel | BinaryEditorModel> {
 
 		// Resolve as binary
 		if (this.forceOpenAsBinary) {
@@ -254,13 +251,17 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		}
 
 		// Resolve as text
-		return this.doResolveAsText(refresh);
+		return this.doResolveAsText();
 	}
 
-	private doResolveAsText(reload?: boolean): TPromise<TextFileEditorModel | BinaryEditorModel> {
+	private doResolveAsText(): TPromise<TextFileEditorModel | BinaryEditorModel> {
 
 		// Resolve as text
-		return this.textFileService.models.loadOrCreate(this.resource, { encoding: this.preferredEncoding, reload, allowBinary: this.forceOpenAsText }).then(model => {
+		return this.textFileService.models.loadOrCreate(this.resource, {
+			encoding: this.preferredEncoding,
+			reload: { async: true }, // trigger a reload of the model if it exists already but do not wait to show the model
+			allowBinary: this.forceOpenAsText
+		}).then(model => {
 
 			// This is a bit ugly, because we first resolve the model and then resolve a model reference. the reason being that binary
 			// or very large files do not resolve to a text file model but should be opened as binary files without text. First calling into
@@ -287,11 +288,11 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		return this.instantiationService.createInstance(BinaryEditorModel, this.resource, this.getName()).load().then(m => m as BinaryEditorModel);
 	}
 
-	public isResolved(): boolean {
+	isResolved(): boolean {
 		return !!this.textFileService.models.get(this.resource);
 	}
 
-	public getTelemetryDescriptor(): object {
+	getTelemetryDescriptor(): object {
 		const descriptor = super.getTelemetryDescriptor();
 		descriptor['resource'] = telemetryURIDescriptor(this.getResource(), path => this.hashService.createSHA1(path));
 
@@ -303,7 +304,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		return descriptor;
 	}
 
-	public dispose(): void {
+	dispose(): void {
 
 		// Model reference
 		if (this.textModelReference) {
@@ -311,13 +312,10 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 			this.textModelReference = null;
 		}
 
-		// Listeners
-		this.toUnbind = dispose(this.toUnbind);
-
 		super.dispose();
 	}
 
-	public matches(otherInput: any): boolean {
+	matches(otherInput: any): boolean {
 		if (super.matches(otherInput) === true) {
 			return true;
 		}
diff --git a/src/vs/workbench/parts/files/common/explorerModel.ts b/src/vs/workbench/parts/files/common/explorerModel.ts
index 4b72173d75a..bdb52e71e26 100644
--- a/src/vs/workbench/parts/files/common/explorerModel.ts
+++ b/src/vs/workbench/parts/files/common/explorerModel.ts
@@ -74,11 +74,12 @@ export class ExplorerItem {
 	private _isSymbolicLink: boolean;
 	private _isReadonly: boolean;
 	private children: Map<string, ExplorerItem>;
+	private _isError: boolean;
 	public parent: ExplorerItem;
 
 	public isDirectoryResolved: boolean;
 
-	constructor(resource: URI, public root: ExplorerItem, isSymbolicLink?: boolean, isReadonly?: boolean, isDirectory?: boolean, name: string = resources.basenameOrAuthority(resource), mtime?: number, etag?: string) {
+	constructor(resource: URI, public root: ExplorerItem, isSymbolicLink?: boolean, isReadonly?: boolean, isDirectory?: boolean, name: string = resources.basenameOrAuthority(resource), mtime?: number, etag?: string, isError?: boolean) {
 		this.resource = resource;
 		this._name = name;
 		this.isDirectory = !!isDirectory;
@@ -86,6 +87,7 @@ export class ExplorerItem {
 		this._isReadonly = !!isReadonly;
 		this.etag = etag;
 		this.mtime = mtime;
+		this._isError = !!isError;
 
 		if (!this.root) {
 			this.root = this;
@@ -106,6 +108,10 @@ export class ExplorerItem {
 		return this._isReadonly;
 	}
 
+	public get isError(): boolean {
+		return this._isError;
+	}
+
 	public set isDirectory(value: boolean) {
 		if (value !== this._isDirectory) {
 			this._isDirectory = value;
@@ -118,10 +124,6 @@ export class ExplorerItem {
 
 	}
 
-	public get nonexistentRoot(): boolean {
-		return this.isRoot && !this.isDirectoryResolved && this.isDirectory;
-	}
-
 	public get name(): string {
 		return this._name;
 	}
@@ -145,8 +147,8 @@ export class ExplorerItem {
 		return this === this.root;
 	}
 
-	public static create(raw: IFileStat, root: ExplorerItem, resolveTo?: URI[]): ExplorerItem {
-		const stat = new ExplorerItem(raw.resource, root, raw.isSymbolicLink, raw.isReadonly, raw.isDirectory, raw.name, raw.mtime, raw.etag);
+	public static create(raw: IFileStat, root: ExplorerItem, resolveTo?: URI[], isError = false): ExplorerItem {
+		const stat = new ExplorerItem(raw.resource, root, raw.isSymbolicLink, raw.isReadonly, raw.isDirectory, raw.name, raw.mtime, raw.etag, isError);
 
 		// Recursively add children if present
 		if (stat.isDirectory) {
@@ -195,6 +197,7 @@ export class ExplorerItem {
 		local.isDirectoryResolved = disk.isDirectoryResolved;
 		local._isSymbolicLink = disk.isSymbolicLink;
 		local._isReadonly = disk.isReadonly;
+		local._isError = disk.isError;
 
 		// Merge Children if resolved
 		if (mergingDirectories && disk.isDirectoryResolved) {
diff --git a/src/vs/workbench/parts/files/common/files.ts b/src/vs/workbench/parts/files/common/files.ts
index d1b128c950b..160584dd829 100644
--- a/src/vs/workbench/parts/files/common/files.ts
+++ b/src/vs/workbench/parts/files/common/files.ts
@@ -157,7 +157,7 @@ export class FileOnDiskContentProvider implements ITextModelContentProvider {
 	) {
 	}
 
-	public provideTextContent(resource: URI): TPromise<ITextModel> {
+	provideTextContent(resource: URI): TPromise<ITextModel> {
 		const fileOnDiskResource = URI.file(resource.fsPath);
 
 		// Make sure our file from disk is resolved up to date
@@ -205,7 +205,7 @@ export class FileOnDiskContentProvider implements ITextModelContentProvider {
 		});
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.fileWatcher = dispose(this.fileWatcher);
 	}
 }
diff --git a/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts b/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts
index 57326f16477..257e5d35082 100644
--- a/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts
+++ b/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts
@@ -173,10 +173,10 @@ export class ExplorerViewlet extends ViewContainerViewlet implements IExplorerVi
 		this._register(this.contextService.onDidChangeWorkspaceName(e => this.updateTitleArea()));
 	}
 
-	async create(parent: HTMLElement): TPromise<void> {
-		await super.create(parent);
-
-		DOM.addClass(parent, 'explorer-viewlet');
+	create(parent: HTMLElement): TPromise<void> {
+		return super.create(parent).then(() => {
+			DOM.addClass(parent, 'explorer-viewlet');
+		});
 	}
 
 	protected createView(viewDescriptor: IViewDescriptor, options: IViewletViewOptions): ViewletPanel {
diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts
index 7b3013d86f2..9f88aa03a21 100644
--- a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts
+++ b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts
@@ -6,12 +6,12 @@
 
 import * as nls from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { ToggleAutoSaveAction, GlobalNewUntitledFileAction, ShowOpenedFileInNewWindow, CopyPathAction, FocusOpenEditorsView, FocusFilesExplorer, GlobalCompareResourcesAction, SaveAllAction, ShowActiveFileInExplorer, CollapseExplorerView, RefreshExplorerView, CompareWithClipboardAction, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, renameHandler, moveFileToTrashHandler, copyFileHandler, pasteFileHandler, deleteFileHandler } from 'vs/workbench/parts/files/electron-browser/fileActions';
+import { ToggleAutoSaveAction, GlobalNewUntitledFileAction, ShowOpenedFileInNewWindow, FocusOpenEditorsView, FocusFilesExplorer, GlobalCompareResourcesAction, SaveAllAction, ShowActiveFileInExplorer, CollapseExplorerView, RefreshExplorerView, CompareWithClipboardAction, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, renameHandler, moveFileToTrashHandler, copyFileHandler, pasteFileHandler, deleteFileHandler } from 'vs/workbench/parts/files/electron-browser/fileActions';
 import { revertLocalChangesCommand, acceptLocalChangesCommand, CONFLICT_RESOLUTION_CONTEXT } from 'vs/workbench/parts/files/electron-browser/saveErrorHandler';
 import { SyncActionDescriptor, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
-import { openWindowCommand, REVEAL_IN_OS_COMMAND_ID, COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, OpenEditorsGroupContext, COMPARE_WITH_SAVED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, REVEAL_IN_OS_LABEL, DirtyEditorContext, COMPARE_SELECTED_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL, SAVE_FILES_COMMAND_ID } from 'vs/workbench/parts/files/electron-browser/fileCommands';
+import { openWindowCommand, REVEAL_IN_OS_COMMAND_ID, COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, OpenEditorsGroupContext, COMPARE_WITH_SAVED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, REVEAL_IN_OS_LABEL, DirtyEditorContext, COMPARE_SELECTED_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL, SAVE_FILES_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID } from 'vs/workbench/parts/files/electron-browser/fileCommands';
 import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
@@ -102,18 +102,29 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	handler: pasteFileHandler
 });
 
+const copyPathCommand = {
+	id: COPY_PATH_COMMAND_ID,
+	title: nls.localize('copyPath', "Copy Path")
+};
+
+const copyRelativePathCommand = {
+	id: COPY_RELATIVE_PATH_COMMAND_ID,
+	title: nls.localize('copyRelativePath', "Copy Relative Path")
+};
+
 // Editor Title Context Menu
 appendEditorTitleContextMenuItem(REVEAL_IN_OS_COMMAND_ID, REVEAL_IN_OS_LABEL, ResourceContextKey.Scheme.isEqualTo(Schemas.file));
-appendEditorTitleContextMenuItem(COPY_PATH_COMMAND_ID, CopyPathAction.LABEL, ResourceContextKey.IsFile);
+appendEditorTitleContextMenuItem(COPY_PATH_COMMAND_ID, copyPathCommand.title, ResourceContextKey.IsFile, copyRelativePathCommand);
 appendEditorTitleContextMenuItem(REVEAL_IN_EXPLORER_COMMAND_ID, nls.localize('revealInSideBar', "Reveal in Side Bar"), ResourceContextKey.IsFile);
 
-function appendEditorTitleContextMenuItem(id: string, title: string, when: ContextKeyExpr): void {
+function appendEditorTitleContextMenuItem(id: string, title: string, when: ContextKeyExpr, alt?: { id: string, title: string }): void {
 
 	// Menu
 	MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, {
 		command: { id, title },
 		when,
-		group: '2_files'
+		group: '2_files',
+		alt
 	});
 }
 
@@ -153,6 +164,7 @@ function appendToCommandPalette(id: string, title: string, category: string): vo
 	});
 }
 appendToCommandPalette(COPY_PATH_COMMAND_ID, nls.localize('copyPathOfActive', "Copy Path of Active File"), category);
+appendToCommandPalette(COPY_RELATIVE_PATH_COMMAND_ID, nls.localize('copyRelativePathOfActive', "Copy Relative Path of Active File"), category);
 appendToCommandPalette(SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, category);
 appendToCommandPalette(SAVE_ALL_IN_GROUP_COMMAND_ID, nls.localize('saveAllInGroup', "Save All in Group"), category);
 appendToCommandPalette(SAVE_FILES_COMMAND_ID, nls.localize('saveFiles', "Save All Files"), category);
@@ -164,7 +176,6 @@ appendToCommandPalette(CLOSE_EDITOR_COMMAND_ID, nls.localize('closeEditor', "Clo
 appendToCommandPalette(NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, category);
 appendToCommandPalette(NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, category);
 
-
 // Menu registration - open editors
 
 const openToSideCommand = {
@@ -189,14 +200,11 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
 	when: ResourceContextKey.Scheme.isEqualTo(Schemas.file)
 });
 
-const copyPathCommand = {
-	id: COPY_PATH_COMMAND_ID,
-	title: nls.localize('copyPath', "Copy Path")
-};
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
 	group: 'navigation',
 	order: 40,
 	command: copyPathCommand,
+	alt: copyRelativePathCommand,
 	when: ResourceContextKey.IsFile
 });
 
@@ -406,6 +414,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	group: '5_cutcopypaste',
 	order: 30,
 	command: copyPathCommand,
+	alt: copyRelativePathCommand,
 	when: ResourceContextKey.IsFile
 });
 
diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.ts
index 76dddbd3363..75e5b8c2d8c 100644
--- a/src/vs/workbench/parts/files/electron-browser/fileActions.ts
+++ b/src/vs/workbench/parts/files/electron-browser/fileActions.ts
@@ -37,7 +37,7 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IInstantiationService, ServicesAccessor, IConstructorSignature2 } from 'vs/platform/instantiation/common/instantiation';
 import { ITextModel } from 'vs/editor/common/model';
 import { IWindowService } from 'vs/platform/windows/common/windows';
-import { COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, SAVE_ALL_COMMAND_ID, SAVE_ALL_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID } from 'vs/workbench/parts/files/electron-browser/fileCommands';
+import { REVEAL_IN_EXPLORER_COMMAND_ID, SAVE_ALL_COMMAND_ID, SAVE_ALL_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID } from 'vs/workbench/parts/files/electron-browser/fileCommands';
 import { ITextModelService, ITextModelContentProvider } from 'vs/editor/common/services/resolverService';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
@@ -661,7 +661,7 @@ class BaseDeleteFileAction extends BaseFileAction {
 					}
 
 					// Call function
-					const servicePromise = TPromise.join(distinctElements.map(e => this.fileService.del(e.resource, this.useTrash))).then(() => {
+					const servicePromise = TPromise.join(distinctElements.map(e => this.fileService.del(e.resource, { useTrash: this.useTrash, recursive: true }))).then(() => {
 						if (distinctElements[0].parent) {
 							this.tree.setFocus(distinctElements[0].parent); // move focus to parent
 						}
@@ -1453,24 +1453,6 @@ export class ShowOpenedFileInNewWindow extends Action {
 	}
 }
 
-export class CopyPathAction extends Action {
-
-	public static readonly LABEL = nls.localize('copyPath', "Copy Path");
-
-	constructor(
-		private resource: URI,
-		@ICommandService private commandService: ICommandService
-	) {
-		super('copyFilePath', CopyPathAction.LABEL);
-
-		this.order = 140;
-	}
-
-	public run(): TPromise<any> {
-		return this.commandService.executeCommand(COPY_PATH_COMMAND_ID, this.resource);
-	}
-}
-
 export function validateFileName(parent: ExplorerItem, name: string): string {
 
 	// Produce a well formed file name
diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts
index e94a76efe38..013fab15004 100644
--- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts
+++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts
@@ -31,7 +31,7 @@ import { IEditorViewState } from 'vs/editor/common/editorCommon';
 import { getCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyMod, KeyCode, KeyChord } from 'vs/base/common/keyCodes';
-import { isWindows, isMacintosh } from 'vs/base/common/platform';
+import { isWindows, isMacintosh, isLinux } from 'vs/base/common/platform';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { sequence } from 'vs/base/common/async';
 import { getResourceForCommand, getMultiSelectedResources } from 'vs/workbench/parts/files/browser/files';
@@ -42,6 +42,8 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
+import { isEqual, basenameOrAuthority } from 'vs/base/common/resources';
+import { ltrim } from 'vs/base/common/strings';
 
 // Commands
 
@@ -56,6 +58,7 @@ export const COMPARE_SELECTED_COMMAND_ID = 'compareSelected';
 export const COMPARE_RESOURCE_COMMAND_ID = 'compareFiles';
 export const COMPARE_WITH_SAVED_COMMAND_ID = 'workbench.files.action.compareWithSaved';
 export const COPY_PATH_COMMAND_ID = 'copyFilePath';
+export const COPY_RELATIVE_PATH_COMMAND_ID = 'copyRelativeFilePath';
 
 export const SAVE_FILE_AS_COMMAND_ID = 'workbench.action.files.saveAs';
 export const SAVE_FILE_AS_LABEL = nls.localize('saveAs', "Save As...");
@@ -82,8 +85,15 @@ export const openWindowCommand = (accessor: ServicesAccessor, paths: string[], f
 	windowService.openWindow(paths, { forceNewWindow });
 };
 
-function save(resource: URI, isSaveAs: boolean, editorService: IEditorService, fileService: IFileService, untitledEditorService: IUntitledEditorService,
-	textFileService: ITextFileService, editorGroupService: IEditorGroupsService): TPromise<any> {
+function save(
+	resource: URI,
+	isSaveAs: boolean,
+	editorService: IEditorService,
+	fileService: IFileService,
+	untitledEditorService: IUntitledEditorService,
+	textFileService: ITextFileService,
+	editorGroupService: IEditorGroupsService
+): TPromise<any> {
 
 	if (resource && (fileService.canHandleResource(resource) || resource.scheme === Schemas.untitled)) {
 
@@ -111,7 +121,7 @@ function save(resource: URI, isSaveAs: boolean, editorService: IEditorService, f
 			if (!isSaveAs && resource.scheme === Schemas.untitled && untitledEditorService.hasAssociatedFilePath(resource)) {
 				savePromise = textFileService.save(resource).then((result) => {
 					if (result) {
-						return URI.file(resource.fsPath);
+						return resource.with({ scheme: Schemas.file });
 					}
 
 					return null;
@@ -352,6 +362,7 @@ function revealResourcesInOS(resources: URI[], windowsService: IWindowsService,
 		notificationService.info(nls.localize('openFileToReveal', "Open a file first to reveal"));
 	}
 }
+
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: REVEAL_IN_OS_COMMAND_ID,
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
@@ -365,6 +376,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		revealResourcesInOS(resources, accessor.get(IWindowsService), accessor.get(INotificationService), accessor.get(IWorkspaceContextService));
 	}
 });
+
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
 	when: undefined,
@@ -378,15 +390,34 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
-function resourcesToClipboard(resources: URI[], clipboardService: IClipboardService, notificationService: INotificationService): void {
+function resourcesToClipboard(resources: URI[], clipboardService: IClipboardService, notificationService: INotificationService, contextService?: IWorkspaceContextService): void {
 	if (resources.length) {
 		const lineDelimiter = isWindows ? '\r\n' : '\n';
-		const text = resources.map(r => r.scheme === Schemas.file ? paths.normalize(labels.normalizeDriveLetter(r.fsPath), true) : r.toString()).join(lineDelimiter);
+
+		const text = resources.map(resource => {
+			if (contextService) {
+				const workspaceFolder = contextService.getWorkspaceFolder(resource);
+				if (workspaceFolder) {
+					if (isEqual(workspaceFolder.uri, resource, !isLinux)) {
+						return basenameOrAuthority(workspaceFolder.uri);
+					}
+
+					return paths.normalize(ltrim(resource.path.substr(workspaceFolder.uri.path.length), paths.sep), true);
+				}
+			}
+
+			if (resource.scheme === Schemas.file) {
+				return paths.normalize(labels.normalizeDriveLetter(resource.fsPath), true);
+			}
+
+			return resource.toString();
+		}).join(lineDelimiter);
 		clipboardService.writeText(text);
 	} else {
 		notificationService.info(nls.localize('openFileToCopy', "Open a file first to copy its path"));
 	}
 }
+
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
 	when: EditorContextKeys.focus.toNegated(),
@@ -401,6 +432,17 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	when: EditorContextKeys.focus.toNegated(),
+	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_C,
+	id: COPY_RELATIVE_PATH_COMMAND_ID,
+	handler: (accessor, resource: URI | object) => {
+		const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IEditorService));
+		resourcesToClipboard(resources, accessor.get(IClipboardService), accessor.get(INotificationService), accessor.get(IWorkspaceContextService));
+	}
+});
+
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
 	when: undefined,
diff --git a/src/vs/workbench/parts/files/electron-browser/files.contribution.ts b/src/vs/workbench/parts/files/electron-browser/files.contribution.ts
index 71c741536a2..dfe8322c5ae 100644
--- a/src/vs/workbench/parts/files/electron-browser/files.contribution.ts
+++ b/src/vs/workbench/parts/files/electron-browser/files.contribution.ts
@@ -137,7 +137,7 @@ class FileEditorInputFactory implements IEditorInputFactory {
 			const resource = !!fileInput.resourceJSON ? URI.revive(fileInput.resourceJSON) : URI.parse(fileInput.resource);
 			const encoding = fileInput.encoding;
 
-			return accessor.get(IEditorService).createInput({ resource, encoding }) as FileEditorInput;
+			return accessor.get(IEditorService).createInput({ resource, encoding }, { forceFileInput: true }) as FileEditorInput;
 		});
 	}
 }
diff --git a/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts b/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
index ca120f667fc..abba820aaa5 100644
--- a/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
+++ b/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
@@ -14,7 +14,7 @@ import URI from 'vs/base/common/uri';
 import { FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
 import { ITextFileService, ISaveErrorHandler, ITextFileEditorModel } from 'vs/workbench/services/textfile/common/textfiles';
 import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
@@ -43,9 +43,8 @@ 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 {
+export class SaveErrorHandler extends Disposable implements ISaveErrorHandler, IWorkbenchContribution {
 	private messages: ResourceMap<INotificationHandle>;
-	private toUnbind: IDisposable[];
 	private conflictResolutionContext: IContextKey<boolean>;
 	private activeConflictResolutionResource: URI;
 
@@ -58,15 +57,13 @@ export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContributi
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IStorageService private storageService: IStorageService
 	) {
-		this.toUnbind = [];
+		super();
+
 		this.messages = new ResourceMap<INotificationHandle>();
 		this.conflictResolutionContext = new RawContextKey<boolean>(CONFLICT_RESOLUTION_CONTEXT, false).bindTo(contextKeyService);
 
-		const provider = instantiationService.createInstance(FileOnDiskContentProvider);
-		this.toUnbind.push(provider);
-
-		const registrationDisposal = textModelService.registerTextModelContentProvider(CONFLICT_RESOLUTION_SCHEME, provider);
-		this.toUnbind.push(registrationDisposal);
+		const provider = this._register(instantiationService.createInstance(FileOnDiskContentProvider));
+		this._register(textModelService.registerTextModelContentProvider(CONFLICT_RESOLUTION_SCHEME, provider));
 
 		// Hook into model
 		TextFileEditorModel.setSaveErrorHandler(this);
@@ -75,9 +72,9 @@ export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContributi
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.textFileService.models.onModelSaved(e => this.onFileSavedOrReverted(e.resource)));
-		this.toUnbind.push(this.textFileService.models.onModelReverted(e => this.onFileSavedOrReverted(e.resource)));
-		this.toUnbind.push(this.editorService.onDidActiveEditorChange(() => this.onActiveEditorChanged()));
+		this._register(this.textFileService.models.onModelSaved(e => this.onFileSavedOrReverted(e.resource)));
+		this._register(this.textFileService.models.onModelReverted(e => this.onFileSavedOrReverted(e.resource)));
+		this._register(this.editorService.onDidActiveEditorChange(() => this.onActiveEditorChanged()));
 	}
 
 	private onActiveEditorChanged(): void {
@@ -105,7 +102,7 @@ export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContributi
 		}
 	}
 
-	public onSaveError(error: any, model: ITextFileEditorModel): void {
+	onSaveError(error: any, model: ITextFileEditorModel): void {
 		const fileOperationError = error as FileOperationError;
 		const resource = model.getResource();
 
@@ -181,8 +178,8 @@ export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContributi
 		this.messages.set(model.getResource(), handle);
 	}
 
-	public dispose(): void {
-		this.toUnbind = dispose(this.toUnbind);
+	dispose(): void {
+		super.dispose();
 
 		this.messages.clear();
 	}
@@ -203,7 +200,7 @@ class ResolveConflictLearnMoreAction extends Action {
 		super('workbench.files.action.resolveConflictLearnMore', nls.localize('learnMore', "Learn More"));
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		return this.openerService.open(URI.parse('https://go.microsoft.com/fwlink/?linkid=868264'));
 	}
 }
@@ -216,7 +213,7 @@ class DoNotShowResolveConflictLearnMoreAction extends Action {
 		super('workbench.files.action.resolveConflictLearnMoreDoNotShowAgain', nls.localize('dontShowAgain', "Don't Show Again"));
 	}
 
-	public run(notification: IDisposable): TPromise<any> {
+	run(notification: IDisposable): TPromise<any> {
 		this.storageService.store(LEARN_MORE_DIRTY_WRITE_IGNORE_KEY, true);
 
 		// Hide notification
@@ -239,7 +236,7 @@ class ResolveSaveConflictAction extends Action {
 		super('workbench.files.action.resolveConflict', nls.localize('compareChanges', "Compare"));
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		if (!this.model.isDisposed()) {
 			const resource = this.model.getResource();
 			const name = paths.basename(resource.fsPath);
@@ -281,7 +278,7 @@ class SaveElevatedAction extends Action {
 		super('workbench.files.action.saveElevated', triedToMakeWriteable ? nls.localize('overwriteElevated', "Overwrite as Admin...") : nls.localize('saveElevated', "Retry as Admin..."));
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		if (!this.model.isDisposed()) {
 			this.model.save({
 				writeElevated: true,
@@ -301,7 +298,7 @@ class OverwriteReadonlyAction extends Action {
 		super('workbench.files.action.overwrite', nls.localize('overwrite', "Overwrite"));
 	}
 
-	public run(): TPromise<any> {
+	run(): TPromise<any> {
 		if (!this.model.isDisposed()) {
 			this.model.save({ overwriteReadonly: true }).done(null, errors.onUnexpectedError);
 		}
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 dcbb387a155..9740c47831b 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.ts
@@ -12,27 +12,35 @@ import { Model } from 'vs/workbench/parts/files/common/explorerModel';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IDecorationsProvider, IDecorationData } from 'vs/workbench/services/decorations/browser/decorations';
 import { listInvalidItemForeground } from 'vs/platform/theme/common/colorRegistry';
+import { IDisposable } from 'vscode-xterm';
+import { dispose } from 'vs/base/common/lifecycle';
 
 export class ExplorerDecorationsProvider implements IDecorationsProvider {
 	readonly label: string = localize('label', "Explorer");
 	private _onDidChange = new Emitter<URI[]>();
+	private toDispose: IDisposable[];
 
 	constructor(
 		private model: Model,
 		@IWorkspaceContextService contextService: IWorkspaceContextService
 	) {
-		contextService.onDidChangeWorkspaceFolders(e => {
+		this.toDispose = [];
+		this.toDispose.push(contextService.onDidChangeWorkspaceFolders(e => {
 			this._onDidChange.fire(e.changed.concat(e.added).map(wf => wf.uri));
-		});
+		}));
 	}
 
 	get onDidChange(): Event<URI[]> {
 		return this._onDidChange.event;
 	}
 
+	changed(uris: URI[]): void {
+		this._onDidChange.fire(uris);
+	}
+
 	provideDecorations(resource: URI): IDecorationData {
 		const fileStat = this.model.findClosest(resource);
-		if (fileStat && fileStat.nonexistentRoot) {
+		if (fileStat && fileStat.isRoot && fileStat.isError) {
 			return {
 				tooltip: localize('canNotResolve', "Can not resolve workspace folder"),
 				letter: '!',
@@ -48,4 +56,8 @@ export class ExplorerDecorationsProvider implements IDecorationsProvider {
 
 		return undefined;
 	}
+
+	dispose(): IDisposable[] {
+		return dispose(this.toDispose);
+	}
 }
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 b471abb1017..cadc88c5131 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
@@ -78,6 +78,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 	private settings: object;
 	private treeContainer: HTMLElement;
 	private dragHandler: DelayedDragHandler;
+	private decorationProvider: ExplorerDecorationsProvider;
 	private isDisposed: boolean;
 
 	constructor(
@@ -114,7 +115,9 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 			(event: IConfigurationChangeEvent) => event.affectsConfiguration(FILES_EXCLUDE_CONFIG)
 		);
 
-		decorationService.registerDecorationsProvider(new ExplorerDecorationsProvider(this.model, contextService));
+		this.decorationProvider = new ExplorerDecorationsProvider(this.model, contextService);
+		decorationService.registerDecorationsProvider(this.decorationProvider);
+		this.disposables.push(this.decorationProvider);
 	}
 
 	private getFileEventsExcludes(root?: URI): glob.IExpression {
@@ -782,7 +785,10 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 			});
 		}
 
-		const promise = this.resolveRoots(targetsToResolve, targetsToExpand);
+		const promise = this.resolveRoots(targetsToResolve, targetsToExpand).then(result => {
+			this.decorationProvider.changed(targetsToResolve.map(t => t.root.resource));
+			return result;
+		});
 		this.progressService.showWhile(promise, this.partService.isCreated() ? 800 : 3200 /* less ugly initial startup */);
 
 		return promise;
@@ -798,7 +804,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 			mtime: 0,
 			etag: undefined,
 			isDirectory: true
-		}, root);
+		}, root, undefined, true);
 
 		const setInputAndExpand = (input: ExplorerItem | Model, statsToExpand: ExplorerItem[]) => {
 			// Make sure to expand all folders that where expanded in the previous session
@@ -842,7 +848,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 		let delayer = new Delayer(100);
 		let delayerPromise: TPromise;
 		return TPromise.join(targetsToResolve.map((target, index) => this.fileService.resolveFile(target.resource, target.options)
-			.then(result => result.isDirectory ? ExplorerItem.create(result, target.root, target.options.resolveTo) : errorFileStat(target.resource, target.root), err => errorFileStat(target.resource, target.root))
+			.then(result => result.isDirectory ? ExplorerItem.create(result, target.root, target.options.resolveTo) : errorFileStat(target.resource, target.root), () => errorFileStat(target.resource, target.root))
 			.then(modelStat => {
 				// Subsequent refresh: Merge stat into our local model and refresh tree
 				if (index < this.model.roots.length) {
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 05e90164e5b..09615b2bae6 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
@@ -20,7 +20,7 @@ import { InputBox, MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
 import { isMacintosh, isLinux } from 'vs/base/common/platform';
 import * as glob from 'vs/base/common/glob';
 import { FileLabel, IFileLabelOptions } from 'vs/workbench/browser/labels';
-import { IDisposable, dispose, empty as EmptyDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import { IFilesConfiguration, SortOrder } from 'vs/workbench/parts/files/common/files';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { FileOperationError, FileOperationResult, IFileService, FileKind } from 'vs/platform/files/common/files';
@@ -56,6 +56,7 @@ import { IDialogService, IConfirmationResult, IConfirmation, getConfirmMessage }
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 import { fillInContextMenuActions } from 'vs/platform/actions/browser/menuItemActionItem';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 
 export class FileDataSource implements IDataSource {
 	constructor(
@@ -232,7 +233,7 @@ export class FileRenderer implements IRenderer {
 	}
 
 	public renderTemplate(tree: ITree, templateId: string, container: HTMLElement): IFileTemplateData {
-		const elementDisposable = EmptyDisposable;
+		const elementDisposable = Disposable.None;
 		const label = this.instantiationService.createInstance(FileLabel, container, void 0);
 
 		return { elementDisposable, label, container };
@@ -263,7 +264,7 @@ export class FileRenderer implements IRenderer {
 		else {
 			templateData.label.element.style.display = 'none';
 			this.renderInputBox(templateData.container, tree, stat, editableData);
-			templateData.elementDisposable = EmptyDisposable;
+			templateData.elementDisposable = Disposable.None;
 		}
 	}
 
@@ -405,6 +406,7 @@ export class FileController extends WorkbenchTreeController implements IDisposab
 		@IMenuService private menuService: IMenuService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IClipboardService private clipboardService: IClipboardService,
+		@IKeybindingService private keybindingService: IKeybindingService,
 		@IConfigurationService configurationService: IConfigurationService
 	) {
 		super({ clickBehavior: ClickBehavior.ON_MOUSE_UP /* do not change to not break DND */ }, configurationService);
@@ -537,6 +539,9 @@ export class FileController extends WorkbenchTreeController implements IDisposab
 					tree.domFocus();
 				}
 			},
+			getKeyBinding: (action) => {
+				return this.keybindingService.lookupKeybinding(action.id);
+			},
 			getActionsContext: () => selection && selection.indexOf(stat) >= 0
 				? selection.map((fs: ExplorerItem) => fs.resource)
 				: stat instanceof ExplorerItem ? [stat.resource] : []
@@ -885,6 +890,9 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 		// All (target = file/folder)
 		else {
 			if (target.isDirectory) {
+				if (target.isReadonly) {
+					return DRAG_OVER_REJECT;
+				}
 				return fromDesktop || isCopy ? DRAG_OVER_ACCEPT_BUBBLE_DOWN_COPY(true) : DRAG_OVER_ACCEPT_BUBBLE_DOWN(true);
 			}
 
diff --git a/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts b/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts
index e56adb04c42..2355fbf8f1b 100644
--- a/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts
+++ b/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts
@@ -63,19 +63,19 @@ suite('Files - FileEditorInput', () => {
 		const inputToResolve: FileEditorInput = instantiationService.createInstance(FileEditorInput, toResource(this, '/foo/bar/file.js'), void 0);
 		const sameOtherInput: FileEditorInput = instantiationService.createInstance(FileEditorInput, toResource(this, '/foo/bar/file.js'), void 0);
 
-		return inputToResolve.resolve(true).then(resolved => {
+		return inputToResolve.resolve().then(resolved => {
 			assert.ok(inputToResolve.isResolved());
 
 			const resolvedModelA = resolved;
-			return inputToResolve.resolve(true).then(resolved => {
+			return inputToResolve.resolve().then(resolved => {
 				assert(resolvedModelA === resolved); // OK: Resolved Model cached globally per input
 
-				return sameOtherInput.resolve(true).then(otherResolved => {
+				return sameOtherInput.resolve().then(otherResolved => {
 					assert(otherResolved === resolvedModelA); // OK: Resolved Model cached globally per input
 
 					inputToResolve.dispose();
 
-					return inputToResolve.resolve(true).then(resolved => {
+					return inputToResolve.resolve().then(resolved => {
 						assert(resolvedModelA === resolved); // Model is still the same because we had 2 clients
 
 						inputToResolve.dispose();
@@ -83,17 +83,12 @@ suite('Files - FileEditorInput', () => {
 
 						resolvedModelA.dispose();
 
-						return inputToResolve.resolve(true).then(resolved => {
+						return inputToResolve.resolve().then(resolved => {
 							assert(resolvedModelA !== resolved); // Different instance, because input got disposed
 
 							let stat = (resolved as TextFileEditorModel).getStat();
-							return inputToResolve.resolve(true).then(resolved => {
+							return inputToResolve.resolve().then(resolved => {
 								assert(stat !== (resolved as TextFileEditorModel).getStat()); // Different stat, because resolve always goes to the server for refresh
-
-								stat = (resolved as TextFileEditorModel).getStat();
-								return inputToResolve.resolve(false).then(resolved => {
-									assert(stat === (resolved as TextFileEditorModel).getStat()); // Same stat, because not refreshed
-								});
 							});
 						});
 					});
@@ -122,7 +117,7 @@ suite('Files - FileEditorInput', () => {
 		input.setEncoding('utf16', EncodingMode.Encode);
 		assert.equal(input.getEncoding(), 'utf16');
 
-		return input.resolve(true).then((resolved: TextFileEditorModel) => {
+		return input.resolve().then((resolved: TextFileEditorModel) => {
 			assert.equal(input.getEncoding(), resolved.getEncoding());
 
 			resolved.dispose();
@@ -132,7 +127,7 @@ suite('Files - FileEditorInput', () => {
 	test('save', function () {
 		const input = instantiationService.createInstance(FileEditorInput, toResource(this, '/foo/bar/updatefile.js'), void 0);
 
-		return input.resolve(true).then((resolved: TextFileEditorModel) => {
+		return input.resolve().then((resolved: TextFileEditorModel) => {
 			resolved.textEditorModel.setValue('changed');
 			assert.ok(input.isDirty());
 
@@ -147,7 +142,7 @@ suite('Files - FileEditorInput', () => {
 	test('revert', function () {
 		const input = instantiationService.createInstance(FileEditorInput, toResource(this, '/foo/bar/updatefile.js'), void 0);
 
-		return input.resolve(true).then((resolved: TextFileEditorModel) => {
+		return input.resolve().then((resolved: TextFileEditorModel) => {
 			resolved.textEditorModel.setValue('changed');
 			assert.ok(input.isDirty());
 
@@ -164,7 +159,7 @@ suite('Files - FileEditorInput', () => {
 
 		accessor.textFileService.setResolveTextContentErrorOnce(new FileOperationError('error', FileOperationResult.FILE_IS_BINARY));
 
-		return input.resolve(true).then(resolved => {
+		return input.resolve().then(resolved => {
 			assert.ok(resolved);
 
 			resolved.dispose();
@@ -176,7 +171,7 @@ suite('Files - FileEditorInput', () => {
 
 		accessor.textFileService.setResolveTextContentErrorOnce(new FileOperationError('error', FileOperationResult.FILE_TOO_LARGE));
 
-		return input.resolve(true).then(resolved => {
+		return input.resolve().then(resolved => {
 			assert.ok(resolved);
 
 			resolved.dispose();
diff --git a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
index 122d5047ffd..1729ad9165f 100644
--- a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
+++ b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
@@ -8,7 +8,7 @@
 import { localize } from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ITextModel } from 'vs/editor/common/model';
-import { empty as EmptyDisposable, IDisposable, dispose, IReference } from 'vs/base/common/lifecycle';
+import { Disposable, IDisposable, dispose, IReference } from 'vs/base/common/lifecycle';
 import { EditorOptions, EditorInput, IEditorMemento } from 'vs/workbench/common/editor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
@@ -42,8 +42,8 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 
 	private _modelRef: IReference<ITextEditorModel>;
 	public get model(): ITextModel { return this._modelRef && this._modelRef.object.textEditorModel; }
-	private _modelChangeSubscription = EmptyDisposable;
-	private _themeChangeSubscription = EmptyDisposable;
+	private _modelChangeSubscription = Disposable.None;
+	private _themeChangeSubscription = Disposable.None;
 
 	private _content: HTMLElement;
 	private _scrollYPercentage: number = 0;
diff --git a/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts b/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
index e49400a3289..340f821e0f4 100644
--- a/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
+++ b/src/vs/workbench/parts/localizations/electron-browser/localizations.contribution.ts
@@ -141,7 +141,8 @@ export class LocalizationWorkbenchContribution extends Disposable implements IWo
 					return;
 				}
 
-				const ceintlExtensionSearch = this.galleryService.query({ names: [`MS-CEINTL.vscode-language-pack-${locale}`], pageSize: 1 });
+				const extensionIdPostfix = this.getPossibleChineseMapping(locale);
+				const ceintlExtensionSearch = this.galleryService.query({ names: [`MS-CEINTL.vscode-language-pack-${extensionIdPostfix}`], pageSize: 1 });
 				const tagSearch = this.galleryService.query({ text: `tag:lp-${locale}`, pageSize: 1 });
 
 				TPromise.join([ceintlExtensionSearch, tagSearch]).then(([ceintlResult, tagResult]) => {
@@ -150,7 +151,7 @@ export class LocalizationWorkbenchContribution extends Disposable implements IWo
 					}
 
 					const extensionToInstall = ceintlResult.total === 1 ? ceintlResult.firstPage[0] : tagResult.total === 1 ? tagResult.firstPage[0] : null;
-					const extensionToFetchTranslationsFrom = extensionToInstall || tagResult.total > 0 ? tagResult.firstPage[0] : null;
+					const extensionToFetchTranslationsFrom = extensionToInstall || (tagResult.total > 0 ? tagResult.firstPage[0] : null);
 
 					if (!extensionToFetchTranslationsFrom || !extensionToFetchTranslationsFrom.assets.manifest) {
 						return;
@@ -235,6 +236,11 @@ export class LocalizationWorkbenchContribution extends Disposable implements IWo
 
 	}
 
+	private getPossibleChineseMapping(locale: string): string {
+		locale = locale.toLowerCase();
+		return locale === 'zh-cn' ? 'zh-hans' : locale === 'zh-tw' ? 'zh-hant' : locale;
+	}
+
 	private getLanguagePackExtension(language: string): TPromise<IGalleryExtension> {
 		return this.localizationService.getLanguageIds(LanguageType.Core)
 			.then(coreLanguages => {
diff --git a/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.ts b/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.ts
index 71276cedb68..7d22c8fc3a6 100644
--- a/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.ts
+++ b/src/vs/workbench/parts/localizations/electron-browser/localizationsActions.ts
@@ -22,10 +22,10 @@ export class ConfigureLocaleAction extends Action {
 
 	private static DEFAULT_CONTENT: string = [
 		'{',
-		`\t// ${localize('displayLanguage', 'Defines VSCode\'s display language.')}`,
+		`\t// ${localize('displayLanguage', 'Defines VS Code\'s display language.')}`,
 		`\t// ${localize('doc', 'See {0} for a list of supported languages.', 'https://go.microsoft.com/fwlink/?LinkId=761051')}`,
 		`\t`,
-		`\t"locale":"${language}" // ${localize('restart', 'Changes will not take effect until VSCode has been restarted.')}`,
+		`\t"locale":"${language}" // ${localize('restart', 'Changes will not take effect until VS Code has been restarted.')}`,
 		'}'
 	].join('\n');
 
@@ -47,10 +47,7 @@ export class ConfigureLocaleAction extends Action {
 				return undefined;
 			}
 			return this.editorService.openEditor({
-				resource: stat.resource,
-				options: {
-					forceOpen: true
-				}
+				resource: stat.resource
 			});
 		}, (error) => {
 			throw new Error(localize('fail.createSettings', "Unable to create '{0}' ({1}).", getPathLabel(file, this.environmentService, this.contextService), error));
diff --git a/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts b/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
index 22654994ff3..a5976612345 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
@@ -72,8 +72,7 @@ export class MarkersPanel extends Panel {
 	public create(parent: HTMLElement): TPromise<void> {
 		super.create(parent);
 
-		this.rangeHighlightDecorations = this.instantiationService.createInstance(RangeHighlightDecorations);
-		this.toUnbind.push(this.rangeHighlightDecorations);
+		this.rangeHighlightDecorations = this._register(this.instantiationService.createInstance(RangeHighlightDecorations));
 
 		dom.addClass(parent, 'markers-panel');
 
@@ -230,11 +229,11 @@ export class MarkersPanel extends Panel {
 	}
 
 	private createListeners(): void {
-		this.toUnbind.push(this.markersWorkbenchService.onDidChange(resources => this.onDidChange(resources)));
-		this.toUnbind.push(this.editorService.onDidActiveEditorChange(this.onActiveEditorChanged, this));
-		this.toUnbind.push(this.tree.onDidChangeSelection(() => this.onSelected()));
-		this.toUnbind.push(this.filterInputActionItem.onDidChange(() => this.updateFilter()));
-		this.actions.forEach(a => this.toUnbind.push(a));
+		this._register(this.markersWorkbenchService.onDidChange(resources => this.onDidChange(resources)));
+		this._register(this.editorService.onDidActiveEditorChange(this.onActiveEditorChanged, this));
+		this._register(this.tree.onDidChangeSelection(() => this.onSelected()));
+		this._register(this.filterInputActionItem.onDidChange(() => this.updateFilter()));
+		this.actions.forEach(a => this._register(a));
 	}
 
 	private onDidChange(resources: URI[]) {
diff --git a/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts b/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts
index e40d795aedd..b6479f0a8ec 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts
@@ -203,10 +203,7 @@ export class MarkersFilterActionItem extends BaseActionItem {
 	}
 
 	private onDidInputChange() {
-		const filterText = this.filterInputBox.value;
-		if (filterText) {
-			this.filterInputBox.addToHistory(filterText);
-		}
+		this.filterInputBox.addToHistory();
 		this._onDidChange.fire();
 		this.reportFilteringUsed();
 	}
diff --git a/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts b/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts
index 55577952d80..5dee170ab08 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts
@@ -19,6 +19,8 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IDisposable } from 'vs/base/common/lifecycle';
+import { getPathLabel } from 'vs/base/common/labels';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
 interface IResourceMarkersTemplateData {
 	resourceLabel: ResourceLabel;
@@ -93,7 +95,8 @@ export class Renderer implements IRenderer {
 
 	constructor(
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@IThemeService private themeService: IThemeService
+		@IThemeService private themeService: IThemeService,
+		@IEnvironmentService private environmentService: IEnvironmentService
 	) {
 	}
 
@@ -197,7 +200,7 @@ export class Renderer implements IRenderer {
 		if (templateData.resourceLabel instanceof FileLabel) {
 			templateData.resourceLabel.setFile(element.uri, { matches: element.uriMatches });
 		} else {
-			templateData.resourceLabel.setLabel({ name: element.name, description: element.uri.toString(), resource: element.uri }, { matches: element.uriMatches });
+			templateData.resourceLabel.setLabel({ name: element.name, description: getPathLabel(element.uri, this.environmentService), resource: element.uri }, { matches: element.uriMatches });
 		}
 		(<IResourceMarkersTemplateData>templateData).count.setCount(element.filteredCount);
 	}
@@ -217,7 +220,7 @@ export class Renderer implements IRenderer {
 
 	private renderRelatedInfoElement(tree: ITree, element: RelatedInformation, templateData: IRelatedInformationTemplateData) {
 		templateData.resourceLabel.set(paths.basename(element.raw.resource.fsPath), element.uriMatches);
-		templateData.resourceLabel.element.title = element.raw.resource.toString();
+		templateData.resourceLabel.element.title = getPathLabel(element.raw.resource, this.environmentService);
 		templateData.lnCol.textContent = Messages.MARKERS_PANEL_AT_LINE_COL_NUMBER(element.raw.startLineNumber, element.raw.startColumn);
 		templateData.description.set(element.raw.message, element.messageMatches);
 		templateData.description.element.title = element.raw.message;
@@ -266,4 +269,3 @@ export class MarkersTreeAccessibilityProvider implements IAccessibilityProvider
 		return null;
 	}
 }
-
diff --git a/src/vs/workbench/parts/navigation/common/navigation.contribution.ts b/src/vs/workbench/parts/navigation/common/navigation.contribution.ts
new file mode 100644
index 00000000000..87699346f17
--- /dev/null
+++ b/src/vs/workbench/parts/navigation/common/navigation.contribution.ts
@@ -0,0 +1,13 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Registry } from 'vs/platform/registry/common/platform';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
+import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { HistoryNavigationKeybindingsChangedContribution } from 'vs/workbench/parts/navigation/common/removedKeybindingsContribution';
+
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(HistoryNavigationKeybindingsChangedContribution, LifecyclePhase.Eventually);
\ No newline at end of file
diff --git a/src/vs/workbench/electron-browser/removedKeybindingsContribution.ts b/src/vs/workbench/parts/navigation/common/removedKeybindingsContribution.ts
similarity index 98%
rename from src/vs/workbench/electron-browser/removedKeybindingsContribution.ts
rename to src/vs/workbench/parts/navigation/common/removedKeybindingsContribution.ts
index dddac57925f..625bd33cf6c 100644
--- a/src/vs/workbench/electron-browser/removedKeybindingsContribution.ts
+++ b/src/vs/workbench/parts/navigation/common/removedKeybindingsContribution.ts
@@ -12,6 +12,7 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
 import { localize } from 'vs/nls';
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 
+// TODO@Sandeep remove me after a while
 export class HistoryNavigationKeybindingsChangedContribution implements IWorkbenchContribution {
 
 	private previousCommands: string[] = [
diff --git a/src/vs/workbench/parts/outline/electron-browser/outline.contribution.ts b/src/vs/workbench/parts/outline/electron-browser/outline.contribution.ts
index b850b2b2b8f..f55c83c680d 100644
--- a/src/vs/workbench/parts/outline/electron-browser/outline.contribution.ts
+++ b/src/vs/workbench/parts/outline/electron-browser/outline.contribution.ts
@@ -42,6 +42,7 @@ MenuRegistry.addCommand({
 Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
 	'id': 'outline',
 	'order': 117,
+	'title': localize('outlineConfigurationTitle', "Outline"),
 	'type': 'object',
 	'properties': {
 		[OutlineConfigKeys.icons]: {
diff --git a/src/vs/workbench/parts/outline/electron-browser/outlinePanel.ts b/src/vs/workbench/parts/outline/electron-browser/outlinePanel.ts
index 9260046c508..3650e6cf8cb 100644
--- a/src/vs/workbench/parts/outline/electron-browser/outlinePanel.ts
+++ b/src/vs/workbench/parts/outline/electron-browser/outlinePanel.ts
@@ -13,8 +13,8 @@ import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
 import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
 import { Action, IAction, RadioGroup } from 'vs/base/common/actions';
 import { firstIndex } from 'vs/base/common/arrays';
-import { asDisposablePromise, setDisposableTimeout } from 'vs/base/common/async';
-import { onUnexpectedError } from 'vs/base/common/errors';
+import { asDisposablePromise, setDisposableTimeout, createCancelablePromise } from 'vs/base/common/async';
+import { onUnexpectedError, isPromiseCanceledError } from 'vs/base/common/errors';
 import { Emitter } from 'vs/base/common/event';
 import { defaultGenerator } from 'vs/base/common/idGenerator';
 import { KeyCode } from 'vs/base/common/keyCodes';
@@ -27,7 +27,6 @@ import { ITree } from 'vs/base/parts/tree/browser/tree';
 import 'vs/css!./outlinePanel';
 import { ICodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
 import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { CursorChangeReason } from 'vs/editor/common/controller/cursorEvents';
 import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
 import { IModelContentChangedEvent } from 'vs/editor/common/model/textModelEvents';
@@ -54,6 +53,8 @@ import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from 'vs/workbench/services/
 import { KeyboardMapperFactory } from 'vs/workbench/services/keybinding/electron-browser/keybindingService';
 import { OutlineConfigKeys, OutlineViewFiltered, OutlineViewFocused, OutlineViewId } from './outline';
 import { OutlineController, OutlineDataSource, OutlineItemComparator, OutlineItemCompareType, OutlineItemFilter, OutlineRenderer, OutlineTreeState } from '../../../../editor/contrib/documentSymbols/outlineTree';
+import { IResourceInput } from 'vs/platform/editor/common/editor';
+import { ITextModel } from 'vs/editor/common/model';
 
 class RequestState {
 
@@ -135,11 +136,15 @@ class RequestOracle {
 		let modeListener = codeEditor.onDidChangeModelLanguage(_ => {
 			this._callback(codeEditor, undefined);
 		});
+		let disposeListener = codeEditor.onDidDispose(() => {
+			this._callback(undefined, undefined);
+		});
 		this._sessionDisposable = {
 			dispose() {
 				contentListener.dispose();
 				clearTimeout(handle);
 				modeListener.dispose();
+				disposeListener.dispose();
 			}
 		};
 	}
@@ -335,6 +340,10 @@ export class OutlinePanel extends ViewletPanel {
 				if (this.upKeyBindingDispatcher.has(event.keyCode)) {
 					return false;
 				}
+				if (event.ctrlKey || event.metaKey) {
+					// ignore ctrl/cmd-combination but not shift/alt-combinatios
+					return false;
+				}
 				// crazy -> during keydown focus moves to the input box
 				// and because of that the keyup event is handled by the
 				// input field
@@ -436,7 +445,18 @@ export class OutlinePanel extends ViewletPanel {
 		this._message.innerText = escape(message);
 	}
 
-	private async _doUpdate(editor: ICodeEditor, event: IModelContentChangedEvent): TPromise<void> {
+	private static _createOutlineModel(model: ITextModel, disposables: IDisposable[]): Promise<OutlineModel> {
+		let promise = createCancelablePromise(token => OutlineModel.create(model, token));
+		disposables.push({ dispose() { promise.cancel(); } });
+		return promise.catch(err => {
+			if (!isPromiseCanceledError(err)) {
+				throw err;
+			}
+			return undefined;
+		});
+	}
+
+	private async _doUpdate(editor: ICodeEditor, event: IModelContentChangedEvent): Promise<void> {
 		dispose(this._editorDisposables);
 
 		this._editorDisposables = new Array();
@@ -460,7 +480,7 @@ export class OutlinePanel extends ViewletPanel {
 			);
 		}
 
-		let model = await asDisposablePromise(OutlineModel.create(textModel), undefined, this._editorDisposables).promise;
+		let model = await OutlinePanel._createOutlineModel(textModel, this._editorDisposables);
 		dispose(loadingMessage);
 		if (!model) {
 			return;
@@ -507,7 +527,7 @@ export class OutlinePanel extends ViewletPanel {
 			}
 			await this._tree.setInput(model);
 			let state = this._treeStates.get(model.textModel.uri.toString());
-			OutlineTreeState.restore(this._tree, state, this);
+			await OutlineTreeState.restore(this._tree, state, this);
 		}
 
 		this._input.enable();
@@ -539,7 +559,9 @@ export class OutlinePanel extends ViewletPanel {
 				beforePatternState = undefined;
 			}
 		};
-		onInputValueChanged(this._input.value);
+		if (this._input.value) {
+			onInputValueChanged(this._input.value);
+		}
 		this._editorDisposables.push(this._input.onDidChange(onInputValueChanged));
 
 		this._editorDisposables.push({
@@ -573,8 +595,16 @@ export class OutlinePanel extends ViewletPanel {
 		}));
 
 		// feature: reveal editor selection in outline
-		this._editorDisposables.push(editor.onDidChangeCursorSelection(e => e.reason === CursorChangeReason.Explicit && this._revealEditorSelection(model, e.selection)));
 		this._revealEditorSelection(model, editor.getSelection());
+		const versionIdThen = model.textModel.getVersionId();
+		this._editorDisposables.push(editor.onDidChangeCursorSelection(e => {
+			// first check if the document has changed and stop revealing the
+			// cursor position iff it has -> we will update/recompute the
+			// outline view then anyways
+			if (!model.textModel.isDisposed() && model.textModel.getVersionId() === versionIdThen) {
+				this._revealEditorSelection(model, e.selection);
+			}
+		}));
 
 		// feature: show markers in outline
 		const updateMarker = (e: URI[], ignoreEmpty?: boolean) => {
@@ -628,14 +658,20 @@ export class OutlinePanel extends ViewletPanel {
 		}
 	}
 
-	private async _revealTreeSelection(model: OutlineModel, element: OutlineElement, focus: boolean, aside: boolean): TPromise<void> {
+	private async _revealTreeSelection(model: OutlineModel, element: OutlineElement, focus: boolean, aside: boolean): Promise<void> {
 
-		let input = this._editorService.createInput({ resource: model.textModel.uri });
-		await this._editorService.openEditor(input, { preserveFocus: !focus, selection: Range.collapseToStart(element.symbol.selectionRange), revealInCenterIfOutsideViewport: true, forceOpen: true }, aside ? SIDE_GROUP : ACTIVE_GROUP);
+		await this._editorService.openEditor({
+			resource: model.textModel.uri,
+			options: {
+				preserveFocus: !focus,
+				selection: Range.collapseToStart(element.symbol.selectionRange),
+				revealInCenterIfOutsideViewport: true
+			}
+		} as IResourceInput, aside ? SIDE_GROUP : ACTIVE_GROUP);
 	}
 
-	private async _revealEditorSelection(model: OutlineModel, selection: Selection): TPromise<void> {
-		if (!this._outlineViewState.followCursor || !this._tree.getInput()) {
+	private async _revealEditorSelection(model: OutlineModel, selection: Selection): Promise<void> {
+		if (!this._outlineViewState.followCursor || !this._tree.getInput() || !selection) {
 			return;
 		}
 		let [first] = this._tree.getSelection();
@@ -647,8 +683,6 @@ export class OutlinePanel extends ViewletPanel {
 			await this._tree.reveal(item, .5);
 			this._tree.setFocus(item, this);
 			this._tree.setSelection([item], this);
-		} else {
-			this._tree.setSelection([], this);
 		}
 	}
 
diff --git a/src/vs/workbench/parts/output/browser/outputPanel.ts b/src/vs/workbench/parts/output/browser/outputPanel.ts
index a9151ee685c..0cc33ce78b5 100644
--- a/src/vs/workbench/parts/output/browser/outputPanel.ts
+++ b/src/vs/workbench/parts/output/browser/outputPanel.ts
@@ -65,9 +65,7 @@ export class OutputPanel extends AbstractTextResourceEditor {
 				this.instantiationService.createInstance(OpenLogOutputFile)
 			];
 
-			this.actions.forEach(a => {
-				this.toUnbind.push(a);
-			});
+			this.actions.forEach(a => this._register(a));
 		}
 
 		return this.actions;
@@ -134,8 +132,7 @@ export class OutputPanel extends AbstractTextResourceEditor {
 
 	protected createEditor(parent: HTMLElement): void {
 		// First create the scoped instantation service and only then construct the editor using the scoped service
-		const scopedContextKeyService = this.contextKeyService.createScoped(parent);
-		this.toUnbind.push(scopedContextKeyService);
+		const scopedContextKeyService = this._register(this.contextKeyService.createScoped(parent));
 		this.scopedInstantiationService = this.instantiationService.createChild(new ServiceCollection([IContextKeyService, scopedContextKeyService]));
 		super.createEditor(parent);
 
diff --git a/src/vs/workbench/parts/performance/electron-browser/performance.contribution.ts b/src/vs/workbench/parts/performance/electron-browser/performance.contribution.ts
index 771485b80f1..8c55379ff49 100644
--- a/src/vs/workbench/parts/performance/electron-browser/performance.contribution.ts
+++ b/src/vs/workbench/parts/performance/electron-browser/performance.contribution.ts
@@ -7,4 +7,5 @@
 
 import './startupProfiler';
 import './startupTimings';
+import './startupTimingsAppender';
 import './stats';
diff --git a/src/vs/workbench/parts/performance/electron-browser/startupTimings.ts b/src/vs/workbench/parts/performance/electron-browser/startupTimings.ts
index 74eb0b8e04c..047c038d75b 100644
--- a/src/vs/workbench/parts/performance/electron-browser/startupTimings.ts
+++ b/src/vs/workbench/parts/performance/electron-browser/startupTimings.ts
@@ -21,6 +21,7 @@ import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
+import { IUpdateService } from 'vs/platform/update/common/update';
 
 class StartupTimings implements IWorkbenchContribution {
 
@@ -34,14 +35,15 @@ class StartupTimings implements IWorkbenchContribution {
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@ILifecycleService private readonly _lifecycleService: ILifecycleService,
 		@IExtensionService private readonly _extensionService: IExtensionService,
+		@IUpdateService private readonly _updateService: IUpdateService,
 	) {
 
 		this._reportVariedStartupTimes().then(undefined, onUnexpectedError);
 		this._reportStandardStartupTimes().then(undefined, onUnexpectedError);
 	}
 
-	private async _reportVariedStartupTimes(): TPromise<void> {
-		await TPromise.join([
+	private async _reportVariedStartupTimes(): Promise<void> {
+		await Promise.all([
 			this._extensionService.whenInstalledExtensionsRegistered(),
 			this._lifecycleService.when(LifecyclePhase.Eventually)
 		]);
@@ -55,7 +57,7 @@ class StartupTimings implements IWorkbenchContribution {
 		this._telemetryService.publicLog('startupTimeVaried', this._timerService.startupMetrics);
 	}
 
-	private async _reportStandardStartupTimes(): TPromise<void> {
+	private async _reportStandardStartupTimes(): Promise<void> {
 		// check for standard startup:
 		// * new window (no reload)
 		// * just one window
@@ -87,7 +89,10 @@ class StartupTimings implements IWorkbenchContribution {
 			this._logService.info('no standard startup: not using cached data');
 			return;
 		}
-
+		if (!await this._updateService.isLatestVersion()) {
+			this._logService.info('no standard startup: not running latest version');
+			return;
+		}
 		// wait only know so that can check the restored state as soon as possible
 		await TPromise.join([
 			this._extensionService.whenInstalledExtensionsRegistered(),
diff --git a/src/vs/workbench/parts/performance/electron-browser/startupTimingsAppender.ts b/src/vs/workbench/parts/performance/electron-browser/startupTimingsAppender.ts
new file mode 100644
index 00000000000..2822fbb1890
--- /dev/null
+++ b/src/vs/workbench/parts/performance/electron-browser/startupTimingsAppender.ts
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+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';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { ITimerService } from 'vs/workbench/services/timer/common/timerService';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { nfcall } from 'vs/base/common/async';
+import { appendFile } from 'fs';
+import product from 'vs/platform/node/product';
+
+class StartupTimingsAppender implements IWorkbenchContribution {
+
+	constructor(
+		@ITimerService timerService: ITimerService,
+		@IWindowsService windowsService: IWindowsService,
+		@ILifecycleService lifecycleService: ILifecycleService,
+		@IExtensionService extensionService: IExtensionService,
+		@IEnvironmentService environmentService: IEnvironmentService,
+	) {
+
+		let appendTo = environmentService.args['prof-append-timers'];
+		if (!appendTo) {
+			return;
+		}
+
+		Promise.all([
+			lifecycleService.when(LifecyclePhase.Eventually),
+			extensionService.whenInstalledExtensionsRegistered()
+		]).then(() => {
+			const { startupMetrics } = timerService;
+			return nfcall(appendFile, appendTo, `${product.nameShort}\t${product.commit || '0000000'}\t${Date.now()}\t${startupMetrics.ellapsed}\n`);
+		}).then(() => {
+			windowsService.quit();
+		}).catch(err => {
+			console.error(err);
+			windowsService.quit();
+		});
+	}
+}
+
+const registry = Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench);
+registry.registerWorkbenchContribution(StartupTimingsAppender, LifecyclePhase.Running);
diff --git a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
index a74f63bd48a..4d91fd39cb5 100644
--- a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
@@ -247,8 +247,12 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 		return TPromise.as(null);
 	}
 
-	search(filter: string): void {
+	focusSearch(): void {
 		this.searchWidget.focus();
+	}
+
+	search(filter: string): void {
+		this.focusSearch();
 		this.searchWidget.setValue(filter);
 	}
 
diff --git a/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css b/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
index 9b08dd0e458..b3b54ddc0cc 100644
--- a/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
+++ b/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
@@ -3,9 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+.editor-instance#workbench\.editor\.settings2:focus {
+	outline: none;
+}
+
 .settings-editor {
 	padding-top: 11px;
-	max-width: 1000px;
+	max-width: 1100px;
 	margin: auto;
 }
 
@@ -35,7 +39,7 @@
 
 .settings-editor > .settings-header > .settings-advanced-customization {
 	opacity: .7;
-	margin-top: 10px;
+	margin-top: 8px;
 }
 
 .settings-editor > .settings-header > .settings-preview-header > .settings-preview-warning {
@@ -67,7 +71,7 @@
 }
 
 .settings-editor > .settings-header > .settings-header-controls {
-	margin-top: 2px;
+	margin-top: 3px;
 	height: 30px;
 	display: flex;
 }
@@ -101,7 +105,8 @@
 .settings-editor > .settings-body {
 	display: flex;
 	margin: auto;
-	max-width: 1000px;
+	max-width: 1100px;
+	justify-content: space-between;
 }
 
 .settings-editor > .settings-body .settings-tree-container .monaco-tree::before {
@@ -111,13 +116,22 @@
 .settings-editor > .settings-body .settings-toc-container {
 	width: 175px;
 	margin-right: 5px;
-}
-
-.settings-editor > .settings-body .settings-toc-container {
 	padding-top: 5px;
 }
 
-.search-mode .settings-toc-container {
+.settings-editor > .settings-body .settings-toc-container.hidden {
+	display: none;
+}
+
+.settings-editor.search-mode .settings-toc-container {
+	display: none;
+}
+
+.settings-editor.search-mode > .settings-body .settings-tree-container {
+	max-width: 1100px;
+}
+
+.settings-editor.narrow > .settings-body .settings-toc-container {
 	display: none;
 }
 
@@ -133,6 +147,8 @@
 
 .settings-editor > .settings-body .settings-tree-container {
 	flex: 1;
+	max-width: 875px;
+	margin-right: 1px; /* So the item doesn't blend into the edge of the view container  */
 	border-spacing: 0;
 	border-collapse: separate;
 	position: relative;
@@ -201,15 +217,6 @@
 	display: flex;
 }
 
-.settings-editor > .settings-body > .settings-tree-container .setting-item-bool > .reset-button-container {
-	margin-top: 5px;
-}
-
-.settings-editor > .settings-body > .settings-tree-container .setting-item-bool > .reset-button-container > .setting-reset-button {
-	width: initial;
-	padding-left: 0px;
-}
-
 .settings-editor > .settings-body > .settings-tree-container .setting-item-bool .setting-value-checkbox {
 	height: 16px;
 	width: 16px;
@@ -257,32 +264,16 @@
 	padding-left: 0px;
 }
 
-.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-value > .setting-type-complex + .reset-button-container > .setting-reset-button.monaco-button {
-	display: none;
-}
-
 .settings-editor > .settings-body > .settings-tree-container .setting-item .monaco-select-box {
 	width: initial;
 	font: inherit;
 	height: 26px;
 }
 
-.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-reset-button.monaco-button {
-	text-align: left;
-	display: inline-block;
-	visibility: hidden;
-	width: initial;
-
-	padding-top: 2px;
-}
-
-.settings-editor > .settings-body > .settings-tree-container .setting-item.is-configured .setting-reset-button.monaco-button {
-	visibility: visible;
-}
-
 .settings-editor > .settings-body > .settings-tree-container .group-title,
 .settings-editor > .settings-body > .settings-tree-container .setting-item {
 	padding-left: 10px;
+	padding-right: 10px;
 }
 
 .settings-editor > .settings-body > .settings-tree-container .group-title {
@@ -304,6 +295,10 @@
 	font-size: 20px;
 }
 
+.settings-editor > .settings-body > .settings-tree-container .settings-group-level-1.settings-group-first {
+	padding-top: 7px;
+}
+
 .settings-editor > .settings-body .settings-feedback-button {
 	color: rgb(255, 255, 255);
 	background-color: rgb(14, 99, 156);
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index 61669bfa5e3..0211aa5d897 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -242,7 +242,7 @@ export class PreferencesEditor extends BaseEditor {
 		if (query) {
 			return TPromise.join([
 				this.localSearchDelayer.trigger(() => this.preferencesRenderers.localFilterPreferences(query)),
-				this.remoteSearchThrottle.trigger(() => this.progressService.showWhile(this.preferencesRenderers.remoteSearchPreferences(query), 500))
+				this.remoteSearchThrottle.trigger(() => TPromise.wrap(this.progressService.showWhile(this.preferencesRenderers.remoteSearchPreferences(query), 500)))
 			]) as TPromise;
 		} else {
 			// When clearing the input, update immediately to clear it
@@ -434,7 +434,7 @@ class PreferencesRenderersController extends Disposable {
 		}
 	}
 
-	private async _onEditableContentDidChange(): TPromise<void> {
+	private async _onEditableContentDidChange(): Promise<void> {
 		await this.localFilterPreferences(this._lastQuery, true);
 		await this.remoteSearchPreferences(this._lastQuery, true);
 	}
@@ -511,11 +511,11 @@ class PreferencesRenderersController extends Disposable {
 		return TPromise.join(searchPs).then(() => { });
 	}
 
-	private searchSettingsTarget(query: string, provider: ISearchProvider, target: SettingsTarget, groupId: string, groupLabel: string, groupOrder: number): TPromise<void> {
+	private searchSettingsTarget(query: string, provider: ISearchProvider, target: SettingsTarget, groupId: string, groupLabel: string, groupOrder: number): Promise<void> {
 		if (!query) {
 			// Don't open the other settings targets when query is empty
 			this._onDidFilterResultsCountChange.fire({ target, count: 0 });
-			return TPromise.wrap(null);
+			return Promise.resolve(null);
 		}
 
 		return this.getPreferencesEditorModel(target).then(model => {
@@ -532,7 +532,7 @@ class PreferencesRenderersController extends Disposable {
 		});
 	}
 
-	private async getPreferencesEditorModel(target: SettingsTarget): TPromise<ISettingsEditorModel | null> {
+	private async getPreferencesEditorModel(target: SettingsTarget): Promise<ISettingsEditorModel | null> {
 		const resource = target === ConfigurationTarget.USER ? this.preferencesService.userSettingsResource :
 			target === ConfigurationTarget.WORKSPACE ? this.preferencesService.workspaceSettingsResource :
 				target;
@@ -832,7 +832,7 @@ class SideBySidePreferencesWidget extends Widget {
 		this._register(focusTracker.onDidFocus(() => this._onFocus.fire()));
 	}
 
-	public setInput(defaultPreferencesEditorInput: DefaultPreferencesEditorInput, editablePreferencesEditorInput: EditorInput, options: EditorOptions, token: CancellationToken): TPromise<{ defaultPreferencesRenderer: IPreferencesRenderer<ISetting>, editablePreferencesRenderer: IPreferencesRenderer<ISetting> }> {
+	public setInput(defaultPreferencesEditorInput: DefaultPreferencesEditorInput, editablePreferencesEditorInput: EditorInput, options: EditorOptions, token: CancellationToken): TPromise<{ defaultPreferencesRenderer?: IPreferencesRenderer<ISetting>, editablePreferencesRenderer?: IPreferencesRenderer<ISetting> }> {
 		this.getOrCreateEditablePreferencesEditor(editablePreferencesEditorInput);
 		this.settingsTargetsWidget.settingsTarget = this.getSettingsTarget(editablePreferencesEditorInput.getResource());
 		return TPromise.join([
@@ -841,7 +841,7 @@ class SideBySidePreferencesWidget extends Widget {
 		])
 			.then(([defaultPreferencesRenderer, editablePreferencesRenderer]) => {
 				if (token.isCancellationRequested) {
-					return void 0;
+					return {};
 				}
 
 				this.defaultPreferencesHeader.textContent = defaultPreferencesRenderer && this.getDefaultPreferencesHeaderText((<DefaultSettingsEditorModel>defaultPreferencesRenderer.preferencesModel).target);
@@ -987,8 +987,8 @@ export class DefaultPreferencesEditor extends BaseTextEditor {
 		const editor = this.instantiationService.createInstance(CodeEditorWidget, parent, configuration, { contributions: DefaultPreferencesEditor._getContributions() });
 
 		// Inform user about editor being readonly if user starts type
-		this.toUnbind.push(editor.onDidType(() => this.showReadonlyHint(editor)));
-		this.toUnbind.push(editor.onDidPaste(() => this.showReadonlyHint(editor)));
+		this._register(editor.onDidType(() => this.showReadonlyHint(editor)));
+		this._register(editor.onDidPaste(() => this.showReadonlyHint(editor)));
 
 		return editor;
 	}
diff --git a/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts b/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
index 37c19dfb3aa..82caff36780 100644
--- a/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
@@ -8,15 +8,16 @@ import { Button } from 'vs/base/browser/ui/button/button';
 import * as arrays from 'vs/base/common/arrays';
 import { Delayer, ThrottledDelayer } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
+import * as collections from 'vs/base/common/collections';
 import { Color } from 'vs/base/common/color';
 import { getErrorMessage, isPromiseCanceledError } from 'vs/base/common/errors';
-import { KeyCode } from 'vs/base/common/keyCodes';
+import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ITree, ITreeConfiguration } from 'vs/base/parts/tree/browser/tree';
 import { DefaultTreestyler, OpenMode } from 'vs/base/parts/tree/browser/treeDefaults';
 import 'vs/css!./media/settingsEditor2';
 import { localize } from 'vs/nls';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ConfigurationTarget, IConfigurationOverrides, IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -29,10 +30,10 @@ import { ICssStyleCollector, ITheme, IThemeService, registerThemingParticipant }
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { EditorOptions, IEditor } from 'vs/workbench/common/editor';
 import { SearchWidget, SettingsTarget, SettingsTargetsWidget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
-import { tocData, commonlyUsedData } from 'vs/workbench/parts/preferences/browser/settingsLayout';
-import { ISettingsEditorViewState, SearchResultIdx, SearchResultModel, SettingsAccessibilityProvider, SettingsDataSource, SettingsRenderer, SettingsTreeController, SettingsTreeElement, SettingsTreeFilter, SettingsTreeModel, SettingsTreeSettingElement, SettingsTreeGroupElement, resolveSettingsTree, NonExpandableTree } from 'vs/workbench/parts/preferences/browser/settingsTree';
+import { commonlyUsedData, tocData } from 'vs/workbench/parts/preferences/browser/settingsLayout';
+import { ISettingsEditorViewState, NonExpandableTree, resolveExtensionsSettings, resolveSettingsTree, SearchResultIdx, SearchResultModel, SettingsAccessibilityProvider, SettingsDataSource, SettingsRenderer, SettingsTreeController, SettingsTreeElement, SettingsTreeFilter, SettingsTreeGroupElement, SettingsTreeModel, SettingsTreeSettingElement } from 'vs/workbench/parts/preferences/browser/settingsTree';
 import { TOCDataSource, TOCRenderer, TOCTreeModel } from 'vs/workbench/parts/preferences/browser/tocTree';
-import { CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_SEARCH_FOCUS, IPreferencesSearchService, ISearchProvider } from 'vs/workbench/parts/preferences/common/preferences';
+import { CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_FIRST_ROW_FOCUS, CONTEXT_SETTINGS_SEARCH_FOCUS, IPreferencesSearchService, ISearchProvider, CONTEXT_SETTINGS_ROW_FOCUS, CONTEXT_TOC_ROW_FOCUS } from 'vs/workbench/parts/preferences/common/preferences';
 import { IPreferencesService, ISearchResult, ISettingsEditorModel } from 'vs/workbench/services/preferences/common/preferences';
 import { SettingsEditor2Input } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
 import { DefaultSettingsEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
@@ -73,6 +74,10 @@ export class SettingsEditor2 extends BaseEditor {
 
 	private viewState: ISettingsEditorViewState;
 	private searchResultModel: SearchResultModel;
+
+	private firstRowFocused: IContextKey<boolean>;
+	private rowFocused: IContextKey<boolean>;
+	private tocRowFocused: IContextKey<boolean>;
 	private inSettingsEditorContextKey: IContextKey<boolean>;
 	private searchFocusContextKey: IContextKey<boolean>;
 
@@ -97,11 +102,21 @@ export class SettingsEditor2 extends BaseEditor {
 
 		this.inSettingsEditorContextKey = CONTEXT_SETTINGS_EDITOR.bindTo(contextKeyService);
 		this.searchFocusContextKey = CONTEXT_SETTINGS_SEARCH_FOCUS.bindTo(contextKeyService);
+		this.firstRowFocused = CONTEXT_SETTINGS_FIRST_ROW_FOCUS.bindTo(contextKeyService);
+		this.rowFocused = CONTEXT_SETTINGS_ROW_FOCUS.bindTo(contextKeyService);
+		this.tocRowFocused = CONTEXT_TOC_ROW_FOCUS.bindTo(contextKeyService);
 
-		this._register(configurationService.onDidChangeConfiguration(() => this.onConfigUpdate()));
+		this._register(configurationService.onDidChangeConfiguration(e => {
+			this.onConfigUpdate();
+
+			if (e.affectsConfiguration('workbench.settings.tocVisible')) {
+				this.updateTOCVisible();
+			}
+		}));
 	}
 
 	createEditor(parent: HTMLElement): void {
+		parent.setAttribute('tabindex', '-1');
 		this.rootElement = DOM.append(parent, $('.settings-editor'));
 
 		this.createHeader(this.rootElement);
@@ -123,17 +138,38 @@ export class SettingsEditor2 extends BaseEditor {
 
 	layout(dimension: DOM.Dimension): void {
 		this.searchWidget.layout(dimension);
-		this.layoutSettingsList(dimension);
+		this.layoutTrees(dimension);
+
+		DOM.toggleClass(this.rootElement, 'narrow', dimension.width < 600);
 	}
 
 	focus(): void {
 		this.focusSearch();
 	}
 
+	focusSettings(): void {
+		const selection = this.settingsTree.getSelection();
+		if (selection && selection[0]) {
+			this.settingsTree.setFocus(selection[0]);
+		} else {
+			this.settingsTree.focusFirst();
+		}
+
+		this.settingsTree.domFocus();
+	}
+
 	focusSearch(): void {
 		this.searchWidget.focus();
 	}
 
+	editSelectedSetting(): void {
+		const focus = this.settingsTree.getFocus();
+		if (focus instanceof SettingsTreeSettingElement) {
+			const itemId = focus.id.replace(/\./g, '_');
+			this.focusEditControlForRow(itemId);
+		}
+	}
+
 	clearSearchResults(): void {
 		this.searchWidget.clear();
 	}
@@ -156,12 +192,6 @@ export class SettingsEditor2 extends BaseEditor {
 			focusKey: this.searchFocusContextKey
 		}));
 		this._register(this.searchWidget.onDidChange(() => this.onSearchInputChanged()));
-		this._register(DOM.addStandardDisposableListener(this.searchWidget.domNode, 'keydown', e => {
-			if (e.keyCode === KeyCode.DownArrow) {
-				this.settingsTree.focusFirst();
-				this.settingsTree.domFocus();
-			}
-		}));
 
 		const advancedCustomization = DOM.append(this.headerContainer, $('.settings-advanced-customization'));
 		const advancedCustomizationLabel = DOM.append(advancedCustomization, $('span.settings-advanced-customization-label'));
@@ -183,7 +213,9 @@ export class SettingsEditor2 extends BaseEditor {
 		this.settingsTargetsWidget.settingsTarget = ConfigurationTarget.USER;
 		this.settingsTargetsWidget.onDidTargetChange(() => {
 			this.viewState.settingsTarget = this.settingsTargetsWidget.settingsTarget;
-			this.settingsTree.refresh();
+
+			this.settingsTreeModel.update();
+			this.refreshTreeAndMaintainFocus();
 		});
 
 		this.createHeaderControls(headerControlsContainer);
@@ -243,21 +275,35 @@ export class SettingsEditor2 extends BaseEditor {
 				twistiePixels: 15
 			});
 
-		this._register(this.tocTree.onDidChangeSelection(e => {
+		this._register(this.tocTree.onDidChangeFocus(e => {
+			const element = e.focus;
 			if (this.searchResultModel) {
-				const element = e.selection[0];
 				this.viewState.filterToCategory = element;
 				this.refreshTreeAndMaintainFocus();
 			} else if (this.settingsTreeModel) {
-				const element = e.selection[0];
 				if (element && !e.payload.fromScroll) {
 					this.settingsTree.reveal(element, 0);
 					this.settingsTree.setSelection([element]);
 					this.settingsTree.setFocus(element);
-					this.settingsTree.domFocus();
 				}
 			}
+
 		}));
+
+		this._register(this.tocTree.onDidFocus(() => {
+			this.tocRowFocused.set(true);
+		}));
+
+		this._register(this.tocTree.onDidBlur(() => {
+			this.tocRowFocused.set(false);
+		}));
+
+		this.updateTOCVisible();
+	}
+
+	private updateTOCVisible(): void {
+		const visible = !!this.configurationService.getValue('workbench.settings.tocVisible');
+		DOM.toggleClass(this.tocTreeContainer, 'hidden', !visible);
 	}
 
 	private createSettingsTree(parent: HTMLElement): void {
@@ -327,31 +373,33 @@ export class SettingsEditor2 extends BaseEditor {
 			this.selectedElement = e.focus;
 		}));
 
-		this._register(this.settingsTree.onDidScroll(() => {
-			if (this.searchResultModel) {
-				return;
-			}
+		this._register(this.settingsTree.onDidBlur(() => {
+			this.rowFocused.set(false);
+			this.firstRowFocused.set(false);
+		}));
 
-			if (!this.tocTree.getInput()) {
-				return;
-			}
+		this._register(this.settingsTree.onDidChangeSelection(e => {
+			this.updateTreeScrollSync();
 
-			const topElement = this.settingsTree.getFirstVisibleElement();
-			const element = topElement instanceof SettingsTreeSettingElement ? topElement.parent :
-				topElement instanceof SettingsTreeGroupElement ? topElement :
-					null;
-
-			if (element && this.tocTree.getSelection()[0] !== element) {
-				const elementTop = this.tocTree.getRelativeTop(element);
-				if (elementTop < 0) {
-					this.tocTree.reveal(element, 0);
-				} else if (elementTop > 1) {
-					this.tocTree.reveal(element, 1);
+			let firstRowFocused = false;
+			let rowFocused = false;
+			const selection: SettingsTreeElement = e.selection[0];
+			if (selection) {
+				rowFocused = true;
+				if (this.searchResultModel) {
+					firstRowFocused = selection.id === this.searchResultModel.getChildren()[0].id;
+				} else {
+					const firstRowId = this.settingsTreeModel.root.children[0] && this.settingsTreeModel.root.children[0].id;
+					firstRowFocused = selection.id === firstRowId;
 				}
-
-				this.tocTree.setSelection([element], { fromScroll: true });
-				this.tocTree.setFocus(element);
 			}
+
+			this.rowFocused.set(rowFocused);
+			this.firstRowFocused.set(firstRowFocused);
+		}));
+
+		this._register(this.settingsTree.onDidScroll(() => {
+			this.updateTreeScrollSync();
 		}));
 	}
 
@@ -384,10 +432,56 @@ export class SettingsEditor2 extends BaseEditor {
 		this.settingUpdateDelayer.trigger(() => this.updateChangedSetting(key, value));
 	}
 
+	private updateTreeScrollSync(): void {
+		if (this.searchResultModel) {
+			return;
+		}
+
+		if (!this.tocTree.getInput()) {
+			return;
+		}
+
+		let elementToSync = this.settingsTree.getFirstVisibleElement();
+		const selection = this.settingsTree.getSelection()[0];
+		if (selection) {
+			const selectionPos = this.settingsTree.getRelativeTop(selection);
+			if (selectionPos >= 0 && selectionPos <= 1) {
+				elementToSync = selection;
+			}
+		}
+
+		const element = elementToSync instanceof SettingsTreeSettingElement ? elementToSync.parent :
+			elementToSync instanceof SettingsTreeGroupElement ? elementToSync :
+				null;
+
+		if (element && this.tocTree.getSelection()[0] !== element) {
+			const elementTop = this.tocTree.getRelativeTop(element);
+			if (elementTop < 0) {
+				this.tocTree.reveal(element, 0);
+			} else if (elementTop > 1) {
+				this.tocTree.reveal(element, 1);
+			}
+
+			this.tocTree.setSelection([element]);
+			this.tocTree.setFocus(element, { fromScroll: true });
+		}
+	}
+
 	private updateChangedSetting(key: string, value: any): TPromise<void> {
 		// ConfigurationService displays the error if this fails.
 		// Force a render afterwards because onDidConfigurationUpdate doesn't fire if the update doesn't result in an effective setting value change
-		return this.configurationService.updateValue(key, value, <ConfigurationTarget>this.settingsTargetsWidget.settingsTarget)
+		const settingsTarget = this.settingsTargetsWidget.settingsTarget;
+		const resource = URI.isUri(settingsTarget) ? settingsTarget : undefined;
+		const configurationTarget = <ConfigurationTarget>(resource ? undefined : settingsTarget);
+		const overrides: IConfigurationOverrides = { resource };
+
+		// If the user is changing the value back to the default, do a 'reset' instead
+		const inspected = this.configurationService.inspect(key, overrides);
+		if (inspected.default === value) {
+			value = undefined;
+		}
+
+		return this.configurationService.updateValue(key, value, overrides, configurationTarget)
 			.then(() => this.refreshTreeAndMaintainFocus())
 			.then(() => {
 				const reportModifiedProps = {
@@ -486,10 +580,17 @@ export class SettingsEditor2 extends BaseEditor {
 
 	private onConfigUpdate(): TPromise<void> {
 		const groups = this.defaultSettingsEditorModel.settingsGroups.slice(1); // Without commonlyUsed
-		const resolvedSettingsRoot = resolveSettingsTree(tocData, groups);
-		const commonlyUsed = resolveSettingsTree(commonlyUsedData, groups);
+		const dividedGroups = collections.groupBy(groups, g => g.contributedByExtension ? 'extension' : 'core');
+		const resolvedSettingsRoot = resolveSettingsTree(tocData, dividedGroups.core);
+		const commonlyUsed = resolveSettingsTree(commonlyUsedData, dividedGroups.core);
 		resolvedSettingsRoot.children.unshift(commonlyUsed);
 
+		resolvedSettingsRoot.children.push(resolveExtensionsSettings(dividedGroups.extension || []));
+
+		if (this.searchResultModel) {
+			this.searchResultModel.updateChildren();
+		}
+
 		if (this.settingsTreeModel) {
 			this.settingsTreeModel.update(resolvedSettingsRoot);
 		} else {
@@ -518,14 +619,7 @@ export class SettingsEditor2 extends BaseEditor {
 		return this.settingsTree.refresh()
 			.then(() => {
 				if (focusedRowId) {
-					const rowSelector = `.setting-item#${focusedRowId}`;
-					const inputElementToFocus: HTMLElement = this.settingsTreeContainer.querySelector(`${rowSelector} input, ${rowSelector} select, ${rowSelector} a, ${rowSelector} .monaco-custom-checkbox`);
-					if (inputElementToFocus) {
-						inputElementToFocus.focus();
-						if (typeof selection === 'number') {
-							(<HTMLInputElement>inputElementToFocus).setSelectionRange(selection, selection);
-						}
-					}
+					this.focusEditControlForRow(focusedRowId, selection);
 				}
 			})
 			.then(() => {
@@ -533,6 +627,17 @@ export class SettingsEditor2 extends BaseEditor {
 			});
 	}
 
+	private focusEditControlForRow(id: string, selection?: number): void {
+		const rowSelector = `.setting-item#${id}`;
+		const inputElementToFocus: HTMLElement = this.settingsTreeContainer.querySelector(`${rowSelector} input, ${rowSelector} select, ${rowSelector} a, ${rowSelector} .monaco-custom-checkbox`);
+		if (inputElementToFocus) {
+			inputElementToFocus.focus();
+			if (typeof selection === 'number') {
+				(<HTMLInputElement>inputElementToFocus).setSelectionRange(selection, selection);
+			}
+		}
+	}
+
 	private onSearchInputChanged(): void {
 		const query = this.searchWidget.getValue().trim();
 		this.delayedFilterLogging.cancel();
@@ -636,13 +741,15 @@ export class SettingsEditor2 extends BaseEditor {
 
 				const [result] = results;
 				if (!this.searchResultModel) {
-					this.searchResultModel = new SearchResultModel();
+					this.searchResultModel = this.instantiationService.createInstance(SearchResultModel, this.viewState);
+					this.searchResultModel.setResult(type, result);
 					this.tocTreeModel.currentSearchModel = this.searchResultModel;
 					this.toggleSearchMode();
 					this.settingsTree.setInput(this.searchResultModel);
+				} else {
+					this.searchResultModel.setResult(type, result);
 				}
 
-				this.searchResultModel.setResult(type, result);
 				this.tocTreeModel.update();
 				resolve(this.refreshTreeAndMaintainFocus());
 			});
@@ -675,11 +782,16 @@ export class SettingsEditor2 extends BaseEditor {
 			});
 	}
 
-	private layoutSettingsList(dimension: DOM.Dimension): void {
+	private layoutTrees(dimension: DOM.Dimension): void {
 		const listHeight = dimension.height - (DOM.getDomNodePagePosition(this.headerContainer).height + 12 /*padding*/);
 		this.settingsTreeContainer.style.height = `${listHeight}px`;
 		this.settingsTree.layout(listHeight, 800);
 
+		const selectedSetting = this.settingsTree.getSelection()[0];
+		if (selectedSetting) {
+			this.settingsTree.refresh(selectedSetting);
+		}
+
 		const tocHeight = listHeight - 5; // padding
 		this.tocTreeContainer.style.height = `${tocHeight}px`;
 		this.tocTree.layout(tocHeight, 175);
diff --git a/src/vs/workbench/parts/preferences/browser/settingsLayout.ts b/src/vs/workbench/parts/preferences/browser/settingsLayout.ts
index e4c6a4620e8..caf7d55ff89 100644
--- a/src/vs/workbench/parts/preferences/browser/settingsLayout.ts
+++ b/src/vs/workbench/parts/preferences/browser/settingsLayout.ts
@@ -70,7 +70,7 @@ export const tocData: ITOCEntry = {
 				},
 				{
 					id: 'editor/editor',
-					label: localize('editor', "Editor"),
+					label: localize('textEditor', "Text Editor"),
 					settings: ['editor.*']
 				}
 			]
@@ -89,6 +89,11 @@ export const tocData: ITOCEntry = {
 					label: localize('editorManagement', "Editor Management"),
 					settings: ['workbench.editor.*']
 				},
+				{
+					id: 'workbench/settings',
+					label: localize('settings', "Settings Editor"),
+					settings: ['workbench.settings.*']
+				},
 				{
 					id: 'workbench/zenmode',
 					label: localize('zenMode', "Zen Mode"),
@@ -184,11 +189,6 @@ export const tocData: ITOCEntry = {
 					settings: ['telemetry.*']
 				}
 			]
-		},
-		{
-			id: 'extensions',
-			label: localize('extensions', "Extensions"),
-			settings: ['*']
 		}
 	]
 };
diff --git a/src/vs/workbench/parts/preferences/browser/settingsTree.ts b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
index 74447236d81..ac53257f46e 100644
--- a/src/vs/workbench/parts/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
@@ -24,7 +24,7 @@ import { localize } from 'vs/nls';
 import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { WorkbenchTree, WorkbenchTreeController } from 'vs/platform/list/browser/listService';
-import { editorActiveLinkForeground, registerColor, selectBackground, selectBorder } from 'vs/platform/theme/common/colorRegistry';
+import { registerColor, selectBackground, selectBorder } from 'vs/platform/theme/common/colorRegistry';
 import { attachButtonStyler, attachInputBoxStyler, attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
 import { ICssStyleCollector, ITheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { SettingsTarget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
@@ -47,11 +47,13 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 });
 
 registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
+	// TODO@roblou Hacks! Make checkbox background themeable
 	const selectBackgroundColor = theme.getColor(selectBackground);
 	if (selectBackgroundColor) {
 		collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item-bool .setting-value-checkbox { background-color: ${selectBackgroundColor} !important; }`);
 	}
 
+	// TODO@roblou Hacks! Use proper inputbox theming instead of !important
 	const selectBorderColor = theme.getColor(selectBorder);
 	if (selectBorderColor) {
 		collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item-bool .setting-value-checkbox { border-color: ${selectBorderColor} !important; }`);
@@ -68,6 +70,7 @@ export class SettingsTreeGroupElement extends SettingsTreeElement {
 	children: (SettingsTreeGroupElement | SettingsTreeSettingElement)[];
 	label: string;
 	level: number;
+	isFirstGroup: boolean;
 }
 
 export class SettingsTreeSettingElement extends SettingsTreeElement {
@@ -96,19 +99,21 @@ export class SettingsTreeModel {
 	private _treeElementsById = new Map<string, SettingsTreeElement>();
 
 	constructor(
-		private viewState: ISettingsEditorViewState,
-		tocRoot: ITOCEntry,
-		@IConfigurationService private configurationService: IConfigurationService
+		private _viewState: ISettingsEditorViewState,
+		private _tocRoot: ITOCEntry,
+		@IConfigurationService private _configurationService: IConfigurationService
 	) {
-		this.update(tocRoot);
+		this.update(this._tocRoot);
 	}
 
-	get root(): SettingsTreeElement {
+	get root(): SettingsTreeGroupElement {
 		return this._root;
 	}
 
-	update(newTocRoot: ITOCEntry): void {
+	update(newTocRoot = this._tocRoot): void {
 		const newRoot = this.createSettingsTreeGroupElement(newTocRoot);
+		(<SettingsTreeGroupElement>newRoot.children[0]).isFirstGroup = true;
+
 		if (this._root) {
 			this._root.children = newRoot.children;
 		} else {
@@ -146,7 +151,7 @@ export class SettingsTreeModel {
 	}
 
 	private createSettingsTreeSettingElement(setting: ISetting, parent: SettingsTreeGroupElement): SettingsTreeSettingElement {
-		const element = createSettingsTreeSettingElement(setting, parent, this.viewState.settingsTarget, this.configurationService);
+		const element = createSettingsTreeSettingElement(setting, parent, this._viewState.settingsTarget, this._configurationService);
 		this._treeElementsById.set(element.id, element);
 		return element;
 	}
@@ -200,8 +205,31 @@ function inspectSetting(key: string, target: SettingsTarget, configurationServic
 	return { isConfigured, inspected, targetSelector };
 }
 
-export function resolveSettingsTree(tocData: ITOCEntry, settingsGroups: ISettingsGroup[]): ITOCEntry {
-	return _resolveSettingsTree(tocData, getFlatSettings(settingsGroups));
+export function resolveSettingsTree(tocData: ITOCEntry, coreSettingsGroups: ISettingsGroup[]): ITOCEntry {
+	return _resolveSettingsTree(tocData, getFlatSettings(coreSettingsGroups));
+}
+
+export function resolveExtensionsSettings(groups: ISettingsGroup[]): ITOCEntry {
+	const settingsGroupToEntry = (group: ISettingsGroup) => {
+		const flatSettings = arrays.flatten(
+			group.sections.map(section => section.settings));
+
+		return {
+			id: group.id,
+			label: group.title,
+			settings: flatSettings
+		};
+	};
+
+	const extGroups = groups
+		.sort((a, b) => a.title.localeCompare(b.title))
+		.map(g => settingsGroupToEntry(g));
+
+	return {
+		id: 'extensions',
+		label: localize('extensions', "Extensions"),
+		children: extGroups
+	};
 }
 
 function _resolveSettingsTree(tocData: ITOCEntry, allSettings: Set<ISetting>): ITOCEntry {
@@ -215,7 +243,9 @@ function _resolveSettingsTree(tocData: ITOCEntry, allSettings: Set<ISetting>): I
 		return <ITOCEntry>{
 			id: tocData.id,
 			label: tocData.label,
-			children: tocData.children.map(child => _resolveSettingsTree(child, allSettings))
+			children: tocData.children
+				.map(child => _resolveSettingsTree(child, allSettings))
+				.filter(child => (child.children && child.children.length) || (child.settings && child.settings.length))
 		};
 	}
 
@@ -261,11 +291,6 @@ function getFlatSettings(settingsGroups: ISettingsGroup[]) {
 
 export class SettingsDataSource implements IDataSource {
 
-	constructor(
-		private viewState: ISettingsEditorViewState,
-		@IConfigurationService private configurationService: IConfigurationService
-	) { }
-
 	getId(tree: ITree, element: SettingsTreeElement): string {
 		return element.id;
 	}
@@ -282,18 +307,13 @@ export class SettingsDataSource implements IDataSource {
 		return false;
 	}
 
-	private getSearchResultChildren(searchResult: SearchResultModel): SettingsTreeSettingElement[] {
-		return searchResult.getFlatSettings()
-			.map(s => createSettingsTreeSettingElement(s, searchResult, this.viewState.settingsTarget, this.configurationService));
-	}
-
 	getChildren(tree: ITree, element: SettingsTreeElement): TPromise<any, any> {
 		return TPromise.as(this._getChildren(element));
 	}
 
 	private _getChildren(element: SettingsTreeElement): SettingsTreeElement[] {
 		if (element instanceof SearchResultModel) {
-			return this.getSearchResultChildren(element);
+			return element.getChildren();
 		} else if (element instanceof SettingsTreeGroupElement) {
 			return element.children;
 		} else {
@@ -382,7 +402,6 @@ interface ISettingItemTemplate extends IDisposableTemplate {
 	labelElement: HTMLElement;
 	descriptionElement: HTMLElement;
 	controlElement: HTMLElement;
-	resetButtonElement: HTMLElement;
 	isConfiguredElement: HTMLElement;
 	otherOverridesElement: HTMLElement;
 }
@@ -396,7 +415,6 @@ interface ISettingBoolItemTemplate extends IDisposableTemplate {
 	labelElement: HTMLElement;
 	descriptionElement: HTMLElement;
 	checkbox: Checkbox;
-	resetButtonElement: HTMLElement;
 	isConfiguredElement: HTMLElement;
 	otherOverridesElement: HTMLElement;
 }
@@ -418,6 +436,7 @@ export interface ISettingChangeEvent {
 export class SettingsRenderer implements IRenderer {
 
 	private static readonly SETTING_ROW_HEIGHT = 94;
+	private static readonly SETTING_BOOL_ROW_HEIGHT = 61;
 
 	private readonly _onDidChangeSetting: Emitter<ISettingChangeEvent> = new Emitter<ISettingChangeEvent>();
 	public readonly onDidChangeSetting: Event<ISettingChangeEvent> = this._onDidChangeSetting.event;
@@ -437,6 +456,10 @@ export class SettingsRenderer implements IRenderer {
 
 	getHeight(tree: ITree, element: SettingsTreeElement): number {
 		if (element instanceof SettingsTreeGroupElement) {
+			if (element.isFirstGroup) {
+				return 31;
+			}
+
 			return 40 + (7 * element.level);
 		}
 
@@ -445,13 +468,21 @@ export class SettingsRenderer implements IRenderer {
 			if (isSelected) {
 				return this.measureSettingElementHeight(tree, element);
 			} else {
-				return SettingsRenderer.SETTING_ROW_HEIGHT;
+				return this._getUnexpandedSettingHeight(element);
 			}
 		}
 
 		return 0;
 	}
 
+	_getUnexpandedSettingHeight(element: SettingsTreeSettingElement): number {
+		if (element.valueType === 'boolean') {
+			return SettingsRenderer.SETTING_BOOL_ROW_HEIGHT;
+		} else {
+			return SettingsRenderer.SETTING_ROW_HEIGHT;
+		}
+	}
+
 	private measureSettingElementHeight(tree: ITree, element: SettingsTreeSettingElement): number {
 		const measureHelper = DOM.append(this.measureContainer, $('.setting-measure-helper'));
 
@@ -461,7 +492,7 @@ export class SettingsRenderer implements IRenderer {
 
 		const height = this.measureContainer.offsetHeight;
 		this.measureContainer.removeChild(this.measureContainer.firstChild);
-		return Math.max(height, SettingsRenderer.SETTING_ROW_HEIGHT);
+		return Math.max(height, this._getUnexpandedSettingHeight(element));
 	}
 
 	getTemplateId(tree: ITree, element: SettingsTreeElement): string {
@@ -533,7 +564,6 @@ export class SettingsRenderer implements IRenderer {
 			labelElement,
 			descriptionElement,
 			controlElement,
-			resetButtonElement,
 			isConfiguredElement,
 			otherOverridesElement
 		};
@@ -566,8 +596,6 @@ export class SettingsRenderer implements IRenderer {
 		const controlElement = DOM.append(descriptionAndValueElement, $('.setting-item-bool-control'));
 		const descriptionElement = DOM.append(descriptionAndValueElement, $('.setting-item-description'));
 
-		const resetButtonElement = DOM.append(container, $('.reset-button-container'));
-
 		const toDispose = [];
 		const checkbox = new Checkbox({ actionClassName: 'setting-value-checkbox', isChecked: true, title: '', inputActiveOptionBorder: null });
 		controlElement.appendChild(checkbox.domNode);
@@ -587,7 +615,6 @@ export class SettingsRenderer implements IRenderer {
 			labelElement,
 			checkbox,
 			descriptionElement,
-			resetButtonElement,
 			isConfiguredElement,
 			otherOverridesElement
 		};
@@ -624,6 +651,10 @@ export class SettingsRenderer implements IRenderer {
 		const labelElement = DOM.append(template.parent, $('div.settings-group-title-label'));
 		labelElement.classList.add(`settings-group-level-${element.level}`);
 		labelElement.textContent = (<SettingsTreeGroupElement>element).label;
+
+		if (element.isFirstGroup) {
+			labelElement.classList.add('settings-group-first');
+		}
 	}
 
 	private elementIsSelected(tree: ITree, element: SettingsTreeElement): boolean {
@@ -650,25 +681,6 @@ export class SettingsRenderer implements IRenderer {
 
 		this.renderValue(element, isSelected, <ISettingItemTemplate>template);
 
-		template.resetButtonElement.innerHTML = '';
-		const resetButton = new Button(template.resetButtonElement);
-		const resetText = localize('resetButtonTitle', "reset");
-		resetButton.label = resetText;
-		resetButton.element.title = resetText;
-		resetButton.element.classList.add('setting-reset-button');
-		resetButton.element.tabIndex = isSelected ? 0 : -1;
-
-		template.toDispose.push(attachButtonStyler(resetButton, this.themeService, {
-			buttonBackground: Color.transparent.toString(),
-			buttonHoverBackground: Color.transparent.toString(),
-			buttonForeground: editorActiveLinkForeground
-		}));
-
-		template.toDispose.push(resetButton.onDidClick(e => {
-			this._onDidChangeSetting.fire({ key: element.setting.key, value: undefined });
-		}));
-		template.toDispose.push(resetButton);
-
 		template.isConfiguredElement.textContent = element.isConfigured ? localize('configured', "Modified") : '';
 
 		if (element.overriddenScopeList.length) {
@@ -677,6 +689,8 @@ export class SettingsRenderer implements IRenderer {
 				localize('configuredIn', "Modified in");
 
 			template.otherOverridesElement.textContent = `(${otherOverridesLabel}: ${element.overriddenScopeList.join(', ')})`;
+		} else {
+			template.otherOverridesElement.textContent = '';
 		}
 	}
 
@@ -703,7 +717,8 @@ export class SettingsRenderer implements IRenderer {
 			this.renderText(element, isSelected, template, valueControlElement, onChange);
 		} else if (element.valueType === 'number' || element.valueType === 'integer') {
 			valueControlElement.classList.add('setting-type-number');
-			this.renderText(element, isSelected, template, valueControlElement, value => onChange(parseInt(value)));
+			const parseFn = element.valueType === 'integer' ? parseInt : parseFloat;
+			this.renderText(element, isSelected, template, valueControlElement, value => onChange(parseFn(value)));
 		} else {
 			valueControlElement.classList.add('setting-type-complex');
 			this.renderEditInSettingsJson(element, isSelected, template, valueControlElement);
@@ -772,7 +787,6 @@ function escapeInvisibleChars(enumValue: string): string {
 export class SettingsTreeFilter implements IFilter {
 	constructor(
 		private viewState: ISettingsEditorViewState,
-		@IConfigurationService private configurationService: IConfigurationService
 	) { }
 
 	isVisible(tree: ITree, element: SettingsTreeElement): boolean {
@@ -808,13 +822,12 @@ export class SettingsTreeFilter implements IFilter {
 	private groupHasConfiguredSetting(element: SettingsTreeGroupElement): boolean {
 		for (let child of element.children) {
 			if (child instanceof SettingsTreeSettingElement) {
-				const { isConfigured } = inspectSetting(child.setting.key, this.viewState.settingsTarget, this.configurationService);
-				if (isConfigured) {
+				if (child.isConfigured) {
 					return true;
 				}
-			} else {
-				if (child instanceof SettingsTreeGroupElement) {
-					return this.groupHasConfiguredSetting(child);
+			} else if (child instanceof SettingsTreeGroupElement) {
+				if (this.groupHasConfiguredSetting(child)) {
+					return true;
 				}
 			}
 		}
@@ -857,9 +870,19 @@ export enum SearchResultIdx {
 export class SearchResultModel {
 	private rawSearchResults: ISearchResult[];
 	private cachedUniqueSearchResults: ISearchResult[];
+	private children: SettingsTreeSettingElement[];
 
 	readonly id = 'searchResultModel';
 
+	constructor(
+		private _viewState: ISettingsEditorViewState,
+		@IConfigurationService private _configurationService: IConfigurationService
+	) { }
+
+	getChildren(): SettingsTreeSettingElement[] {
+		return this.children;
+	}
+
 	getUniqueResults(): ISearchResult[] {
 		if (this.cachedUniqueSearchResults) {
 			return this.cachedUniqueSearchResults;
@@ -891,10 +914,21 @@ export class SearchResultModel {
 	setResult(type: SearchResultIdx, result: ISearchResult): void {
 		this.cachedUniqueSearchResults = null;
 		this.rawSearchResults = this.rawSearchResults || [];
+		if (!result) {
+			delete this.rawSearchResults[type];
+			return;
+		}
+
 		this.rawSearchResults[type] = result;
+		this.updateChildren();
 	}
 
-	getFlatSettings(): ISetting[] {
+	updateChildren(): void {
+		this.children = this.getFlatSettings()
+			.map(s => createSettingsTreeSettingElement(s, this, this._viewState.settingsTarget, this._configurationService));
+	}
+
+	private getFlatSettings(): ISetting[] {
 		const flatSettings: ISetting[] = [];
 		this.getUniqueResults()
 			.filter(r => !!r)
diff --git a/src/vs/workbench/parts/preferences/browser/tocTree.ts b/src/vs/workbench/parts/preferences/browser/tocTree.ts
index f463c6e3d7a..54c4d4297e8 100644
--- a/src/vs/workbench/parts/preferences/browser/tocTree.ts
+++ b/src/vs/workbench/parts/preferences/browser/tocTree.ts
@@ -48,8 +48,8 @@ export class TOCTreeModel {
 	}
 
 	private getSearchResultChildrenCount(group: SettingsTreeGroupElement): number {
-		return this._currentSearchModel.getFlatSettings().filter(s => {
-			return this.groupContainsSetting(group, s);
+		return this._currentSearchModel.getChildren().filter(child => {
+			return this.groupContainsSetting(group, child.setting);
 		}).length;
 	}
 
diff --git a/src/vs/workbench/parts/preferences/common/preferences.ts b/src/vs/workbench/parts/preferences/common/preferences.ts
index fdf684a9d5a..efbbd723b00 100644
--- a/src/vs/workbench/parts/preferences/common/preferences.ts
+++ b/src/vs/workbench/parts/preferences/common/preferences.ts
@@ -48,6 +48,7 @@ export interface IKeybindingsEditor extends IEditor {
 	activeKeybindingEntry: IKeybindingItemEntry;
 
 	search(filter: string): void;
+	focusSearch(): void;
 	clearSearchResults(): void;
 	focusKeybindings(): void;
 	defineKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
@@ -60,6 +61,9 @@ export interface IKeybindingsEditor extends IEditor {
 
 export const CONTEXT_SETTINGS_EDITOR = new RawContextKey<boolean>('inSettingsEditor', false);
 export const CONTEXT_SETTINGS_SEARCH_FOCUS = new RawContextKey<boolean>('inSettingsSearch', false);
+export const CONTEXT_SETTINGS_FIRST_ROW_FOCUS = new RawContextKey<boolean>('firstSettingRowFocused', false);
+export const CONTEXT_SETTINGS_ROW_FOCUS = new RawContextKey<boolean>('settingRowFocused', false);
+export const CONTEXT_TOC_ROW_FOCUS = new RawContextKey<boolean>('settingsTocRowFocus', false);
 export const CONTEXT_KEYBINDINGS_EDITOR = new RawContextKey<boolean>('inKeybindings', false);
 export const CONTEXT_KEYBINDINGS_SEARCH_FOCUS = new RawContextKey<boolean>('inKeybindingsSearch', false);
 export const CONTEXT_KEYBINDING_FOCUS = new RawContextKey<boolean>('keybindingFocus', false);
@@ -70,6 +74,10 @@ export const SETTINGS_EDITOR_COMMAND_FOCUS_NEXT_SETTING = 'settings.action.focus
 export const SETTINGS_EDITOR_COMMAND_FOCUS_PREVIOUS_SETTING = 'settings.action.focusPreviousSetting';
 export const SETTINGS_EDITOR_COMMAND_FOCUS_FILE = 'settings.action.focusSettingsFile';
 export const SETTINGS_EDITOR_COMMAND_EDIT_FOCUSED_SETTING = 'settings.action.editFocusedSetting';
+export const SETTINGS_EDITOR_COMMAND_FOCUS_SEARCH_FROM_SETTINGS = 'settings.action.focusSearchFromSettings';
+export const SETTINGS_EDITOR_COMMAND_FOCUS_SETTINGS_FROM_SEARCH = 'settings.action.focusSettingsFromSearch';
+export const SETTINGS_EDITOR_COMMAND_FOCUS_SETTINGS_LIST = 'settings.action.focusSettingsList';
+
 export const KEYBINDINGS_EDITOR_COMMAND_SEARCH = 'keybindings.editor.searchKeybindings';
 export const KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS = 'keybindings.editor.clearSearchResults';
 export const KEYBINDINGS_EDITOR_COMMAND_DEFINE = 'keybindings.editor.defineKeybinding';
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 08c8d92da5c..a38ea158de6 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts
@@ -22,7 +22,7 @@ import { KeybindingsEditor } from 'vs/workbench/parts/preferences/browser/keybin
 import { OpenRawDefaultSettingsAction, OpenSettingsAction, OpenGlobalSettingsAction, OpenGlobalKeybindingsFileAction, OpenWorkspaceSettingsAction, OpenFolderSettingsAction, ConfigureLanguageBasedSettingsAction, OPEN_FOLDER_SETTINGS_COMMAND, OpenGlobalKeybindingsAction, OpenSettings2Action } from 'vs/workbench/parts/preferences/browser/preferencesActions';
 import {
 	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, SETTINGS_EDITOR_COMMAND_SEARCH, CONTEXT_SETTINGS_EDITOR, SETTINGS_EDITOR_COMMAND_FOCUS_FILE, CONTEXT_SETTINGS_SEARCH_FOCUS, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_FOCUS_NEXT_SETTING, SETTINGS_EDITOR_COMMAND_FOCUS_PREVIOUS_SETTING, SETTINGS_EDITOR_COMMAND_EDIT_FOCUSED_SETTING
+	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, SETTINGS_EDITOR_COMMAND_SEARCH, CONTEXT_SETTINGS_EDITOR, SETTINGS_EDITOR_COMMAND_FOCUS_FILE, CONTEXT_SETTINGS_SEARCH_FOCUS, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_FOCUS_NEXT_SETTING, SETTINGS_EDITOR_COMMAND_FOCUS_PREVIOUS_SETTING, SETTINGS_EDITOR_COMMAND_EDIT_FOCUSED_SETTING, SETTINGS_EDITOR_COMMAND_FOCUS_SEARCH_FROM_SETTINGS, SETTINGS_EDITOR_COMMAND_FOCUS_SETTINGS_FROM_SEARCH, CONTEXT_SETTINGS_FIRST_ROW_FOCUS, CONTEXT_SETTINGS_ROW_FOCUS, CONTEXT_TOC_ROW_FOCUS, SETTINGS_EDITOR_COMMAND_FOCUS_SETTINGS_LIST
 } from 'vs/workbench/parts/preferences/common/preferences';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
@@ -239,7 +239,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
 	when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS),
 	primary: KeyMod.CtrlCmd | KeyCode.KEY_F,
-	handler: (accessor, args: any) => (accessor.get(IEditorService).activeControl as IKeybindingsEditor).search('')
+	handler: (accessor, args: any) => (accessor.get(IEditorService).activeControl as IKeybindingsEditor).focusSearch()
 });
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -346,7 +346,6 @@ class StartSearchDefaultSettingsCommand extends SettingsCommand {
 			preferencesEditor.focusSearch();
 		}
 	}
-
 }
 const startSearchCommand = new StartSearchDefaultSettingsCommand({
 	id: SETTINGS_EDITOR_COMMAND_SEARCH,
@@ -355,6 +354,23 @@ const startSearchCommand = new StartSearchDefaultSettingsCommand({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule(startSearchCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
 
+class FocusSearchFromSettingsCommand extends SettingsCommand {
+
+	public runCommand(accessor: ServicesAccessor, args: any): void {
+		const preferencesEditor = this.getPreferencesEditor(accessor);
+		if (preferencesEditor) {
+			preferencesEditor.focusSearch();
+		}
+	}
+}
+const focusSearchFromSettingsCommand = new FocusSearchFromSettingsCommand({
+	id: SETTINGS_EDITOR_COMMAND_FOCUS_SEARCH_FROM_SETTINGS,
+	precondition: ContextKeyExpr.and(CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_FIRST_ROW_FOCUS),
+	kbOpts: { primary: KeyCode.UpArrow }
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule(focusSearchFromSettingsCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.workbenchContrib()));
+
+
 class ClearSearchResultsCommand extends SettingsCommand {
 
 	public runCommand(accessor: ServicesAccessor, args: any): void {
@@ -363,7 +379,6 @@ class ClearSearchResultsCommand extends SettingsCommand {
 			preferencesEditor.clearSearchResults();
 		}
 	}
-
 }
 const clearSearchResultsCommand = new ClearSearchResultsCommand({
 	id: SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS,
@@ -378,9 +393,10 @@ class FocusSettingsFileEditorCommand extends SettingsCommand {
 		const preferencesEditor = this.getPreferencesEditor(accessor);
 		if (preferencesEditor instanceof PreferencesEditor) {
 			preferencesEditor.focusSettingsFileEditor();
+		} else {
+			preferencesEditor.focusSettings();
 		}
 	}
-
 }
 const focusSettingsFileEditorCommand = new FocusSettingsFileEditorCommand({
 	id: SETTINGS_EDITOR_COMMAND_FOCUS_FILE,
@@ -389,6 +405,13 @@ const focusSettingsFileEditorCommand = new FocusSettingsFileEditorCommand({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule(focusSettingsFileEditorCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
 
+const focusSettingsFromSearchCommand = new FocusSettingsFileEditorCommand({
+	id: SETTINGS_EDITOR_COMMAND_FOCUS_SETTINGS_FROM_SEARCH,
+	precondition: CONTEXT_SETTINGS_SEARCH_FOCUS,
+	kbOpts: { primary: KeyCode.DownArrow }
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule(focusSettingsFromSearchCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.workbenchContrib()));
+
 class FocusNextSearchResultCommand extends SettingsCommand {
 
 	public runCommand(accessor: ServicesAccessor, args: any): void {
@@ -397,7 +420,6 @@ class FocusNextSearchResultCommand extends SettingsCommand {
 			preferencesEditor.focusNextResult();
 		}
 	}
-
 }
 const focusNextSearchResultCommand = new FocusNextSearchResultCommand({
 	id: SETTINGS_EDITOR_COMMAND_FOCUS_NEXT_SETTING,
@@ -414,7 +436,6 @@ class FocusPreviousSearchResultCommand extends SettingsCommand {
 			preferencesEditor.focusPreviousResult();
 		}
 	}
-
 }
 const focusPreviousSearchResultCommand = new FocusPreviousSearchResultCommand({
 	id: SETTINGS_EDITOR_COMMAND_FOCUS_PREVIOUS_SETTING,
@@ -431,7 +452,6 @@ class EditFocusedSettingCommand extends SettingsCommand {
 			preferencesEditor.editFocusedPreference();
 		}
 	}
-
 }
 const editFocusedSettingCommand = new EditFocusedSettingCommand({
 	id: SETTINGS_EDITOR_COMMAND_EDIT_FOCUSED_SETTING,
@@ -439,3 +459,37 @@ const editFocusedSettingCommand = new EditFocusedSettingCommand({
 	kbOpts: { primary: KeyMod.CtrlCmd | KeyCode.US_DOT }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule(editFocusedSettingCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
+
+class EditFocusedSettingCommand2 extends SettingsCommand {
+
+	public runCommand(accessor: ServicesAccessor, args: any): void {
+		const preferencesEditor = this.getPreferencesEditor(accessor);
+		if (preferencesEditor instanceof SettingsEditor2) {
+			preferencesEditor.editSelectedSetting();
+		}
+	}
+}
+
+const editFocusedSettingCommand2 = new EditFocusedSettingCommand2({
+	id: SETTINGS_EDITOR_COMMAND_EDIT_FOCUSED_SETTING,
+	precondition: ContextKeyExpr.and(CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_ROW_FOCUS),
+	kbOpts: { primary: KeyCode.Enter }
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule(editFocusedSettingCommand2.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.workbenchContrib()));
+
+class FocusSettingsListCommand extends SettingsCommand {
+
+	public runCommand(accessor: ServicesAccessor, args: any): void {
+		const preferencesEditor = this.getPreferencesEditor(accessor);
+		if (preferencesEditor instanceof SettingsEditor2) {
+			preferencesEditor.focusSettings();
+		}
+	}
+}
+
+const focusSettingsListCommand = new FocusSettingsListCommand({
+	id: SETTINGS_EDITOR_COMMAND_FOCUS_SETTINGS_LIST,
+	precondition: ContextKeyExpr.and(CONTEXT_SETTINGS_EDITOR, CONTEXT_TOC_ROW_FOCUS),
+	kbOpts: { primary: KeyCode.Enter }
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule(focusSettingsListCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.workbenchContrib()));
diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
index 3b40c62f656..f0037613a93 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
@@ -155,7 +155,7 @@ class RemoteSearchProvider implements ISearchProvider {
 		@ILogService private logService: ILogService
 	) {
 		this._remoteSearchP = this.options.filter ?
-			this.getSettingsForFilter(this.options.filter) :
+			TPromise.wrap(this.getSettingsForFilter(this.options.filter)) :
 			TPromise.wrap(null);
 	}
 
@@ -196,7 +196,7 @@ class RemoteSearchProvider implements ISearchProvider {
 		});
 	}
 
-	private async getSettingsForFilter(filter: string): TPromise<IFilterMetadata> {
+	private async getSettingsForFilter(filter: string): Promise<IFilterMetadata> {
 		const allRequestDetails: IBingRequestDetails[] = [];
 
 		// Only send MAX_REQUESTS requests in total just to keep it sane
@@ -308,7 +308,7 @@ class RemoteSearchProvider implements ISearchProvider {
 		};
 	}
 
-	private async prepareRequest(query: string, filterPage = 0): TPromise<IBingRequestDetails> {
+	private async prepareRequest(query: string, filterPage = 0): Promise<IBingRequestDetails> {
 		const verbatimQuery = query;
 		query = escapeSpecialChars(query);
 		const boost = 10;
@@ -526,4 +526,4 @@ class SettingMatches {
 			endColumn: setting.valueRange.startColumn + match.end + 1
 		};
 	}
-}
\ 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 0e1dd8af193..e76351076f2 100644
--- a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
@@ -58,7 +58,7 @@ function resolveCommandHistory(configurationService: IConfigurationService): num
 
 class CommandsHistory {
 
-	public static readonly DEFAULT_COMMANDS_HISTORY_LENGTH = 50;
+	static readonly DEFAULT_COMMANDS_HISTORY_LENGTH = 50;
 
 	private static readonly PREF_KEY_CACHE = 'commandPalette.mru.cache';
 	private static readonly PREF_KEY_COUNTER = 'commandPalette.mru.counter';
@@ -120,20 +120,20 @@ class CommandsHistory {
 		this.storageService.store(CommandsHistory.PREF_KEY_COUNTER, commandCounter);
 	}
 
-	public push(commandId: string): void {
+	push(commandId: string): void {
 		// set counter to command
 		commandHistory.set(commandId, commandCounter++);
 	}
 
-	public peek(commandId: string): number {
+	peek(commandId: string): number {
 		return commandHistory.peek(commandId);
 	}
 }
 
 export class ShowAllCommandsAction extends Action {
 
-	public static readonly ID = 'workbench.action.showCommands';
-	public static readonly LABEL = nls.localize('showTriggerActions', "Show All Commands");
+	static readonly ID = 'workbench.action.showCommands';
+	static readonly LABEL = nls.localize('showTriggerActions', "Show All Commands");
 
 	constructor(
 		id: string,
@@ -144,7 +144,7 @@ export class ShowAllCommandsAction extends Action {
 		super(id, label);
 	}
 
-	public run(context?: any): TPromise<void> {
+	run(context?: any): TPromise<void> {
 		const config = <IWorkbenchQuickOpenConfiguration>this.configurationService.getValue();
 		const restoreInput = config.workbench && config.workbench.commandPalette && config.workbench.commandPalette.preserveInput === true;
 
@@ -162,8 +162,8 @@ export class ShowAllCommandsAction extends Action {
 
 export class ClearCommandHistoryAction extends Action {
 
-	public static readonly ID = 'workbench.action.clearCommandHistory';
-	public static readonly LABEL = nls.localize('clearCommandHistory', "Clear Command History");
+	static readonly ID = 'workbench.action.clearCommandHistory';
+	static readonly LABEL = nls.localize('clearCommandHistory', "Clear Command History");
 
 	constructor(
 		id: string,
@@ -173,7 +173,7 @@ export class ClearCommandHistoryAction extends Action {
 		super(id, label);
 	}
 
-	public run(context?: any): TPromise<void> {
+	run(context?: any): TPromise<void> {
 		const commandHistoryLength = resolveCommandHistory(this.configurationService);
 		if (commandHistoryLength > 0) {
 			commandHistory = new LRUCache<string, number>(commandHistoryLength);
@@ -199,7 +199,7 @@ class CommandPaletteEditorAction extends EditorAction {
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): TPromise<void> {
+	run(accessor: ServicesAccessor, editor: ICodeEditor): TPromise<void> {
 		const quickOpenService = accessor.get(IQuickOpenService);
 
 		// Show with prefix
@@ -239,35 +239,35 @@ abstract class BaseCommandEntry extends QuickOpenEntryGroup {
 		this.setHighlights(highlights.label, null, highlights.alias);
 	}
 
-	public getCommandId(): string {
+	getCommandId(): string {
 		return this.commandId;
 	}
 
-	public getLabel(): string {
+	getLabel(): string {
 		return this.label;
 	}
 
-	public getSortLabel(): string {
+	getSortLabel(): string {
 		return this.labelLowercase;
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.description;
 	}
 
-	public setDescription(description: string): void {
+	setDescription(description: string): void {
 		this.description = description;
 	}
 
-	public getKeybinding(): ResolvedKeybinding {
+	getKeybinding(): ResolvedKeybinding {
 		return this.keybinding;
 	}
 
-	public getDetail(): string {
+	getDetail(): string {
 		return this.alias;
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		if (this.keybindingAriaLabel) {
 			return nls.localize('entryAriaLabelWithKey', "{0}, {1}, commands", this.getLabel(), this.keybindingAriaLabel);
 		}
@@ -275,7 +275,7 @@ abstract class BaseCommandEntry extends QuickOpenEntryGroup {
 		return nls.localize('entryAriaLabel', "{0}, commands", this.getLabel());
 	}
 
-	public run(mode: Mode, context: IEntryRunContext): boolean {
+	run(mode: Mode, context: IEntryRunContext): boolean {
 		if (mode === Mode.OPEN) {
 			this.runAction(this.getAction());
 
@@ -372,7 +372,7 @@ const wordFilter = or(matchesPrefix, matchesWords, matchesContiguousSubString);
 
 export class CommandsHandler extends QuickOpenHandler {
 
-	public static readonly ID = 'workbench.picker.commands';
+	static readonly ID = 'workbench.picker.commands';
 
 	private lastSearchValue: string;
 	private commandHistoryEnabled: boolean;
@@ -397,7 +397,7 @@ export class CommandsHandler extends QuickOpenHandler {
 		this.commandHistoryEnabled = resolveCommandHistory(this.configurationService) > 0;
 	}
 
-	public getResults(searchValue: string): TPromise<QuickOpenModel> {
+	getResults(searchValue: string): TPromise<QuickOpenModel> {
 		searchValue = searchValue.trim();
 		this.lastSearchValue = searchValue;
 
@@ -412,7 +412,7 @@ export class CommandsHandler extends QuickOpenHandler {
 
 		// Other Actions
 		const menu = this.editorService.invokeWithinEditorContext(accessor => this.menuService.createMenu(MenuId.CommandPalette, accessor.get(IContextKeyService)));
-		const menuActions = menu.getActions().reduce((r, [, actions]) => [...r, ...actions], <MenuItemAction[]>[]);
+		const menuActions = menu.getActions().reduce((r, [, actions]) => [...r, ...actions], <MenuItemAction[]>[]).filter(action => action instanceof MenuItemAction) as MenuItemAction[];
 		const commandEntries = this.menuItemActionsToEntries(menuActions, searchValue);
 
 		// Concat
@@ -540,7 +540,7 @@ export class CommandsHandler extends QuickOpenHandler {
 		return entries;
 	}
 
-	public getAutoFocus(searchValue: string, context: { model: IModel<QuickOpenEntry>, quickNavigateConfiguration?: IQuickNavigateConfiguration }): IAutoFocus {
+	getAutoFocus(searchValue: string, context: { model: IModel<QuickOpenEntry>, quickNavigateConfiguration?: IQuickNavigateConfiguration }): IAutoFocus {
 		let autoFocusPrefixMatch = searchValue.trim();
 
 		if (autoFocusPrefixMatch && this.commandHistoryEnabled) {
@@ -556,11 +556,11 @@ export class CommandsHandler extends QuickOpenHandler {
 		};
 	}
 
-	public getEmptyLabel(searchString: string): string {
+	getEmptyLabel(searchString: string): string {
 		return nls.localize('noCommandsMatching', "No commands matching");
 	}
 
-	public onClose(canceled: boolean): void {
+	onClose(canceled: boolean): void {
 		if (canceled) {
 			lastCommandPaletteInput = void 0; // clear last input when user canceled quick open
 		}
diff --git a/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts
index d858f369bd9..2266eddb28e 100644
--- a/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts
@@ -22,13 +22,14 @@ import { IEditorOptions, RenderLineNumbersType } from 'vs/editor/common/config/e
 import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 import { isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
 import { IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService';
+import { once } from 'vs/base/common/event';
 
 export const GOTO_LINE_PREFIX = ':';
 
 export class GotoLineAction extends QuickOpenAction {
 
-	public static readonly ID = 'workbench.action.gotoLine';
-	public static readonly LABEL = nls.localize('gotoLine', "Go to Line...");
+	static readonly ID = 'workbench.action.gotoLine';
+	static readonly LABEL = nls.localize('gotoLine', "Go to Line...");
 
 	constructor(actionId: string, actionLabel: string,
 		@IQuickOpenService private readonly _quickOpenService: IQuickOpenService,
@@ -37,7 +38,7 @@ export class GotoLineAction extends QuickOpenAction {
 		super(actionId, actionLabel, GOTO_LINE_PREFIX, _quickOpenService);
 	}
 
-	public run(): TPromise<void> {
+	run(): TPromise<void> {
 
 		let activeTextEditorWidget = this.editorService.activeTextEditorWidget;
 		if (isDiffEditor(activeTextEditorWidget)) {
@@ -60,12 +61,7 @@ export class GotoLineAction extends QuickOpenAction {
 		const result = super.run();
 
 		if (restoreOptions) {
-			let toDispose = this._quickOpenService.onHide(() => {
-				if (!toDispose) {
-					return;
-				}
-				toDispose.dispose();
-				toDispose = null;
+			once(this._quickOpenService.onHide)(() => {
 				activeTextEditorWidget.updateOptions(restoreOptions);
 			});
 		}
@@ -92,7 +88,7 @@ class GotoLineEntry extends EditorQuickOpenEntry {
 		this.column = numbers[1];
 	}
 
-	public getLabel(): string {
+	getLabel(): string {
 
 		// Inform user about valid range if input is invalid
 		const maxLineNumber = this.getMaxLineNumber();
@@ -123,7 +119,7 @@ class GotoLineEntry extends EditorQuickOpenEntry {
 		return model && types.isFunction((<ITextModel>model).getLineCount) ? (<ITextModel>model).getLineCount() : -1;
 	}
 
-	public run(mode: Mode, context: IEntryRunContext): boolean {
+	run(mode: Mode, context: IEntryRunContext): boolean {
 		if (mode === Mode.OPEN) {
 			return this.runOpen(context);
 		}
@@ -131,18 +127,18 @@ class GotoLineEntry extends EditorQuickOpenEntry {
 		return this.runPreview();
 	}
 
-	public getInput(): IEditorInput {
+	getInput(): IEditorInput {
 		return this.editorService.activeEditor;
 	}
 
-	public getOptions(pinned?: boolean): ITextEditorOptions {
+	getOptions(pinned?: boolean): ITextEditorOptions {
 		return {
 			selection: this.toSelection(),
 			pinned
 		};
 	}
 
-	public runOpen(context: IEntryRunContext): boolean {
+	runOpen(context: IEntryRunContext): boolean {
 
 		// No-op if range is not valid
 		if (this.invalidRange()) {
@@ -166,7 +162,7 @@ class GotoLineEntry extends EditorQuickOpenEntry {
 		return true;
 	}
 
-	public runPreview(): boolean {
+	runPreview(): boolean {
 
 		// No-op if range is not valid
 		if (this.invalidRange()) {
@@ -208,7 +204,7 @@ interface IEditorLineDecoration {
 
 export class GotoLineHandler extends QuickOpenHandler {
 
-	public static readonly ID = 'workbench.picker.line';
+	static readonly ID = 'workbench.picker.line';
 
 	private rangeHighlightDecorationId: IEditorLineDecoration;
 	private lastKnownEditorViewState: IEditorViewState;
@@ -217,11 +213,11 @@ export class GotoLineHandler extends QuickOpenHandler {
 		super();
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return nls.localize('gotoLineHandlerAriaLabel', "Type a line number to navigate to.");
 	}
 
-	public getResults(searchValue: string): TPromise<QuickOpenModel> {
+	getResults(searchValue: string): TPromise<QuickOpenModel> {
 		searchValue = searchValue.trim();
 
 		// Remember view state to be able to restore on cancel
@@ -233,13 +229,13 @@ export class GotoLineHandler extends QuickOpenHandler {
 		return TPromise.as(new QuickOpenModel([new GotoLineEntry(searchValue, this.editorService, this)]));
 	}
 
-	public canRun(): boolean | string {
+	canRun(): boolean | string {
 		const canRun = !!this.editorService.activeTextEditorWidget;
 
 		return canRun ? true : nls.localize('cannotRunGotoLine', "Open a text file first to go to a line");
 	}
 
-	public decorateOutline(range: IRange, editor: IEditor, group: IEditorGroup): void {
+	decorateOutline(range: IRange, editor: IEditor, group: IEditorGroup): void {
 		editor.changeDecorations(changeAccessor => {
 			const deleteDecorations: string[] = [];
 
@@ -284,7 +280,7 @@ export class GotoLineHandler extends QuickOpenHandler {
 		});
 	}
 
-	public clearDecorations(): void {
+	clearDecorations(): void {
 		if (this.rangeHighlightDecorationId) {
 			this.editorService.visibleControls.forEach(editor => {
 				if (editor.group.id === this.rangeHighlightDecorationId.groupId) {
@@ -302,7 +298,7 @@ export class GotoLineHandler extends QuickOpenHandler {
 		}
 	}
 
-	public onClose(canceled: boolean): void {
+	onClose(canceled: boolean): void {
 
 		// Clear Highlight Decorations if present
 		this.clearDecorations();
@@ -318,7 +314,7 @@ export class GotoLineHandler extends QuickOpenHandler {
 		this.lastKnownEditorViewState = null;
 	}
 
-	public getAutoFocus(searchValue: string): IAutoFocus {
+	getAutoFocus(searchValue: string): IAutoFocus {
 		return {
 			autoFocusFirstEntry: searchValue.trim().length > 0
 		};
diff --git a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
index 2b3c830602a..32464070e4e 100644
--- a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
@@ -32,8 +32,8 @@ export const SCOPE_PREFIX = ':';
 
 export class GotoSymbolAction extends QuickOpenAction {
 
-	public static readonly ID = 'workbench.action.gotoSymbol';
-	public static readonly LABEL = nls.localize('gotoSymbol', "Go to Symbol in File...");
+	static readonly ID = 'workbench.action.gotoSymbol';
+	static readonly LABEL = nls.localize('gotoSymbol', "Go to Symbol in File...");
 
 	constructor(actionId: string, actionLabel: string, @IQuickOpenService quickOpenService: IQuickOpenService) {
 		super(actionId, actionLabel, GOTO_SYMBOL_PREFIX, quickOpenService);
@@ -42,7 +42,7 @@ export class GotoSymbolAction extends QuickOpenAction {
 
 class OutlineModel extends QuickOpenModel {
 
-	public applyFilter(searchValue: string): void {
+	applyFilter(searchValue: string): void {
 
 		// Normalize search
 		let normalizedSearchValue = searchValue;
@@ -255,46 +255,46 @@ class SymbolEntry extends EditorQuickOpenEntryGroup {
 		this.handler = handler;
 	}
 
-	public getIndex(): number {
+	getIndex(): number {
 		return this.index;
 	}
 
-	public getLabel(): string {
+	getLabel(): string {
 		return this.name;
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return nls.localize('entryAriaLabel', "{0}, symbols", this.getLabel());
 	}
 
-	public getIcon(): string {
+	getIcon(): string {
 		return this.icon;
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.description;
 	}
 
-	public getType(): string {
+	getType(): string {
 		return this.type;
 	}
 
-	public getRange(): IRange {
+	getRange(): IRange {
 		return this.range;
 	}
 
-	public getInput(): IEditorInput {
+	getInput(): IEditorInput {
 		return this.editorService.activeEditor;
 	}
 
-	public getOptions(pinned?: boolean): ITextEditorOptions {
+	getOptions(pinned?: boolean): ITextEditorOptions {
 		return {
 			selection: this.toSelection(),
 			pinned
 		};
 	}
 
-	public run(mode: Mode, context: IEntryRunContext): boolean {
+	run(mode: Mode, context: IEntryRunContext): boolean {
 		if (mode === Mode.OPEN) {
 			return this.runOpen(context);
 		}
@@ -358,7 +358,7 @@ interface IEditorLineDecoration {
 
 export class GotoSymbolHandler extends QuickOpenHandler {
 
-	public static readonly ID = 'workbench.picker.filesymbols';
+	static readonly ID = 'workbench.picker.filesymbols';
 
 	private outlineToModelCache: { [modelId: string]: OutlineModel; };
 	private rangeHighlightDecorationId: IEditorLineDecoration;
@@ -373,7 +373,7 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 		this.outlineToModelCache = {};
 	}
 
-	public getResults(searchValue: string): TPromise<QuickOpenModel> {
+	getResults(searchValue: string): TPromise<QuickOpenModel> {
 		searchValue = searchValue.trim();
 
 		// Remember view state to be able to restore on cancel
@@ -392,7 +392,7 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 		});
 	}
 
-	public getEmptyLabel(searchString: string): string {
+	getEmptyLabel(searchString: string): string {
 		if (searchString.length > 0) {
 			return nls.localize('noSymbolsMatching', "No symbols matching");
 		}
@@ -400,11 +400,11 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 		return nls.localize('noSymbolsFound', "No symbols found");
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return nls.localize('gotoSymbolHandlerAriaLabel', "Type to narrow down symbols of the currently active editor.");
 	}
 
-	public canRun(): boolean | string {
+	canRun(): boolean | string {
 		let canRun = false;
 
 		const activeTextEditorWidget = this.editorService.activeTextEditorWidget;
@@ -422,7 +422,7 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 		return canRun ? true : activeTextEditorWidget !== null ? nls.localize('cannotRunGotoSymbolInFile', "No symbol information for the file") : nls.localize('cannotRunGotoSymbol', "Open a text file first to go to a symbol");
 	}
 
-	public getAutoFocus(searchValue: string): IAutoFocus {
+	getAutoFocus(searchValue: string): IAutoFocus {
 		searchValue = searchValue.trim();
 
 		// Remove any type pattern (:) from search value as needed
@@ -496,7 +496,7 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 		return TPromise.wrap<OutlineModel>(null);
 	}
 
-	public decorateOutline(fullRange: IRange, startRange: IRange, editor: IEditor, group: IEditorGroup): void {
+	decorateOutline(fullRange: IRange, startRange: IRange, editor: IEditor, group: IEditorGroup): void {
 		editor.changeDecorations((changeAccessor: IModelDecorationsChangeAccessor) => {
 			const deleteDecorations: string[] = [];
 
@@ -543,7 +543,7 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 		});
 	}
 
-	public clearDecorations(): void {
+	clearDecorations(): void {
 		if (this.rangeHighlightDecorationId) {
 			this.editorService.visibleControls.forEach(editor => {
 				if (editor.group.id === this.rangeHighlightDecorationId.groupId) {
@@ -561,7 +561,7 @@ export class GotoSymbolHandler extends QuickOpenHandler {
 		}
 	}
 
-	public onClose(canceled: boolean): void {
+	onClose(canceled: boolean): void {
 
 		// Clear Cache
 		this.outlineToModelCache = {};
diff --git a/src/vs/workbench/parts/quickopen/browser/helpHandler.ts b/src/vs/workbench/parts/quickopen/browser/helpHandler.ts
index 51881cef7dd..d862f057225 100644
--- a/src/vs/workbench/parts/quickopen/browser/helpHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/helpHandler.ts
@@ -10,7 +10,7 @@ import * as types from 'vs/base/common/types';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Mode, IEntryRunContext, IAutoFocus } from 'vs/base/parts/quickopen/common/quickOpen';
 import { QuickOpenModel, QuickOpenEntryGroup } from 'vs/base/parts/quickopen/browser/quickOpenModel';
-import { IQuickOpenRegistry, Extensions, QuickOpenHandler } from 'vs/workbench/browser/quickopen';
+import { IQuickOpenRegistry, Extensions, QuickOpenHandler, QuickOpenHandlerDescriptor, QuickOpenHandlerHelpEntry } from 'vs/workbench/browser/quickopen';
 import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 
 export const HELP_PREFIX = '?';
@@ -37,19 +37,19 @@ class HelpEntry extends QuickOpenEntryGroup {
 		this.openOnPreview = openOnPreview;
 	}
 
-	public getLabel(): string {
+	getLabel(): string {
 		return this.prefixLabel;
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return nls.localize('entryAriaLabel', "{0}, picker help", this.getLabel());
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.description;
 	}
 
-	public run(mode: Mode, context: IEntryRunContext): boolean {
+	run(mode: Mode, context: IEntryRunContext): boolean {
 		if (mode === Mode.OPEN || this.openOnPreview) {
 			this.quickOpenService.show(this.prefix);
 		}
@@ -60,13 +60,13 @@ class HelpEntry extends QuickOpenEntryGroup {
 
 export class HelpHandler extends QuickOpenHandler {
 
-	public static readonly ID = 'workbench.picker.help';
+	static readonly ID = 'workbench.picker.help';
 
 	constructor(@IQuickOpenService private quickOpenService: IQuickOpenService) {
 		super();
 	}
 
-	public getResults(searchValue: string): TPromise<QuickOpenModel> {
+	getResults(searchValue: string): TPromise<QuickOpenModel> {
 		searchValue = searchValue.trim();
 
 		const registry = (Registry.as<IQuickOpenRegistry>(Extensions.Quickopen));
@@ -79,9 +79,9 @@ export class HelpHandler extends QuickOpenHandler {
 
 		const workbenchScoped: HelpEntry[] = [];
 		const editorScoped: HelpEntry[] = [];
-		let entry: HelpEntry;
 
-		handlerDescriptors.sort((h1, h2) => h1.prefix.localeCompare(h2.prefix)).forEach((handlerDescriptor) => {
+		const matchingHandlers: (QuickOpenHandlerHelpEntry | QuickOpenHandlerDescriptor)[] = [];
+		handlerDescriptors.sort((h1, h2) => h1.prefix.localeCompare(h2.prefix)).forEach(handlerDescriptor => {
 			if (handlerDescriptor.prefix !== HELP_PREFIX) {
 
 				// Descriptor has multiple help entries
@@ -90,19 +90,26 @@ export class HelpHandler extends QuickOpenHandler {
 						const helpEntry = handlerDescriptor.helpEntries[j];
 
 						if (helpEntry.prefix.indexOf(searchValue) === 0) {
-							entry = new HelpEntry(helpEntry.prefix, helpEntry.description, this.quickOpenService, searchValue.length > 0);
-							if (helpEntry.needsEditor) {
-								editorScoped.push(entry);
-							} else {
-								workbenchScoped.push(entry);
-							}
+							matchingHandlers.push(helpEntry);
 						}
 					}
 				}
 
 				// Single Help entry for descriptor
 				else if (handlerDescriptor.prefix.indexOf(searchValue) === 0) {
-					entry = new HelpEntry(handlerDescriptor.prefix, handlerDescriptor.description, this.quickOpenService, searchValue.length > 0);
+					matchingHandlers.push(handlerDescriptor);
+				}
+			}
+		});
+
+		matchingHandlers.forEach(handler => {
+			if (handler instanceof QuickOpenHandlerDescriptor) {
+				workbenchScoped.push(new HelpEntry(handler.prefix, handler.description, this.quickOpenService, matchingHandlers.length === 1));
+			} else {
+				const entry = new HelpEntry(handler.prefix, handler.description, this.quickOpenService, matchingHandlers.length === 1);
+				if (handler.needsEditor) {
+					editorScoped.push(entry);
+				} else {
 					workbenchScoped.push(entry);
 				}
 			}
@@ -124,7 +131,7 @@ export class HelpHandler extends QuickOpenHandler {
 		return TPromise.as(new QuickOpenModel([...workbenchScoped, ...editorScoped]));
 	}
 
-	public getAutoFocus(searchValue: string): IAutoFocus {
+	getAutoFocus(searchValue: string): IAutoFocus {
 		searchValue = searchValue.trim();
 		return {
 			autoFocusFirstEntry: searchValue.length > 0,
diff --git a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts
index 711590c7b4a..d10d6982577 100644
--- a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts
@@ -36,19 +36,19 @@ export class ViewEntry extends QuickOpenEntryGroup {
 		super();
 	}
 
-	public getLabel(): string {
+	getLabel(): string {
 		return this.label;
 	}
 
-	public getCategory(): string {
+	getCategory(): string {
 		return this.category;
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return nls.localize('entryAriaLabel', "{0}, view picker", this.getLabel());
 	}
 
-	public run(mode: Mode, context: IEntryRunContext): boolean {
+	run(mode: Mode, context: IEntryRunContext): boolean {
 		if (mode === Mode.OPEN) {
 			return this.runOpen(context);
 		}
@@ -67,7 +67,7 @@ export class ViewEntry extends QuickOpenEntryGroup {
 
 export class ViewPickerHandler extends QuickOpenHandler {
 
-	public static readonly ID = 'workbench.picker.views';
+	static readonly ID = 'workbench.picker.views';
 
 	constructor(
 		@IViewletService private viewletService: IViewletService,
@@ -80,7 +80,7 @@ export class ViewPickerHandler extends QuickOpenHandler {
 		super();
 	}
 
-	public getResults(searchValue: string): TPromise<QuickOpenModel> {
+	getResults(searchValue: string): TPromise<QuickOpenModel> {
 		searchValue = searchValue.trim();
 		const normalizedSearchValueLowercase = stripWildcards(searchValue).toLowerCase();
 
@@ -179,7 +179,7 @@ export class ViewPickerHandler extends QuickOpenHandler {
 		return viewEntries;
 	}
 
-	public getAutoFocus(searchValue: string, context: { model: IModel<QuickOpenEntry>, quickNavigateConfiguration?: IQuickNavigateConfiguration }): IAutoFocus {
+	getAutoFocus(searchValue: string, context: { model: IModel<QuickOpenEntry>, quickNavigateConfiguration?: IQuickNavigateConfiguration }): IAutoFocus {
 		return {
 			autoFocusFirstEntry: !!searchValue || !!context.quickNavigateConfiguration
 		};
@@ -188,8 +188,8 @@ export class ViewPickerHandler extends QuickOpenHandler {
 
 export class OpenViewPickerAction extends QuickOpenAction {
 
-	public static readonly ID = 'workbench.action.openView';
-	public static readonly LABEL = nls.localize('openView', "Open View");
+	static readonly ID = 'workbench.action.openView';
+	static readonly LABEL = nls.localize('openView', "Open View");
 
 	constructor(
 		id: string,
@@ -202,8 +202,8 @@ export class OpenViewPickerAction extends QuickOpenAction {
 
 export class QuickOpenViewPickerAction extends Action {
 
-	public static readonly ID = 'workbench.action.quickOpenView';
-	public static readonly LABEL = nls.localize('quickOpenView', "Quick Open View");
+	static readonly ID = 'workbench.action.quickOpenView';
+	static readonly LABEL = nls.localize('quickOpenView', "Quick Open View");
 
 	constructor(
 		id: string,
@@ -214,7 +214,7 @@ export class QuickOpenViewPickerAction extends Action {
 		super(id, label);
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		const keys = this.keybindingService.lookupKeybindings(this.id);
 
 		this.quickOpenService.show(VIEW_PICKER_PREFIX, { quickNavigateConfiguration: { keybindings: keys } });
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 cc504052f71..67f0b27804f 100644
--- a/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.ts
+++ b/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, Disposable } 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 { IWindowsService, IWindowService, IWindowsConfiguration } from 'vs/platform/windows/common/windows';
@@ -30,9 +30,7 @@ interface IConfiguration extends IWindowsConfiguration {
 	files: { useExperimentalFileWatcher: boolean, watcherExclude: object };
 }
 
-export class SettingsChangeRelauncher implements IWorkbenchContribution {
-
-	private toDispose: IDisposable[] = [];
+export class SettingsChangeRelauncher extends Disposable implements IWorkbenchContribution {
 
 	private titleBarStyle: 'native' | 'custom';
 	private nativeTabs: boolean;
@@ -59,6 +57,8 @@ export class SettingsChangeRelauncher implements IWorkbenchContribution {
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IExtensionService private extensionService: IExtensionService
 	) {
+		super();
+
 		const workspace = this.contextService.getWorkspace();
 		this.firstFolderResource = workspace.folders.length > 0 ? workspace.folders[0].uri : void 0;
 		this.extensionHostRestarter = new RunOnceScheduler(() => this.extensionService.restartExtensionHost(), 10);
@@ -70,8 +70,8 @@ export class SettingsChangeRelauncher implements IWorkbenchContribution {
 	}
 
 	private registerListeners(): void {
-		this.toDispose.push(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChange(this.configurationService.getValue<IConfiguration>(), true)));
-		this.toDispose.push(this.contextService.onDidChangeWorkbenchState(() => setTimeout(() => this.handleWorkbenchState())));
+		this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChange(this.configurationService.getValue<IConfiguration>(), true)));
+		this._register(this.contextService.onDidChangeWorkbenchState(() => setTimeout(() => this.handleWorkbenchState())));
 	}
 
 	private onConfigurationChange(config: IConfiguration, notify: boolean): void {
@@ -201,10 +201,6 @@ export class SettingsChangeRelauncher implements IWorkbenchContribution {
 			return void 0;
 		});
 	}
-
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
-	}
 }
 
 const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
diff --git a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts
index 973f975cb0e..90a6893cdf4 100644
--- a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts
+++ b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts
@@ -8,8 +8,8 @@
 import * as nls from 'vs/nls';
 
 import 'vs/css!./media/dirtydiffDecorator';
-import { ThrottledDelayer, always } from 'vs/base/common/async';
-import { IDisposable, dispose, toDisposable, empty as EmptyDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
+import { ThrottledDelayer, always, first } from 'vs/base/common/async';
+import { IDisposable, dispose, toDisposable, Disposable, combinedDisposable } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Event, Emitter, anyEvent as anyEvent, filterEvent, once } from 'vs/base/common/event';
 import * as ext from 'vs/workbench/common/contributions';
@@ -553,7 +553,7 @@ export class DirtyDiffController implements IEditorContribution {
 	private widget: DirtyDiffWidget | null = null;
 	private currentIndex: number = -1;
 	private readonly isDirtyDiffVisible: IContextKey<boolean>;
-	private session: IDisposable = EmptyDisposable;
+	private session: IDisposable = Disposable.None;
 	private mouseDownInfo: { lineNumber: number } | null = null;
 	private enabled = false;
 	private disposables: IDisposable[] = [];
@@ -611,7 +611,7 @@ export class DirtyDiffController implements IEditorContribution {
 
 	close(): void {
 		this.session.dispose();
-		this.session = EmptyDisposable;
+		this.session = Disposable.None;
 	}
 
 	private assertWidget(): boolean {
@@ -1032,20 +1032,13 @@ export class DirtyDiffModel {
 		});
 	}
 
-	private async getOriginalResource(): TPromise<URI> {
+	private getOriginalResource(): TPromise<URI> {
 		if (!this._editorModel) {
-			return null;
+			return TPromise.as(null);
 		}
 
-		for (const repository of this.scmService.repositories) {
-			const result = repository.provider.getOriginalResource(this._editorModel.uri);
-
-			if (result) {
-				return result;
-			}
-		}
-
-		return null;
+		const uri = this._editorModel.uri;
+		return first(this.scmService.repositories.map(r => () => r.provider.getOriginalResource(uri)));
 	}
 
 	findNextClosestChange(lineNumber: number, inclusive = true): number {
diff --git a/src/vs/workbench/parts/scm/electron-browser/scmActivity.ts b/src/vs/workbench/parts/scm/electron-browser/scmActivity.ts
index 9464225a74d..c0c4f11d15e 100644
--- a/src/vs/workbench/parts/scm/electron-browser/scmActivity.ts
+++ b/src/vs/workbench/parts/scm/electron-browser/scmActivity.ts
@@ -7,7 +7,7 @@
 
 import { localize } from 'vs/nls';
 import { basename } from 'vs/base/common/paths';
-import { IDisposable, dispose, empty as EmptyDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, Disposable, combinedDisposable } from 'vs/base/common/lifecycle';
 import { filterEvent, anyEvent as anyEvent } from 'vs/base/common/event';
 import { VIEWLET_ID } from 'vs/workbench/parts/scm/common/scm';
 import { ISCMService, ISCMRepository } from 'vs/workbench/services/scm/common/scm';
@@ -18,7 +18,7 @@ import { IStatusbarService, StatusbarAlignment as MainThreadStatusBarAlignment }
 
 export class StatusUpdater implements IWorkbenchContribution {
 
-	private badgeDisposable: IDisposable = EmptyDisposable;
+	private badgeDisposable: IDisposable = Disposable.None;
 	private disposables: IDisposable[] = [];
 
 	constructor(
@@ -60,7 +60,7 @@ export class StatusUpdater implements IWorkbenchContribution {
 			const badge = new NumberBadge(count, num => localize('scmPendingChangesBadge', '{0} pending changes', num));
 			this.badgeDisposable = this.activityService.showActivity(VIEWLET_ID, badge, 'scm-viewlet-label');
 		} else {
-			this.badgeDisposable = EmptyDisposable;
+			this.badgeDisposable = Disposable.None;
 		}
 	}
 
@@ -72,8 +72,8 @@ export class StatusUpdater implements IWorkbenchContribution {
 
 export class StatusBarController implements IWorkbenchContribution {
 
-	private statusBarDisposable: IDisposable = EmptyDisposable;
-	private focusDisposable: IDisposable = EmptyDisposable;
+	private statusBarDisposable: IDisposable = Disposable.None;
+	private focusDisposable: IDisposable = Disposable.None;
 	private focusedRepository: ISCMRepository | undefined = undefined;
 	private focusedProviderContextKey: IContextKey<string | undefined>;
 	private disposables: IDisposable[] = [];
diff --git a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
index 980a64faa0a..b369614adb0 100644
--- a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
+++ b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
@@ -12,7 +12,7 @@ import { Event, Emitter, chain, mapEvent, anyEvent, filterEvent, latch } from 'v
 import { domEvent, stop } from 'vs/base/browser/event';
 import { basename } from 'vs/base/common/paths';
 import { onUnexpectedError } from 'vs/base/common/errors';
-import { IDisposable, dispose, combinedDisposable, empty as EmptyDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, combinedDisposable, Disposable, toDisposable } from 'vs/base/common/lifecycle';
 import { PanelViewlet, ViewletPanel, IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelViewlet';
 import { append, $, addClass, toggleClass, trackFocus, Dimension, addDisposableListener } from 'vs/base/browser/dom';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -142,7 +142,7 @@ class ProviderRenderer implements IRenderer<ISCMRepository, RepositoryTemplateDa
 		const count = new CountBadge(countContainer);
 		const badgeStyler = attachBadgeStyler(count, this.themeService);
 		const actionBar = new ActionBar(provider, { actionItemProvider: a => new StatusBarActionItem(a as StatusBarAction) });
-		const disposable = EmptyDisposable;
+		const disposable = Disposable.None;
 		const templateDisposable = combinedDisposable([actionBar, badgeStyler]);
 
 		return { title, type, countContainer, count, actionBar, disposable, templateDisposable };
@@ -389,7 +389,7 @@ class ResourceGroupRenderer implements IRenderer<ISCMResourceGroup, ResourceGrou
 		const countContainer = append(element, $('.count'));
 		const count = new CountBadge(countContainer);
 		const styler = attachBadgeStyler(count, this.themeService);
-		const elementDisposable = EmptyDisposable;
+		const elementDisposable = Disposable.None;
 
 		return {
 			name, count, actionBar, elementDisposable, dispose: () => {
@@ -501,7 +501,7 @@ class ResourceRenderer implements IRenderer<ISCMResource, ResourceTemplate> {
 		const decorationIcon = append(element, $('.decoration-icon'));
 
 		return {
-			element, name, fileLabel, decorationIcon, actionBar, elementDisposable: EmptyDisposable, dispose: () => {
+			element, name, fileLabel, decorationIcon, actionBar, elementDisposable: Disposable.None, dispose: () => {
 				actionBar.dispose();
 				fileLabel.dispose();
 			}
@@ -738,10 +738,6 @@ export class RepositoryPanel extends ViewletPanel {
 	private menus: SCMMenus;
 	private visibilityDisposables: IDisposable[] = [];
 
-	get onDidChangeTitle(): Event<void> {
-		return this.menus.onDidChangeTitle;
-	}
-
 	constructor(
 		id: string,
 		readonly repository: ISCMRepository,
@@ -760,6 +756,7 @@ export class RepositoryPanel extends ViewletPanel {
 	) {
 		super({ id, title: repository.provider.label }, keybindingService, contextMenuService, configurationService);
 		this.menus = instantiationService.createInstance(SCMMenus, repository.provider);
+		this.menus.onDidChangeTitle(this._onDidChangeTitleArea.fire, this._onDidChangeTitleArea, this.disposables);
 	}
 
 	render(): void {
@@ -814,12 +811,9 @@ export class RepositoryPanel extends ViewletPanel {
 			this.inputBox.setPlaceHolder(placeholder);
 		};
 
-		const validationDelayer = new ThrottledDelayer(200);
-
+		const validationDelayer = new ThrottledDelayer<any>(200);
 		const validate = () => {
-			validationDelayer.trigger(async (): TPromise<any> => {
-				const result = await this.repository.input.validateInput(this.inputBox.value, this.inputBox.inputElement.selectionStart);
-
+			return this.repository.input.validateInput(this.inputBox.value, this.inputBox.inputElement.selectionStart).then(result => {
 				if (!result) {
 					this.inputBox.inputElement.removeAttribute('aria-invalid');
 					this.inputBox.hideMessage();
@@ -830,15 +824,17 @@ export class RepositoryPanel extends ViewletPanel {
 			});
 		};
 
+		const triggerValidation = () => validationDelayer.trigger(validate);
+
 		this.inputBox = new InputBox(this.inputBoxContainer, this.contextViewService, { flexibleHeight: true });
 		this.disposables.push(attachInputBoxStyler(this.inputBox, this.themeService));
 		this.disposables.push(this.inputBox);
 
-		this.inputBox.onDidChange(validate, null, this.disposables);
+		this.inputBox.onDidChange(triggerValidation, null, this.disposables);
 
 		const onKeyUp = domEvent(this.inputBox.inputElement, 'keyup');
 		const onMouseUp = domEvent(this.inputBox.inputElement, 'mouseup');
-		anyEvent<any>(onKeyUp, onMouseUp)(() => validate(), null, this.disposables);
+		anyEvent<any>(onKeyUp, onMouseUp)(triggerValidation, null, this.disposables);
 
 		this.inputBox.value = this.repository.input.value;
 		this.inputBox.onDidChange(value => this.repository.input.value = value, null, this.disposables);
@@ -1023,10 +1019,10 @@ export class SCMViewlet extends PanelViewlet implements IViewModel, IViewsViewle
 	private menus: SCMMenus;
 	private mainPanel: MainPanel | null = null;
 	private cachedMainPanelHeight: number | undefined;
-	private mainPanelDisposable: IDisposable = EmptyDisposable;
+	private mainPanelDisposable: IDisposable = Disposable.None;
 	private _repositories: ISCMRepository[] = [];
 	private repositoryPanels: RepositoryPanel[] = [];
-	private singleRepositoryPanelTitleActionsDisposable: IDisposable = EmptyDisposable;
+	private singlePanelTitleActionsDisposable: IDisposable = Disposable.None;
 	private disposables: IDisposable[] = [];
 	private lastFocusedRepository: ISCMRepository | undefined;
 
@@ -1071,37 +1067,37 @@ export class SCMViewlet extends PanelViewlet implements IViewModel, IViewsViewle
 		this.disposables.push(this.contributedViews);
 	}
 
-	async create(parent: HTMLElement): TPromise<void> {
-		await super.create(parent);
+	create(parent: HTMLElement): TPromise<void> {
+		return super.create(parent).then(() => {
+			this.el = parent;
+			addClass(this.el, 'scm-viewlet');
+			addClass(this.el, 'empty');
+			append(parent, $('div.empty-message', null, localize('no open repo', "There are no active source control providers.")));
 
-		this.el = parent;
-		addClass(this.el, 'scm-viewlet');
-		addClass(this.el, 'empty');
-		append(parent, $('div.empty-message', null, localize('no open repo', "There are no active source control providers.")));
+			this.scmService.onDidAddRepository(this.onDidAddRepository, this, this.disposables);
+			this.scmService.onDidRemoveRepository(this.onDidRemoveRepository, this, this.disposables);
+			this.scmService.repositories.forEach(r => this.onDidAddRepository(r));
 
-		this.scmService.onDidAddRepository(this.onDidAddRepository, this, this.disposables);
-		this.scmService.onDidRemoveRepository(this.onDidRemoveRepository, this, this.disposables);
-		this.scmService.repositories.forEach(r => this.onDidAddRepository(r));
+			const onDidUpdateConfiguration = filterEvent(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.alwaysShowProviders'));
+			onDidUpdateConfiguration(this.onDidChangeRepositories, this, this.disposables);
 
-		const onDidUpdateConfiguration = filterEvent(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.alwaysShowProviders'));
-		onDidUpdateConfiguration(this.onDidChangeRepositories, this, this.disposables);
+			this.onDidChangeRepositories();
 
-		this.onDidChangeRepositories();
+			this.contributedViews.onDidAdd(this.onDidAddContributedViews, this, this.disposables);
+			this.contributedViews.onDidRemove(this.onDidRemoveContributedViews, this, this.disposables);
 
-		this.contributedViews.onDidAdd(this.onDidAddContributedViews, this, this.disposables);
-		this.contributedViews.onDidRemove(this.onDidRemoveContributedViews, this, this.disposables);
+			let index = this.getContributedViewsStartIndex();
+			const contributedViews: IAddedViewDescriptorRef[] = this.contributedViews.visibleViewDescriptors.map(viewDescriptor => {
+				const size = this.contributedViews.getSize(viewDescriptor.id);
+				const collapsed = this.contributedViews.isCollapsed(viewDescriptor.id);
+				return { viewDescriptor, index: index++, size, collapsed };
+			});
+			if (contributedViews.length) {
+				this.onDidAddContributedViews(contributedViews);
+			}
 
-		let index = this.getContributedViewsStartIndex();
-		const contributedViews: IAddedViewDescriptorRef[] = this.contributedViews.visibleViewDescriptors.map(viewDescriptor => {
-			const size = this.contributedViews.getSize(viewDescriptor.id);
-			const collapsed = this.contributedViews.isCollapsed(viewDescriptor.id);
-			return { viewDescriptor, index: index++, size, collapsed };
+			this.onDidSashChange(this.saveContributedViewSizes, this, this.disposables);
 		});
-		if (contributedViews.length) {
-			this.onDidAddContributedViews(contributedViews);
-		}
-
-		this.onDidSashChange(this.saveContributedViewSizes, this, this.disposables);
 	}
 
 	private onDidAddRepository(repository: ISCMRepository): void {
@@ -1156,7 +1152,7 @@ export class SCMViewlet extends PanelViewlet implements IViewModel, IViewsViewle
 			});
 		} else {
 			this.mainPanelDisposable.dispose();
-			this.mainPanelDisposable = EmptyDisposable;
+			this.mainPanelDisposable = Disposable.None;
 			this.mainPanel = null;
 		}
 	}
@@ -1303,10 +1299,10 @@ export class SCMViewlet extends PanelViewlet implements IViewModel, IViewsViewle
 
 		// React to menu changes for single view mode
 		if (wasSingleView !== this.isSingleView()) {
-			this.singleRepositoryPanelTitleActionsDisposable.dispose();
+			this.singlePanelTitleActionsDisposable.dispose();
 
 			if (this.isSingleView()) {
-				this.singleRepositoryPanelTitleActionsDisposable = this.repositoryPanels[0].onDidChangeTitle(this.updateTitleArea, this);
+				this.singlePanelTitleActionsDisposable = this.panels[0].onDidChangeTitleArea(this.updateTitleArea, this);
 			}
 
 			this.updateTitleArea();
diff --git a/src/vs/workbench/parts/search/browser/openAnythingHandler.ts b/src/vs/workbench/parts/search/browser/openAnythingHandler.ts
index 90652e6854a..7982ff8e2fc 100644
--- a/src/vs/workbench/parts/search/browser/openAnythingHandler.ts
+++ b/src/vs/workbench/parts/search/browser/openAnythingHandler.ts
@@ -32,7 +32,7 @@ interface ISearchWithRange {
 
 export class OpenAnythingHandler extends QuickOpenHandler {
 
-	public static readonly ID = 'workbench.picker.anything';
+	static readonly ID = 'workbench.picker.anything';
 
 	private static readonly LINE_COLON_PATTERN = /[#|:|\(](\d*)([#|:|,](\d*))?\)?$/;
 
@@ -87,7 +87,7 @@ export class OpenAnythingHandler extends QuickOpenHandler {
 		});
 	}
 
-	public getResults(searchValue: string): TPromise<QuickOpenModel> {
+	getResults(searchValue: string): TPromise<QuickOpenModel> {
 		this.cancelPendingSearch();
 		this.isClosed = false; // Treat this call as the handler being in use
 
@@ -164,7 +164,7 @@ export class OpenAnythingHandler extends QuickOpenHandler {
 		return this.hasShortResponseTime() ? promiseFactory() : this.searchDelayer.trigger(promiseFactory, this.includeSymbols ? OpenAnythingHandler.SYMBOL_SEARCH_DELAY : OpenAnythingHandler.FILE_SEARCH_DELAY);
 	}
 
-	public hasShortResponseTime(): boolean {
+	hasShortResponseTime(): boolean {
 		if (!this.includeSymbols) {
 			return this.openFileHandler.hasShortResponseTime();
 		}
@@ -228,22 +228,22 @@ export class OpenAnythingHandler extends QuickOpenHandler {
 		return null;
 	}
 
-	public getGroupLabel(): string {
+	getGroupLabel(): string {
 		return this.includeSymbols ? nls.localize('fileAndTypeResults', "file and symbol results") : nls.localize('fileResults', "file results");
 	}
 
-	public getAutoFocus(searchValue: string): IAutoFocus {
+	getAutoFocus(searchValue: string): IAutoFocus {
 		return {
 			autoFocusFirstEntry: true
 		};
 	}
 
-	public onOpen(): void {
+	onOpen(): void {
 		this.openSymbolHandler.onOpen();
 		this.openFileHandler.onOpen();
 	}
 
-	public onClose(canceled: boolean): void {
+	onClose(canceled: boolean): void {
 		this.isClosed = true;
 
 		// Cancel any pending search
diff --git a/src/vs/workbench/parts/search/browser/openFileHandler.ts b/src/vs/workbench/parts/search/browser/openFileHandler.ts
index de87f36047e..179ea2e6ec3 100644
--- a/src/vs/workbench/parts/search/browser/openFileHandler.ts
+++ b/src/vs/workbench/parts/search/browser/openFileHandler.ts
@@ -26,7 +26,7 @@ import { EditorInput, IWorkbenchEditorConfiguration } from 'vs/workbench/common/
 import { IResourceInput } from 'vs/platform/editor/common/editor';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IQueryOptions, ISearchService, ISearchStats, ISearchQuery } from 'vs/platform/search/common/search';
+import { IQueryOptions, ISearchService, ISearchStats, ISearchQuery, ISearchComplete } from 'vs/platform/search/common/search';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IRange } from 'vs/editor/common/core/range';
@@ -59,41 +59,41 @@ export class FileEntry extends EditorQuickOpenEntry {
 		super(editorService);
 	}
 
-	public getLabel(): string {
+	getLabel(): string {
 		return this.name;
 	}
 
-	public getLabelOptions(): IIconLabelValueOptions {
+	getLabelOptions(): IIconLabelValueOptions {
 		return {
 			extraClasses: getIconClasses(this.modelService, this.modeService, this.resource)
 		};
 	}
 
-	public getAriaLabel(): string {
+	getAriaLabel(): string {
 		return nls.localize('entryAriaLabel', "{0}, file picker", this.getLabel());
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.description;
 	}
 
-	public getIcon(): string {
+	getIcon(): string {
 		return this.icon;
 	}
 
-	public getResource(): URI {
+	getResource(): URI {
 		return this.resource;
 	}
 
-	public setRange(range: IRange): void {
+	setRange(range: IRange): void {
 		this.range = range;
 	}
 
-	public mergeWithEditorHistory(): boolean {
+	mergeWithEditorHistory(): boolean {
 		return true;
 	}
 
-	public getInput(): IResourceInput | EditorInput {
+	getInput(): IResourceInput | EditorInput {
 		const input: IResourceInput = {
 			resource: this.resource,
 			options: {
@@ -132,11 +132,11 @@ export class OpenFileHandler extends QuickOpenHandler {
 		this.queryBuilder = this.instantiationService.createInstance(QueryBuilder);
 	}
 
-	public setOptions(options: IOpenFileOptions) {
+	setOptions(options: IOpenFileOptions) {
 		this.options = options;
 	}
 
-	public getResults(searchValue: string, maxSortedResults?: number): TPromise<FileQuickOpenModel> {
+	getResults(searchValue: string, maxSortedResults?: number): TPromise<FileQuickOpenModel> {
 		const query = prepareQuery(searchValue);
 
 		// Respond directly to empty search
@@ -152,29 +152,44 @@ export class OpenFileHandler extends QuickOpenHandler {
 	}
 
 	private doFindResults(query: IPreparedQuery, cacheKey?: string, maxSortedResults?: number): TPromise<FileQuickOpenModel> {
-		return this.doResolveQueryOptions(query, cacheKey, maxSortedResults).then(queryOptions => {
-			let iconClass: string;
-			if (this.options && this.options.forceUseIcons && !this.themeService.getFileIconTheme()) {
-				iconClass = 'file'; // only use a generic file icon if we are forced to use an icon and have no icon theme set otherwise
+		const queryOptions = this.doResolveQueryOptions(query, cacheKey, maxSortedResults);
+		let iconClass: string;
+		if (this.options && this.options.forceUseIcons && !this.themeService.getFileIconTheme()) {
+			iconClass = 'file'; // only use a generic file icon if we are forced to use an icon and have no icon theme set otherwise
+		}
+
+		return this.getAbsolutePathResult(query).then(result => {
+			// If the original search value is an existing file on disk, return it immediately and bypass the search service
+			if (result) {
+				return TPromise.wrap(<ISearchComplete>{ results: [{ resource: result }] });
+			} else {
+				return this.searchService.search(this.queryBuilder.file(this.contextService.getWorkspace().folders.map(folder => folder.uri), queryOptions));
+			}
+		}).then(complete => {
+			const results: QuickOpenEntry[] = [];
+			for (let i = 0; i < complete.results.length; i++) {
+				const fileMatch = complete.results[i];
+
+				const label = paths.basename(fileMatch.resource.fsPath);
+				const description = labels.getPathLabel(resources.dirname(fileMatch.resource), this.environmentService, this.contextService);
+
+				results.push(this.instantiationService.createInstance(FileEntry, fileMatch.resource, label, description, iconClass));
 			}
 
-			return this.searchService.search(this.queryBuilder.file(this.contextService.getWorkspace().folders.map(folder => folder.uri), queryOptions)).then(complete => {
-				const results: QuickOpenEntry[] = [];
-				for (let i = 0; i < complete.results.length; i++) {
-					const fileMatch = complete.results[i];
-
-					const label = paths.basename(fileMatch.resource.fsPath);
-					const description = labels.getPathLabel(resources.dirname(fileMatch.resource), this.environmentService, this.contextService);
-
-					results.push(this.instantiationService.createInstance(FileEntry, fileMatch.resource, label, description, iconClass));
-				}
-
-				return new FileQuickOpenModel(results, complete.stats);
-			});
+			return new FileQuickOpenModel(results, complete.stats);
 		});
 	}
 
-	private doResolveQueryOptions(query: IPreparedQuery, cacheKey?: string, maxSortedResults?: number): TPromise<IQueryOptions> {
+	private getAbsolutePathResult(query: IPreparedQuery): TPromise<URI> {
+		if (paths.isAbsolute(query.original)) {
+			const resource = URI.file(query.original);
+			return this.fileService.resolveFile(resource).then(stat => stat.isDirectory ? void 0 : resource, error => void 0);
+		} else {
+			return TPromise.as(null);
+		}
+	}
+
+	private doResolveQueryOptions(query: IPreparedQuery, cacheKey?: string, maxSortedResults?: number): IQueryOptions {
 		const queryOptions: IQueryOptions = {
 			extraFileResources: getOutOfWorkspaceEditorResources(this.editorService, this.contextService),
 			filePattern: query.value,
@@ -186,30 +201,14 @@ export class OpenFileHandler extends QuickOpenHandler {
 			queryOptions.sortByScore = true;
 		}
 
-		let queryIsAbsoluteFilePromise: TPromise<URI>;
-		if (paths.isAbsolute(query.original)) {
-			const resource = URI.file(query.original);
-			queryIsAbsoluteFilePromise = this.fileService.resolveFile(resource).then(stat => stat.isDirectory ? void 0 : resource, error => void 0);
-		} else {
-			queryIsAbsoluteFilePromise = TPromise.as(null);
-		}
-
-		return queryIsAbsoluteFilePromise.then(resource => {
-			if (resource) {
-				// if the original search value is an existing file on disk, add it to the
-				// extra file resources to consider (fixes https://github.com/Microsoft/vscode/issues/42726)
-				queryOptions.extraFileResources.push(resource);
-			}
-
-			return queryOptions;
-		});
+		return queryOptions;
 	}
 
-	public hasShortResponseTime(): boolean {
+	hasShortResponseTime(): boolean {
 		return this.isCacheLoaded;
 	}
 
-	public onOpen(): void {
+	onOpen(): void {
 		this.cacheState = new CacheState(cacheKey => this.cacheQuery(cacheKey), query => this.searchService.search(query), cacheKey => this.searchService.clearCache(cacheKey), this.cacheState);
 		this.cacheState.load();
 	}
@@ -229,15 +228,15 @@ export class OpenFileHandler extends QuickOpenHandler {
 		return query;
 	}
 
-	public get isCacheLoaded(): boolean {
+	get isCacheLoaded(): boolean {
 		return this.cacheState && this.cacheState.isLoaded;
 	}
 
-	public getGroupLabel(): string {
+	getGroupLabel(): string {
 		return nls.localize('searchResults', "search results");
 	}
 
-	public getAutoFocus(searchValue: string): IAutoFocus {
+	getAutoFocus(searchValue: string): IAutoFocus {
 		return {
 			autoFocusFirstEntry: true
 		};
@@ -275,21 +274,21 @@ export class CacheState {
 		}
 	}
 
-	public get cacheKey(): string {
+	get cacheKey(): string {
 		return this.loadingPhase === LoadingPhase.Loaded || !this.previous ? this._cacheKey : this.previous.cacheKey;
 	}
 
-	public get isLoaded(): boolean {
+	get isLoaded(): boolean {
 		const isLoaded = this.loadingPhase === LoadingPhase.Loaded;
 		return isLoaded || !this.previous ? isLoaded : this.previous.isLoaded;
 	}
 
-	public get isUpdating(): boolean {
+	get isUpdating(): boolean {
 		const isUpdating = this.loadingPhase === LoadingPhase.Loading;
 		return isUpdating || !this.previous ? isUpdating : this.previous.isUpdating;
 	}
 
-	public load(): void {
+	load(): void {
 		if (this.isUpdating) {
 			return;
 		}
@@ -307,7 +306,7 @@ export class CacheState {
 			});
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		if (this.promise) {
 			this.promise.then(null, () => { })
 				.then(() => {
diff --git a/src/vs/workbench/parts/search/browser/patternInputWidget.ts b/src/vs/workbench/parts/search/browser/patternInputWidget.ts
index 98e9959aaed..ced2a9bbba2 100644
--- a/src/vs/workbench/parts/search/browser/patternInputWidget.ts
+++ b/src/vs/workbench/parts/search/browser/patternInputWidget.ts
@@ -130,10 +130,7 @@ export class PatternInputWidget extends Widget {
 	}
 
 	public onSearchSubmit(): void {
-		const value = this.getValue();
-		if (value) {
-			this.inputBox.addToHistory(value);
-		}
+		this.inputBox.addToHistory();
 	}
 
 	public showNextTerm() {
diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts
index 0fb3e737976..bd2aa0463a9 100644
--- a/src/vs/workbench/parts/search/browser/searchActions.ts
+++ b/src/vs/workbench/parts/search/browser/searchActions.ts
@@ -492,14 +492,15 @@ export class ReplaceAllInFolderAction extends AbstractSearchAndReplaceAction {
 		super(Constants.ReplaceAllInFolderActionId, appendKeyBindingLabel(ReplaceAllInFolderAction.LABEL, keyBindingService.lookupKeybinding(Constants.ReplaceAllInFolderActionId), keyBindingService), 'action-replace-all');
 	}
 
-	public async run(): TPromise<any> {
+	public run(): TPromise<any> {
 		let nextFocusElement = this.getElementToFocusAfterRemoved(this.viewer, this.folderMatch);
-		await this.folderMatch.replaceAll();
-
-		if (nextFocusElement) {
-			this.viewer.setFocus(nextFocusElement);
-		}
-		this.viewer.domFocus();
+		return this.folderMatch.replaceAll()
+			.then(() => {
+				if (nextFocusElement) {
+					this.viewer.setFocus(nextFocusElement);
+				}
+				this.viewer.domFocus();
+			});
 	}
 }
 
diff --git a/src/vs/workbench/parts/search/browser/searchView.ts b/src/vs/workbench/parts/search/browser/searchView.ts
index 3c7c0ea0c0a..c1af2079000 100644
--- a/src/vs/workbench/parts/search/browser/searchView.ts
+++ b/src/vs/workbench/parts/search/browser/searchView.ts
@@ -149,9 +149,9 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		this.queryBuilder = this.instantiationService.createInstance(QueryBuilder);
 		this.viewletSettings = this.getMemento(storageService, Scope.WORKSPACE);
 
-		this.toUnbind.push(this.fileService.onFileChanges(e => this.onFilesChanged(e)));
-		this.toUnbind.push(this.untitledEditorService.onDidChangeDirty(e => this.onUntitledDidChangeDirty(e)));
-		this.toUnbind.push(this.contextService.onDidChangeWorkbenchState(() => this.onDidChangeWorkbenchState()));
+		this._register(this.fileService.onFileChanges(e => this.onFilesChanged(e)));
+		this._register(this.untitledEditorService.onDidChangeDirty(e => this.onUntitledDidChangeDirty(e)));
+		this._register(this.contextService.onDidChangeWorkbenchState(() => this.onDidChangeWorkbenchState()));
 		this._register(this.searchHistoryService.onDidClearHistory(() => this.clearHistory()));
 
 		this.selectCurrentMatchEmitter = new Emitter<string>();
@@ -170,7 +170,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 	public create(parent: HTMLElement): TPromise<void> {
 		super.create(parent);
 
-		this.viewModel = this.searchWorkbenchService.searchModel;
+		this.viewModel = this._register(this.searchWorkbenchService.searchModel);
 		let builder: Builder;
 		$(parent).div({
 			'class': 'search-view'
@@ -252,10 +252,10 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 				let title = nls.localize('searchScope.includes', "files to include");
 				builder.element('h4', { text: title });
 
-				this.inputPatternIncludes = this.instantiationService.createInstance(PatternInputWidget, builder.getContainer(), this.contextViewService, {
+				this.inputPatternIncludes = this._register(this.instantiationService.createInstance(PatternInputWidget, builder.getContainer(), this.contextViewService, {
 					ariaLabel: nls.localize('label.includes', 'Search Include Patterns'),
 					history: patternIncludesHistory,
-				});
+				}));
 
 				this.inputPatternIncludes.setValue(patternIncludes);
 
@@ -274,10 +274,10 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 				let title = nls.localize('searchScope.excludes', "files to exclude");
 				builder.element('h4', { text: title });
 
-				this.inputPatternExcludes = this.instantiationService.createInstance(ExcludePatternInputWidget, builder.getContainer(), this.contextViewService, {
+				this.inputPatternExcludes = this._register(this.instantiationService.createInstance(ExcludePatternInputWidget, builder.getContainer(), this.contextViewService, {
 					ariaLabel: nls.localize('label.excludes', 'Search Exclude Patterns'),
 					history: patternExclusionsHistory,
-				});
+				}));
 
 				this.inputPatternExcludes.setValue(patternExclusions);
 				this.inputPatternExcludes.setUseExcludesAndIgnoreFiles(useExcludesAndIgnoreFiles);
@@ -311,7 +311,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 			this.toggleQueryDetails(true, true, true);
 		}
 
-		this.toUnbind.push(this.viewModel.searchResult.onChange((event) => this.onSearchResultsChanged(event)));
+		this._register(this.viewModel.searchResult.onChange((event) => this.onSearchResultsChanged(event)));
 
 		return TPromise.as(null);
 	}
@@ -343,52 +343,50 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		let searchHistory = history.search || this.viewletSettings['query.searchHistory'] || [];
 		let replaceHistory = history.replace || this.viewletSettings['query.replaceHistory'] || [];
 
-		this.searchWidget = this.instantiationService.createInstance(SearchWidget, builder, <ISearchWidgetOptions>{
+		this.searchWidget = this._register(this.instantiationService.createInstance(SearchWidget, builder, <ISearchWidgetOptions>{
 			value: contentPattern,
 			isRegex: isRegex,
 			isCaseSensitive: isCaseSensitive,
 			isWholeWords: isWholeWords,
 			searchHistory: searchHistory,
 			replaceHistory: replaceHistory
-		});
+		}));
 
 		if (this.storageService.getBoolean(SearchView.SHOW_REPLACE_STORAGE_KEY, StorageScope.WORKSPACE, true)) {
 			this.searchWidget.toggleReplace(true);
 		}
 
-		this.toUnbind.push(this.searchWidget);
+		this._register(this.searchWidget.onSearchSubmit((refresh) => this.onQueryChanged(refresh)));
+		this._register(this.searchWidget.onSearchCancel(() => this.cancelSearch()));
+		this._register(this.searchWidget.searchInput.onDidOptionChange((viaKeyboard) => this.onQueryChanged(true, viaKeyboard)));
 
-		this.toUnbind.push(this.searchWidget.onSearchSubmit((refresh) => this.onQueryChanged(refresh)));
-		this.toUnbind.push(this.searchWidget.onSearchCancel(() => this.cancelSearch()));
-		this.toUnbind.push(this.searchWidget.searchInput.onDidOptionChange((viaKeyboard) => this.onQueryChanged(true, viaKeyboard)));
-
-		this.toUnbind.push(this.searchWidget.onReplaceToggled(() => this.onReplaceToggled()));
-		this.toUnbind.push(this.searchWidget.onReplaceStateChange((state) => {
+		this._register(this.searchWidget.onReplaceToggled(() => this.onReplaceToggled()));
+		this._register(this.searchWidget.onReplaceStateChange((state) => {
 			this.viewModel.replaceActive = state;
 			this.tree.refresh();
 		}));
-		this.toUnbind.push(this.searchWidget.onReplaceValueChanged((value) => {
+		this._register(this.searchWidget.onReplaceValueChanged((value) => {
 			this.viewModel.replaceString = this.searchWidget.getReplaceValue();
 			this.delayedRefresh.trigger(() => this.tree.refresh());
 		}));
 
-		this.toUnbind.push(this.searchWidget.onBlur(() => {
+		this._register(this.searchWidget.onBlur(() => {
 			this.toggleQueryDetailsButton.focus();
 		}));
 
-		this.toUnbind.push(this.searchWidget.onReplaceAll(() => this.replaceAll()));
+		this._register(this.searchWidget.onReplaceAll(() => this.replaceAll()));
 		this.trackInputBox(this.searchWidget.searchInputFocusTracker);
 		this.trackInputBox(this.searchWidget.replaceInputFocusTracker);
 	}
 
 	private trackInputBox(inputFocusTracker: dom.IFocusTracker, contextKey?: IContextKey<boolean>): void {
-		this.toUnbind.push(inputFocusTracker.onDidFocus(() => {
+		this._register(inputFocusTracker.onDidFocus(() => {
 			this.inputBoxFocused.set(true);
 			if (contextKey) {
 				contextKey.set(true);
 			}
 		}));
-		this.toUnbind.push(inputFocusTracker.onDidBlur(() => {
+		this._register(inputFocusTracker.onDidBlur(() => {
 			this.inputBoxFocused.set(this.searchWidget.searchInputHasFocus()
 				|| this.searchWidget.replaceInputHasFocus()
 				|| this.inputPatternIncludes.inputHasFocus()
@@ -550,15 +548,11 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 			this.results = div;
 			this.results.addClass('show-file-icons');
 
-			let dataSource = this.instantiationService.createInstance(SearchDataSource);
-			this.toUnbind.push(dataSource);
-
-			let renderer = this.instantiationService.createInstance(SearchRenderer, this.getActionRunner(), this);
-			this.toUnbind.push(renderer);
-
+			let dataSource = this._register(this.instantiationService.createInstance(SearchDataSource));
+			let renderer = this._register(this.instantiationService.createInstance(SearchRenderer, this.getActionRunner(), this));
 			let dnd = this.instantiationService.createInstance(SimpleFileResourceDragAndDrop, (obj: any) => obj instanceof FileMatch ? obj.resource() : void 0);
 
-			this.tree = this.instantiationService.createInstance(WorkbenchTree, div.getHTMLElement(), {
+			this.tree = this._register(this.instantiationService.createInstance(WorkbenchTree, div.getHTMLElement(), {
 				dataSource: dataSource,
 				renderer: renderer,
 				sorter: new SearchSorter(),
@@ -569,10 +563,9 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 			}, {
 					ariaLabel: nls.localize('treeAriaLabel', "Search Results"),
 					showLoading: false
-				});
+				}));
 
 			this.tree.setInput(this.viewModel.searchResult);
-			this.toUnbind.push(renderer);
 
 			const searchResultsNavigator = this._register(new TreeResourceNavigator(this.tree, { openOnFocus: true }));
 			this._register(debounceEvent(searchResultsNavigator.openResource, (last, event) => event, 75, true)(options => {
@@ -594,7 +587,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 				treeHasFocus = true;
 			});
 
-			this.toUnbind.push(this.tree.onDidChangeFocus((e: IFocusEvent) => {
+			this._register(this.tree.onDidChangeFocus((e: IFocusEvent) => {
 				if (treeHasFocus) {
 					const focus = e.focus;
 					this.firstMatchFocused.set(this.tree.getNavigator().first() === focus);
@@ -606,7 +599,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 				}
 			}));
 
-			this.toUnbind.push(this.tree.onDidBlur(e => {
+			this._register(this.tree.onDidBlur(e => {
 				treeHasFocus = false;
 				this.firstMatchFocused.reset();
 				this.fileMatchOrMatchFocused.reset();
@@ -1573,16 +1566,6 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 	public dispose(): void {
 		this.isDisposed = true;
 
-		if (this.tree) {
-			this.tree.dispose();
-		}
-
-		this.searchWidget.dispose();
-		this.inputPatternIncludes.dispose();
-		this.inputPatternExcludes.dispose();
-
-		this.viewModel.dispose();
-
 		super.dispose();
 	}
 }
diff --git a/src/vs/workbench/parts/search/browser/searchWidget.ts b/src/vs/workbench/parts/search/browser/searchWidget.ts
index 8af51ede386..15342de2365 100644
--- a/src/vs/workbench/parts/search/browser/searchWidget.ts
+++ b/src/vs/workbench/parts/search/browser/searchWidget.ts
@@ -32,6 +32,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { ISearchConfigurationProperties } from 'vs/platform/search/common/search';
 import { ContextScopedFindInput, ContextScopedHistoryInputBox } from 'vs/platform/widget/browser/contextScopedHistoryWidget';
+import { Delayer } from 'vs/base/common/async';
 
 export interface ISearchWidgetOptions {
 	value?: string;
@@ -94,6 +95,7 @@ export class SearchWidget extends Widget {
 	private replaceActionBar: ActionBar;
 	public replaceInputFocusTracker: dom.IFocusTracker;
 	private replaceInputBoxFocused: IContextKey<boolean>;
+	private _replaceHistoryDelayer: Delayer<void>;
 
 	private ignoreGlobalFindBufferOnNextFocus = false;
 	private previousGlobalFindBufferValue: string;
@@ -133,6 +135,7 @@ export class SearchWidget extends Widget {
 		this.replaceActive = Constants.ReplaceActiveKey.bindTo(this.contextKeyService);
 		this.searchInputBoxFocused = Constants.SearchInputBoxFocusedKey.bindTo(this.contextKeyService);
 		this.replaceInputBoxFocused = Constants.ReplaceInputBoxFocusedKey.bindTo(this.contextKeyService);
+		this._replaceHistoryDelayer = new Delayer<void>(500);
 		this.render(container, options);
 	}
 
@@ -268,13 +271,13 @@ export class SearchWidget extends Widget {
 		this.searchInput.setCaseSensitive(!!options.isCaseSensitive);
 		this.searchInput.setWholeWords(!!options.isWholeWords);
 		this._register(this.onSearchSubmit(() => {
-			this.searchInput.inputBox.addToHistory(this.searchInput.getValue());
+			this.searchInput.inputBox.addToHistory();
 		}));
 		this.searchInput.onCaseSensitiveKeyDown((keyboardEvent: IKeyboardEvent) => this.onCaseSensitiveKeyDown(keyboardEvent));
 		this.searchInput.onRegexKeyDown((keyboardEvent: IKeyboardEvent) => this.onRegexKeyDown(keyboardEvent));
 
 		this._register(this.onReplaceValueChanged(() => {
-			this.replaceInput.addToHistory(this.replaceInput.value);
+			this._replaceHistoryDelayer.trigger(() => this.replaceInput.addToHistory());
 		}));
 
 		this.searchInputFocusTracker = this._register(dom.trackFocus(this.searchInput.inputBox.inputElement));
@@ -285,7 +288,7 @@ export class SearchWidget extends Widget {
 			if (!this.ignoreGlobalFindBufferOnNextFocus && useGlobalFindBuffer) {
 				const globalBufferText = this.clipboardServce.readFindText();
 				if (this.previousGlobalFindBufferValue !== globalBufferText) {
-					this.searchInput.inputBox.addToHistory(this.searchInput.getValue());
+					this.searchInput.inputBox.addToHistory();
 					this.searchInput.setValue(globalBufferText);
 					this.searchInput.select();
 				}
@@ -316,6 +319,7 @@ export class SearchWidget extends Widget {
 		this.replaceAllAction.label = SearchWidget.REPLACE_ALL_DISABLED_LABEL;
 		this.replaceActionBar = this._register(new ActionBar(this.replaceContainer));
 		this.replaceActionBar.push([this.replaceAllAction], { icon: true, label: false });
+		this.onkeydown(this.replaceActionBar.domNode, (keyboardEvent) => this.onReplaceActionbarKeyDown(keyboardEvent));
 
 		this.replaceInputFocusTracker = this._register(dom.trackFocus(this.replaceInput.inputElement));
 		this._register(this.replaceInputFocusTracker.onDidFocus(() => this.replaceInputBoxFocused.set(true)));
@@ -439,6 +443,13 @@ export class SearchWidget extends Widget {
 		}
 	}
 
+	private onReplaceActionbarKeyDown(keyboardEvent: IKeyboardEvent) {
+		if (keyboardEvent.equals(KeyMod.Shift | KeyCode.Tab)) {
+			this.focusRegexAction();
+			keyboardEvent.preventDefault();
+		}
+	}
+
 	private submitSearch(refresh: boolean = true): void {
 		const value = this.searchInput.getValue();
 		const useGlobalFindBuffer = this.configurationService.getValue<ISearchConfigurationProperties>('search').globalFindClipboard;
diff --git a/src/vs/workbench/parts/stats/node/workspaceStats.ts b/src/vs/workbench/parts/stats/node/workspaceStats.ts
index 3eec8a04f22..60b4979fd47 100644
--- a/src/vs/workbench/parts/stats/node/workspaceStats.ts
+++ b/src/vs/workbench/parts/stats/node/workspaceStats.ts
@@ -179,6 +179,8 @@ export class WorkspaceStats implements IWorkbenchContribution {
 		this.reportCloudStats();
 	}
 
+	public static tags: Tags;
+
 	private searchArray(arr: string[], regEx: RegExp): boolean {
 		return arr.some(v => v.search(regEx) > -1) || undefined;
 	}
@@ -226,7 +228,7 @@ export class WorkspaceStats implements IWorkbenchContribution {
 			"workspace.reactNative" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
 		}
 	*/
-	private async getWorkspaceTags(configuration: IWindowConfiguration): TPromise<Tags> {
+	private getWorkspaceTags(configuration: IWindowConfiguration): TPromise<Tags> {
 		const tags: Tags = Object.create(null);
 
 		const state = this.contextService.getWorkbenchState();
@@ -256,9 +258,11 @@ export class WorkspaceStats implements IWorkbenchContribution {
 		tags['workspace.empty'] = isEmpty;
 
 		const folders = !isEmpty ? workspace.folders.map(folder => folder.uri) : this.environmentService.appQuality !== 'stable' && this.findFolders(configuration);
-		if (folders && folders.length && this.fileService) {
-			//return
-			const files: IResolveFileResult[] = await this.fileService.resolveFiles(folders.map(resource => ({ resource })));
+		if (!folders || !folders.length || !this.fileService) {
+			return TPromise.as(tags);
+		}
+
+		return this.fileService.resolveFiles(folders.map(resource => ({ resource }))).then((files: IResolveFileResult[]) => {
 			const names = (<IFileStat[]>[]).concat(...files.map(result => result.success ? (result.stat.children || []) : [])).map(c => c.name);
 			const nameSet = names.reduce((s, n) => s.add(n.toLowerCase()), new Set());
 
@@ -311,33 +315,36 @@ export class WorkspaceStats implements IWorkbenchContribution {
 				tags['workspace.android.cpp'] = true;
 			}
 
-			if (nameSet.has('package.json')) {
-				await TPromise.join(folders.map(async workspaceUri => {
-					const uri = workspaceUri.with({ path: `${workspaceUri.path !== '/' ? workspaceUri.path : ''}/package.json` });
-					try {
-						const content = await this.fileService.resolveContent(uri, { acceptTextOnly: true });
-						const packageJsonContents = JSON.parse(content.value);
-						if (packageJsonContents['dependencies']) {
-							for (let module of ModulesToLookFor) {
-								if ('react-native' === module) {
-									if (packageJsonContents['dependencies'][module]) {
-										tags['workspace.reactNative'] = true;
-									}
-								} else {
-									if (packageJsonContents['dependencies'][module]) {
-										tags['workspace.npm.' + module] = true;
+			const packageJsonPromises = !nameSet.has('package.json') ? [] : folders.map(workspaceUri => {
+				const uri = workspaceUri.with({ path: `${workspaceUri.path !== '/' ? workspaceUri.path : ''}/package.json` });
+				return this.fileService.resolveFile(uri).then(() => {
+					return this.fileService.resolveContent(uri, { acceptTextOnly: true }).then(content => {
+						try {
+							const packageJsonContents = JSON.parse(content.value);
+							if (packageJsonContents['dependencies']) {
+								for (let module of ModulesToLookFor) {
+									if ('react-native' === module) {
+										if (packageJsonContents['dependencies'][module]) {
+											tags['workspace.reactNative'] = true;
+										}
+									} else {
+										if (packageJsonContents['dependencies'][module]) {
+											tags['workspace.npm.' + module] = true;
+										}
 									}
 								}
 							}
 						}
-					}
-					catch (e) {
-						// Ignore errors when resolving file or parsing file contents
-					}
-				}));
-			}
-		}
-		return TPromise.as(tags);
+						catch (e) {
+							// Ignore errors when resolving file or parsing file contents
+						}
+					});
+				}, err => {
+					// Ignore missing file
+				});
+			});
+			return TPromise.join(packageJsonPromises).then(() => tags);
+		});
 	}
 
 	private findFolders(configuration: IWindowConfiguration): URI[] {
@@ -372,6 +379,7 @@ export class WorkspaceStats implements IWorkbenchContribution {
 				}
 			*/
 			this.telemetryService.publicLog('workspce.tags', tags);
+			WorkspaceStats.tags = tags;
 		}, error => onUnexpectedError(error));
 	}
 
diff --git a/src/vs/workbench/parts/tasks/common/taskService.ts b/src/vs/workbench/parts/tasks/common/taskService.ts
index 97c8695f834..50e7dadcfe5 100644
--- a/src/vs/workbench/parts/tasks/common/taskService.ts
+++ b/src/vs/workbench/parts/tasks/common/taskService.ts
@@ -13,13 +13,14 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { Task, ContributedTask, CustomTask, TaskSet, TaskSorter, TaskEvent, TaskIdentifier } from 'vs/workbench/parts/tasks/common/tasks';
 import { ITaskSummary, TaskTerminateResponse, TaskSystemInfo } from 'vs/workbench/parts/tasks/common/taskSystem';
+import { IStringDictionary } from 'vs/base/common/collections';
 
 export { ITaskSummary, Task, TaskTerminateResponse };
 
 export const ITaskService = createDecorator<ITaskService>('taskService');
 
 export interface ITaskProvider {
-	provideTasks(): TPromise<TaskSet>;
+	provideTasks(validTypes: IStringDictionary<boolean>): TPromise<TaskSet>;
 }
 
 export interface RunOptions {
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 3497ebd84c6..1f274236426 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
@@ -119,7 +119,7 @@ class BuildStatusBarItem extends Themable implements IStatusbarItem {
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.contextService.onDidChangeWorkbenchState(() => this.updateStyles()));
+		this._register(this.contextService.onDidChangeWorkbenchState(() => this.updateStyles()));
 	}
 
 	protected updateStyles(): void {
@@ -1062,8 +1062,8 @@ class TaskService implements ITaskService {
 				this.editorService.openEditor({
 					resource,
 					options: {
-						forceOpen: true,
-						pinned: false
+						pinned: false,
+						forceReload: true // because content might have changed
 					}
 				});
 			}
@@ -1085,7 +1085,6 @@ class TaskService implements ITaskService {
 		return this.editorService.openEditor({
 			resource,
 			options: {
-				forceOpen: true,
 				pinned: false
 			}
 		}).then(() => undefined);
@@ -1299,7 +1298,9 @@ class TaskService implements ITaskService {
 	}
 
 	private getGroupedTasks(): TPromise<TaskMap> {
-		return this.extensionService.activateByEvent('onCommand:workbench.action.tasks.runTask').then(() => {
+		return TPromise.join([this.extensionService.activateByEvent('onCommand:workbench.action.tasks.runTask'), TaskDefinitionRegistry.onReady()]).then(() => {
+			let validTypes: IStringDictionary<boolean> = Object.create(null);
+			TaskDefinitionRegistry.all().forEach(definition => validTypes[definition.taskType] = true);
 			return new TPromise<TaskSet[]>((resolve, reject) => {
 				let result: TaskSet[] = [];
 				let counter: number = 0;
@@ -1328,7 +1329,7 @@ class TaskService implements ITaskService {
 				if (this.schemaVersion === JsonSchemaVersion.V2_0_0 && this._providers.size > 0) {
 					this._providers.forEach((provider) => {
 						counter++;
-						provider.provideTasks().done(done, error);
+						provider.provideTasks(validTypes).done(done, error);
 					});
 				} else {
 					resolve(result);
@@ -2229,7 +2230,6 @@ class TaskService implements ITaskService {
 				this.editorService.openEditor({
 					resource,
 					options: {
-						forceOpen: true,
 						pinned: configFileCreated // pin only if config file is created #8727
 					}
 				});
@@ -2487,6 +2487,7 @@ let schema: IJSONSchema = {
 
 import schemaVersion1 from './jsonSchema_v1';
 import schemaVersion2 from './jsonSchema_v2';
+import { TaskDefinitionRegistry } from 'vs/workbench/parts/tasks/common/taskDefinitionRegistry';
 schema.definitions = {
 	...schemaVersion1.definitions,
 	...schemaVersion2.definitions,
diff --git a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
index 20524f438ce..6b4da35a3f1 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
@@ -329,9 +329,9 @@ export class TerminalTaskSystem implements ITaskSystem {
 			promise = new TPromise<ITaskSummary>((resolve, reject) => {
 				const problemMatchers = this.resolveMatchers(resolver, task.problemMatchers);
 				let watchingProblemMatcher = new WatchingProblemCollector(problemMatchers, this.markerService, this.modelService);
-				let toUnbind: IDisposable[] = [];
+				let toDispose: IDisposable[] = [];
 				let eventCounter: number = 0;
-				toUnbind.push(watchingProblemMatcher.onDidStateChange((event) => {
+				toDispose.push(watchingProblemMatcher.onDidStateChange((event) => {
 					if (event.kind === ProblemCollectorEventKind.BackgroundProcessingBegins) {
 						eventCounter++;
 						this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.Active, task));
@@ -397,8 +397,8 @@ export class TerminalTaskSystem implements ITaskSystem {
 					if (processStartedSignaled) {
 						this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.ProcessEnded, task, exitCode));
 					}
-					toUnbind = dispose(toUnbind);
-					toUnbind = null;
+					toDispose = dispose(toDispose);
+					toDispose = null;
 					for (let i = 0; i < eventCounter; i++) {
 						let event = TaskEvent.create(TaskEventKind.Inactive, task);
 						this._onDidStateChange.fire(event);
diff --git a/src/vs/workbench/parts/tasks/node/processTaskSystem.ts b/src/vs/workbench/parts/tasks/node/processTaskSystem.ts
index 27a7ca1e08b..8ec0759e9e1 100644
--- a/src/vs/workbench/parts/tasks/node/processTaskSystem.ts
+++ b/src/vs/workbench/parts/tasks/node/processTaskSystem.ts
@@ -233,9 +233,9 @@ export class ProcessTaskSystem implements ITaskSystem {
 		}
 		if (task.isBackground) {
 			let watchingProblemMatcher = new WatchingProblemCollector(this.resolveMatchers(task, task.problemMatchers), this.markerService, this.modelService);
-			let toUnbind: IDisposable[] = [];
+			let toDispose: IDisposable[] = [];
 			let eventCounter: number = 0;
-			toUnbind.push(watchingProblemMatcher.onDidStateChange((event) => {
+			toDispose.push(watchingProblemMatcher.onDidStateChange((event) => {
 				if (event.kind === ProblemCollectorEventKind.BackgroundProcessingBegins) {
 					eventCounter++;
 					this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.Active, task));
@@ -263,8 +263,8 @@ export class ProcessTaskSystem implements ITaskSystem {
 				if (processStartedSignaled) {
 					this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.ProcessEnded, task, success.cmdCode));
 				}
-				toUnbind = dispose(toUnbind);
-				toUnbind = null;
+				toDispose = dispose(toDispose);
+				toDispose = null;
 				for (let i = 0; i < eventCounter; i++) {
 					this._onDidStateChange.fire(inactiveEvent);
 				}
@@ -280,8 +280,8 @@ export class ProcessTaskSystem implements ITaskSystem {
 			}, (error: ErrorData) => {
 				this.childProcessEnded();
 				watchingProblemMatcher.dispose();
-				toUnbind = dispose(toUnbind);
-				toUnbind = null;
+				toDispose = dispose(toDispose);
+				toDispose = null;
 				for (let i = 0; i < eventCounter; i++) {
 					this._onDidStateChange.fire(inactiveEvent);
 				}
diff --git a/src/vs/workbench/parts/terminal/common/terminal.ts b/src/vs/workbench/parts/terminal/common/terminal.ts
index bca473c50b7..81613ecef7b 100644
--- a/src/vs/workbench/parts/terminal/common/terminal.ts
+++ b/src/vs/workbench/parts/terminal/common/terminal.ts
@@ -70,6 +70,7 @@ export interface ITerminalConfiguration {
 		windows: string[];
 	};
 	macOptionIsMeta: boolean;
+	macOptionClickForcesSelection: boolean;
 	rendererType: 'auto' | 'canvas' | 'dom';
 	rightClickBehavior: 'default' | 'copyPaste' | 'selectWord';
 	cursorBlinking: boolean;
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 55ccd4c3e6c..0d28e3564d1 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/media/scrollbar.css
+++ b/src/vs/workbench/parts/terminal/electron-browser/media/scrollbar.css
@@ -24,6 +24,7 @@
 	background-color: inherit;
 }
 
+.monaco-workbench .panel.integrated-terminal .find-focused .xterm .xterm-viewport,
 .monaco-workbench .panel.integrated-terminal .xterm.focus .xterm-viewport,
 .monaco-workbench .panel.integrated-terminal .xterm:focus .xterm-viewport,
 .monaco-workbench .panel.integrated-terminal .xterm:hover .xterm-viewport {
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 95d45b4670b..be7a3c7a177 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/media/xterm.css
+++ b/src/vs/workbench/parts/terminal/electron-browser/media/xterm.css
@@ -162,4 +162,9 @@
 
 .xterm-cursor-pointer {
 	cursor: pointer !important;
-}
\ No newline at end of file
+}
+
+.xterm.xterm-cursor-crosshair {
+	/* Column selection mode */
+	cursor: crosshair !important;
+}
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 6575b3d8130..97c1069a8c5 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
@@ -120,6 +120,11 @@ configurationRegistry.registerConfiguration({
 			'type': 'boolean',
 			'default': false
 		},
+		'terminal.integrated.macOptionClickForcesSelection': {
+			'description': nls.localize('terminal.integrated.macOptionClickForcesSelection', "Whether to force selection when when using option+click on macOS, this will force a regular (line) selection and disallow the use of column selection mode. This enables copying and pasting using the regular terminal selection when in tmux mouse mode for example."),
+			'type': 'boolean',
+			'default': false
+		},
 		'terminal.integrated.copyOnSelection': {
 			'description': nls.localize('terminal.integrated.copyOnSelection', "When set, text selected in the terminal will be copied to the clipboard."),
 			'type': 'boolean',
@@ -347,7 +352,7 @@ configurationRegistry.registerConfiguration({
 			'default': false
 		},
 		'terminal.integrated.experimentalTextureCachingStrategy': {
-			'description': nls.localize('terminal.integrated.experimentalTextureCachingStrategy', "Controls how the terminal stores glyph textures. Changes to this setting will only apply to new terminals."),
+			'description': nls.localize('terminal.integrated.experimentalTextureCachingStrategy', "Controls how the terminal stores glyph textures. `static` is the default and uses a fixed texture to draw the characters from. `dynamic` will draw the characters to the texture as they are needed, this should boost overall performance at the cost of slightly increased draw time the first time a character is drawn. `dynamic` will eventually become the default and this setting will be removed. Changes to this setting will only apply to new terminals."),
 			'type': 'string',
 			'enum': ['static', 'dynamic'],
 			'default': 'static'
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
index 6203b5c5c97..8bafe8eaaa7 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
@@ -65,7 +65,7 @@ export class TerminalInstance implements ITerminalInstance {
 	private _rows: number;
 	private _dimensionsOverride: ITerminalDimensions;
 	private _windowsShellHelper: WindowsShellHelper;
-	private _xtermReadyPromise: TPromise<void>;
+	private _xtermReadyPromise: Promise<void>;
 
 	private _disposables: lifecycle.IDisposable[];
 	private _messageTitleDisposable: lifecycle.IDisposable;
@@ -255,7 +255,7 @@ export class TerminalInstance implements ITerminalInstance {
 	/**
 	 * Create xterm.js instance and attach data listeners.
 	 */
-	protected async _createXterm(): TPromise<void> {
+	protected async _createXterm(): Promise<void> {
 		if (!Terminal) {
 			Terminal = (await import('vscode-xterm')).Terminal;
 			// Enable xterm.js addons
@@ -283,6 +283,7 @@ export class TerminalInstance implements ITerminalInstance {
 			bellStyle: config.enableBell ? 'sound' : 'none',
 			screenReaderMode: accessibilitySupport === 'on',
 			macOptionIsMeta: config.macOptionIsMeta,
+			macOptionClickForcesSelection: config.macOptionClickForcesSelection,
 			rightClickSelectsWord: config.rightClickBehavior === 'selectWord',
 			// TODO: Guess whether to use canvas or dom better
 			rendererType: config.rendererType === 'auto' ? 'canvas' : config.rendererType,
@@ -871,6 +872,7 @@ export class TerminalInstance implements ITerminalInstance {
 		this._setEnableBell(config.enableBell);
 		this._safeSetOption('scrollback', config.scrollback);
 		this._safeSetOption('macOptionIsMeta', config.macOptionIsMeta);
+		this._safeSetOption('macOptionClickForcesSelection', config.macOptionClickForcesSelection);
 		this._safeSetOption('rightClickSelectsWord', config.rightClickBehavior === 'selectWord');
 	}
 
@@ -963,18 +965,21 @@ export class TerminalInstance implements ITerminalInstance {
 				this._safeSetOption('drawBoldTextInBrightColors', config.drawBoldTextInBrightColors);
 			}
 
-			if (cols !== this._xterm.getOption('cols') || rows !== this._xterm.getOption('rows')) {
+			if (cols !== this._xterm.cols || rows !== this._xterm.rows) {
 				this._onDimensionsChanged.fire();
 			}
 
 			this._xterm.resize(cols, rows);
 			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.
+				// HACK: 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 Windows/Linux would fire an event saying that the terminal was not
+				// visible.
 				if (this._xterm.getOption('rendererType') === 'canvas') {
 					this._xterm._core.renderer.onIntersectionChange({ intersectionRatio: 1 });
+					// HACK: Force a refresh of the screen to ensure links are refresh corrected.
+					// This can probably be removed when the above hack is fixed in Chromium.
+					this._xterm.refresh(0, this._xterm.rows - 1);
 				}
 			}
 		}
@@ -1069,6 +1074,7 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 	const scrollbarSliderBackgroundColor = theme.getColor(scrollbarSliderBackground);
 	if (scrollbarSliderBackgroundColor) {
 		collector.addRule(`
+			.monaco-workbench .panel.integrated-terminal .find-focused .xterm .xterm-viewport,
 			.monaco-workbench .panel.integrated-terminal .xterm.focus .xterm-viewport,
 			.monaco-workbench .panel.integrated-terminal .xterm:focus .xterm-viewport,
 			.monaco-workbench .panel.integrated-terminal .xterm:hover .xterm-viewport { background-color: ${scrollbarSliderBackgroundColor} !important; }`
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
index 671a3342519..76750995eac 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
@@ -28,6 +28,8 @@ import { DataTransfers } from 'vs/base/browser/dnd';
 import { INotificationService, IPromptChoice, Severity } from 'vs/platform/notification/common/notification';
 import { TerminalConfigHelper } from 'vs/workbench/parts/terminal/electron-browser/terminalConfigHelper';
 
+const FIND_FOCUS_CLASS = 'find-focused';
+
 export class TerminalPanel extends Panel {
 
 	private _actions: IAction[];
@@ -61,6 +63,8 @@ export class TerminalPanel extends Panel {
 		dom.addClass(this._terminalContainer, 'terminal-outer-container');
 
 		this._findWidget = this._instantiationService.createInstance(TerminalFindWidget);
+		this._findWidget.focusTracker.onDidFocus(() => this._terminalContainer.classList.add(FIND_FOCUS_CLASS));
+		this._findWidget.focusTracker.onDidBlur(() => this._terminalContainer.classList.remove(FIND_FOCUS_CLASS));
 
 		this._parentDomElement.appendChild(this._fontStyleElement);
 		this._parentDomElement.appendChild(this._terminalContainer);
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
index b7fd6898f18..5b865bd3a86 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
@@ -208,7 +208,7 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 		const osVersion = (/(\d+)\.(\d+)\.(\d+)/g).exec(os.release());
 		let useWSLexe = false;
 
-		if (osVersion.length === 4) {
+		if (osVersion && osVersion.length === 4) {
 			const buildNumber = parseInt(osVersion[3]);
 			if (buildNumber >= 16299) {
 				useWSLexe = true;
diff --git a/src/vs/workbench/parts/terminal/node/terminalProcess.ts b/src/vs/workbench/parts/terminal/node/terminalProcess.ts
index e9126845545..8987b358049 100644
--- a/src/vs/workbench/parts/terminal/node/terminalProcess.ts
+++ b/src/vs/workbench/parts/terminal/node/terminalProcess.ts
@@ -117,7 +117,8 @@ function cleanEnv() {
 		'PTYROWS',
 		'PTYSHELLCMDLINE',
 		'VSCODE_LOGS',
-		'VSCODE_PORTABLE'
+		'VSCODE_PORTABLE',
+		'VSCODE_PID',
 	];
 	keys.forEach(function (key) {
 		if (process.env[key]) {
diff --git a/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts b/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts
index cc04c06a371..4d2291134ef 100644
--- a/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts
+++ b/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts
@@ -26,6 +26,7 @@ import { Color } from 'vs/base/common/color';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { LIGHT, DARK, HIGH_CONTRAST } from 'vs/platform/theme/common/themeService';
 import { schemaId } from 'vs/workbench/services/themes/common/colorThemeSchema';
+import { onUnexpectedError } from 'vs/base/common/errors';
 
 export class SelectColorThemeAction extends Action {
 
@@ -67,6 +68,7 @@ export class SelectColorThemeAction extends Action {
 
 				this.themeService.setColorTheme(theme.id, target).done(null,
 					err => {
+						onUnexpectedError(err);
 						this.themeService.setColorTheme(currentTheme.id, null);
 					}
 				);
@@ -75,13 +77,11 @@ export class SelectColorThemeAction extends Action {
 			const placeHolder = localize('themes.selectTheme', "Select Color Theme (Up/Down Keys to Preview)");
 			const autoFocusIndex = firstIndex(picks, p => p.id === currentTheme.id);
 			const delayer = new Delayer<void>(100);
+			const chooseTheme = theme => delayer.trigger(() => selectTheme(theme || currentTheme, true), 0);
+			const tryTheme = theme => delayer.trigger(() => selectTheme(theme, false));
 
-			return this.quickOpenService.pick(picks, { placeHolder, autoFocus: { autoFocusIndex } })
-				.then(
-					theme => delayer.trigger(() => selectTheme(theme || currentTheme, true), 0),
-					null,
-					theme => delayer.trigger(() => selectTheme(theme, false))
-				);
+			return this.quickOpenService.pick(picks, { placeHolder, autoFocus: { autoFocusIndex }, onDidFocus: tryTheme })
+				.then(chooseTheme);
 		});
 	}
 }
@@ -125,6 +125,7 @@ class SelectIconThemeAction extends Action {
 				}
 				this.themeService.setFileIconTheme(theme && theme.id, target).done(null,
 					err => {
+						onUnexpectedError(err);
 						this.themeService.setFileIconTheme(currentTheme.id, null);
 					}
 				);
@@ -133,13 +134,11 @@ class SelectIconThemeAction extends Action {
 			const placeHolder = localize('themes.selectIconTheme', "Select File Icon Theme");
 			const autoFocusIndex = firstIndex(picks, p => p.id === currentTheme.id);
 			const delayer = new Delayer<void>(100);
+			const chooseTheme = theme => delayer.trigger(() => selectTheme(theme || currentTheme, true), 0);
+			const tryTheme = theme => delayer.trigger(() => selectTheme(theme, false));
 
-			return this.quickOpenService.pick(picks, { placeHolder, autoFocus: { autoFocusIndex } })
-				.then(
-					theme => delayer.trigger(() => selectTheme(theme || currentTheme, true), 0),
-					null,
-					theme => delayer.trigger(() => selectTheme(theme, false))
-				);
+			return this.quickOpenService.pick(picks, { placeHolder, autoFocus: { autoFocusIndex }, onDidFocus: tryTheme })
+				.then(chooseTheme);
 		});
 	}
 }
diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
index f1dcc32c086..b50ecda1765 100644
--- a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
+++ b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
@@ -51,6 +51,7 @@ export class ReleaseNotesManager {
 	private _releaseNotesCache: { [version: string]: TPromise<string>; } = Object.create(null);
 
 	private _currentReleaseNotes: WebviewEditorInput | undefined = undefined;
+	private _lastText: string;
 
 	public constructor(
 		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
@@ -60,14 +61,25 @@ export class ReleaseNotesManager {
 		@IRequestService private readonly _requestService: IRequestService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@IEditorService private readonly _editorService: IEditorService,
-		@IWebviewEditorService private readonly _webviewEditorService: IWebviewEditorService,
-	) { }
+		@IWebviewEditorService private readonly _webviewEditorService: IWebviewEditorService
+	) {
+		TokenizationRegistry.onDidChange(async () => {
+			if (!this._currentReleaseNotes || !this._lastText) {
+				return;
+			}
+			const html = await this.renderBody(this._lastText);
+			if (this._currentReleaseNotes) {
+				this._currentReleaseNotes.html = html;
+			}
+		});
+	}
 
 	public async show(
 		accessor: ServicesAccessor,
 		version: string
-	): TPromise<boolean> {
+	): Promise<boolean> {
 		const releaseNoteText = await this.loadReleaseNotes(version);
+		this._lastText = releaseNoteText;
 		const html = await this.renderBody(releaseNoteText);
 		const title = nls.localize('releaseNotesInputName', "Release Notes: {0}", version);
 
@@ -154,13 +166,14 @@ export class ReleaseNotesManager {
 	}
 
 	private async renderBody(text: string) {
+		const content = await this.renderContent(text);
 		const colorMap = TokenizationRegistry.getColorMap();
 		const css = generateTokensCSSForColorMap(colorMap);
-		const body = renderBody(await this.renderContent(text), css);
+		const body = renderBody(content, css);
 		return body;
 	}
 
-	private async renderContent(text: string): TPromise<string> {
+	private async renderContent(text: string): Promise<string> {
 		const renderer = await this.getRenderer(text);
 		return marked(text, { renderer });
 	}
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 1a2d956f296..a87651e4bfc 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.contribution.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.contribution.ts
@@ -13,15 +13,22 @@ import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } fr
 import { IGlobalActivityRegistry, GlobalActivityExtensions } from 'vs/workbench/common/activity';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
-import { ShowCurrentReleaseNotesAction, ProductContribution, UpdateContribution, Win3264BitContribution } from './update';
+import { ShowCurrentReleaseNotesAction, ProductContribution, UpdateContribution, Win3264BitContribution, WinUserSetupContribution } from './update';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import product from 'vs/platform/node/product';
 
-Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
-	.registerWorkbenchContribution(ProductContribution, LifecyclePhase.Running);
+const workbench = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
 
-if (platform.isWindows && process.arch === 'ia32') {
-	Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
-		.registerWorkbenchContribution(Win3264BitContribution, LifecyclePhase.Running);
+workbench.registerWorkbenchContribution(ProductContribution, LifecyclePhase.Running);
+
+if (platform.isWindows) {
+	if (process.arch === 'ia32') {
+		workbench.registerWorkbenchContribution(Win3264BitContribution, LifecyclePhase.Running);
+	}
+
+	if (product.target !== 'user') {
+		workbench.registerWorkbenchContribution(WinUserSetupContribution, LifecyclePhase.Running);
+	}
 }
 
 Registry.as<IGlobalActivityRegistry>(GlobalActivityExtensions)
diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
index 2ae85c38570..110be30861b 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.ts
@@ -9,7 +9,7 @@ import * as nls from 'vs/nls';
 import severity from 'vs/base/common/severity';
 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 { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import pkg from 'vs/platform/node/package';
 import product from 'vs/platform/node/product';
@@ -73,11 +73,11 @@ export abstract class AbstractShowReleaseNotesAction extends Action {
 
 		this.enabled = false;
 
-		return showReleaseNotes(this.instantiationService, this.version)
+		return TPromise.wrap(showReleaseNotes(this.instantiationService, this.version)
 			.then(null, () => {
 				const action = this.instantiationService.createInstance(OpenLatestReleaseNotesInBrowserAction);
 				return action.run().then(() => false);
-			});
+			}));
 	}
 }
 
@@ -209,6 +209,60 @@ export class Win3264BitContribution implements IWorkbenchContribution {
 	}
 }
 
+export class WinUserSetupContribution implements IWorkbenchContribution {
+
+	private static readonly KEY = 'update/win32-usersetup';
+
+	private static readonly STABLE_URL = 'https://vscode-update.azurewebsites.net/latest/win32-x64-user/stable';
+	private static readonly STABLE_URL_32BIT = 'https://vscode-update.azurewebsites.net/latest/win32-user/stable';
+	private static readonly INSIDER_URL = 'https://vscode-update.azurewebsites.net/latest/win32-x64-user/insider';
+	private static readonly INSIDER_URL_32BIT = 'https://vscode-update.azurewebsites.net/latest/win32-user/insider';
+
+	// TODO@joao this needs to change to the 1.26 release notes
+	private static readonly READ_MORE = 'https://aka.ms/vscode-win32-user-setup';
+
+	constructor(
+		@IStorageService storageService: IStorageService,
+		@INotificationService notificationService: INotificationService,
+		@IEnvironmentService environmentService: IEnvironmentService,
+		@IOpenerService private openerService: IOpenerService
+	) {
+		if (!environmentService.isBuilt || environmentService.disableUpdates) {
+			return;
+		}
+
+		const neverShowAgain = new NeverShowAgain(WinUserSetupContribution.KEY, storageService);
+
+		if (!neverShowAgain.shouldShow()) {
+			return;
+		}
+
+		const handle = notificationService.prompt(
+			severity.Info,
+			nls.localize('usersetup', "We recommend switching to our new User Setup distribution of {0} for Windows! Click [here]({1}) to learn more.", product.nameShort, WinUserSetupContribution.READ_MORE),
+			[
+				{
+					label: nls.localize('downloadnow', "Download"),
+					run: () => {
+						const url = product.quality === 'insider'
+							? (process.arch === 'ia32' ? WinUserSetupContribution.INSIDER_URL_32BIT : WinUserSetupContribution.INSIDER_URL)
+							: (process.arch === 'ia32' ? WinUserSetupContribution.STABLE_URL_32BIT : WinUserSetupContribution.STABLE_URL);
+
+						return this.openerService.open(URI.parse(url));
+					}
+				},
+				{
+					label: nls.localize('neveragain', "Don't Show Again"),
+					isSecondary: true,
+					run: () => {
+						neverShowAgain.action.run(handle);
+						neverShowAgain.action.dispose();
+					}
+				}]
+		);
+	}
+}
+
 class CommandAction extends Action {
 
 	constructor(
@@ -235,7 +289,7 @@ export class UpdateContribution implements IGlobalActivity {
 	get cssClass() { return 'update-activity'; }
 
 	private state: UpdateState;
-	private badgeDisposable: IDisposable = EmptyDisposable;
+	private badgeDisposable: IDisposable = Disposable.None;
 	private disposables: IDisposable[] = [];
 
 	constructor(
@@ -507,4 +561,4 @@ export class UpdateContribution implements IGlobalActivity {
 	dispose(): void {
 		this.disposables = dispose(this.disposables);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/url/electron-browser/url.contribution.ts b/src/vs/workbench/parts/url/electron-browser/url.contribution.ts
index bc6c1f8faa3..375cfdad0a4 100644
--- a/src/vs/workbench/parts/url/electron-browser/url.contribution.ts
+++ b/src/vs/workbench/parts/url/electron-browser/url.contribution.ts
@@ -27,11 +27,11 @@ export class OpenUrlAction extends Action {
 		super(id, label);
 	}
 
-	async run(): TPromise<any> {
-		const input = await this.quickInputService.input({ prompt: 'URL to open' });
-		const uri = URI.parse(input);
-
-		this.urlService.open(uri);
+	run(): TPromise<any> {
+		return this.quickInputService.input({ prompt: 'URL to open' }).then(input => {
+			const uri = URI.parse(input);
+			this.urlService.open(uri);
+		});
 	}
 }
 
diff --git a/src/vs/workbench/parts/webview/electron-browser/webview-pre.js b/src/vs/workbench/parts/webview/electron-browser/webview-pre.js
index 51a9d42aa32..116392df7e9 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webview-pre.js
+++ b/src/vs/workbench/parts/webview/electron-browser/webview-pre.js
@@ -172,7 +172,7 @@
 			}
 
 			// apply default script
-			if (enableWrappedPostMessage) {
+			if (enableWrappedPostMessage && options.allowScripts) {
 				const defaultScript = newDocument.createElement('script');
 				defaultScript.textContent = `
 					const acquireVsCodeApi = (function() {
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
index ae25c0700cf..82252859c77 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
@@ -8,7 +8,6 @@ import { domEvent } from 'vs/base/browser/event';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import URI from 'vs/base/common/uri';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -163,22 +162,22 @@ export class WebviewEditor extends BaseWebviewEditor {
 		super.clearInput();
 	}
 
-	async setInput(input: WebviewEditorInput, options: EditorOptions, token: CancellationToken): TPromise<void> {
+	setInput(input: WebviewEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
 		if (this.input) {
 			(this.input as WebviewEditorInput).releaseWebview(this);
 			this._webview = undefined;
 			this._webviewContent = undefined;
 		}
-		await super.setInput(input, options, token);
+		return super.setInput(input, options, token)
+			.then(() => input.resolve())
+			.then(() => {
+				if (token.isCancellationRequested) {
+					return;
+				}
 
-		await input.resolve();
-
-		if (token.isCancellationRequested) {
-			return;
-		}
-
-		input.updateGroup(this.group.id);
-		this.updateWebview(input);
+				input.updateGroup(this.group.id);
+				this.updateWebview(input);
+			});
 	}
 
 	private updateWebview(input: WebviewEditorInput) {
@@ -245,7 +244,7 @@ export class WebviewEditor extends BaseWebviewEditor {
 			this._webview.initialScrollProgress = input.scrollYPercentage;
 		}
 
-		this._webview.state = input.webviewState;
+		this._webview.state = input.state.state;
 
 		this._content.setAttribute('aria-flowto', this._webviewContent.id);
 
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
index 8a2a3f989bc..6d48bf36101 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
@@ -154,7 +154,7 @@ export class WebviewEditorInput extends EditorInput {
 		}
 	}
 
-	public resolve(refresh?: boolean): TPromise<IEditorModel, any> {
+	public resolve(): TPromise<IEditorModel, any> {
 		if (this.reviver && !this._revived) {
 			this._revived = true;
 			return this.reviver.reviveWebview(this).then(() => new EditorModel());
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
index 344a2153402..3c4228078b6 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
@@ -134,16 +134,18 @@ export class WebviewEditorService implements IWebviewEditorService {
 			canRevive: (_webview) => {
 				return true;
 			},
-			reviveWebview: async (webview: WebviewEditorInput): TPromise<void> => {
-				const didRevive = await this.tryRevive(webview);
-				if (didRevive) {
-					return;
-				}
-				// A reviver may not be registered yet. Put into queue and resolve promise when we can revive
-				let resolve: (value: void) => void;
-				const promise = new TPromise<void>(r => { resolve = r; });
-				this._awaitingRevival.push({ input: webview, resolve });
-				return promise;
+			reviveWebview: (webview: WebviewEditorInput): TPromise<void> => {
+				return TPromise.wrap(this.tryRevive(webview)).then(didRevive => {
+					if (didRevive) {
+						return TPromise.as(void 0);
+					}
+
+					// A reviver may not be registered yet. Put into queue and resolve promise when we can revive
+					let resolve: (value: void) => void;
+					const promise = new TPromise<void>(r => { resolve = r; });
+					this._awaitingRevival.push({ input: webview, resolve });
+					return promise;
+				});
 			}
 		});
 
@@ -183,7 +185,7 @@ export class WebviewEditorService implements IWebviewEditorService {
 
 	private async tryRevive(
 		webview: WebviewEditorInput
-	): TPromise<boolean> {
+	): Promise<boolean> {
 		const revivers = this._revivers.get(webview.viewType);
 		if (!revivers) {
 			return false;
@@ -197,4 +199,4 @@ export class WebviewEditorService implements IWebviewEditorService {
 		}
 		return false;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewElement.ts b/src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
index 8768f97d9df..a97e8f8fd1c 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
@@ -131,71 +131,69 @@ export class WebviewElement extends Disposable {
 			}));
 		}
 
-		this._toDispose.push(
-			addDisposableListener(this._webview, 'console-message', function (e: { level: number; message: string; line: number; sourceId: string; }) {
-				console.log(`[Embedded Page] ${e.message}`);
-			}),
-			addDisposableListener(this._webview, 'dom-ready', () => {
-				this.layout();
-			}),
-			addDisposableListener(this._webview, 'crashed', () => {
-				console.error('embedded page crashed');
-			}),
-			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;
+		this._register(addDisposableListener(this._webview, 'console-message', function (e: { level: number; message: string; line: number; sourceId: string; }) {
+			console.log(`[Embedded Page] ${e.message}`);
+		}));
+		this._register(addDisposableListener(this._webview, 'dom-ready', () => {
+			this.layout();
+		}));
+		this._register(addDisposableListener(this._webview, 'crashed', () => {
+			console.error('embedded page crashed');
+		}));
+		this._register(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));
-						return;
+				case 'did-click-link':
+					let [uri] = event.args;
+					this._onDidClickLink.fire(URI.parse(uri));
+					return;
 
-					case 'did-set-content':
-						this._webview.style.flex = '';
-						this._webview.style.width = '100%';
-						this._webview.style.height = '100%';
-						this.layout();
-						return;
+				case 'did-set-content':
+					this._webview.style.flex = '';
+					this._webview.style.width = '100%';
+					this._webview.style.height = '100%';
+					this.layout();
+					return;
 
-					case 'did-scroll':
-						if (event.args && typeof event.args[0] === 'number') {
-							this._onDidScroll.fire({ scrollYPercentage: event.args[0] });
-						}
-						return;
+				case 'did-scroll':
+					if (event.args && typeof event.args[0] === 'number') {
+						this._onDidScroll.fire({ scrollYPercentage: event.args[0] });
+					}
+					return;
 
-					case 'do-reload':
-						this.reload();
-						return;
+				case 'do-reload':
+					this.reload();
+					return;
 
-					case 'do-update-state':
-						this._state = event.args[0];
-						this._onDidUpdateState.fire(this._state);
-						return;
-				}
-			}),
-			addDisposableListener(this._webview, 'focus', () => {
-				if (this._contextKey) {
-					this._contextKey.set(true);
-				}
-			}),
-			addDisposableListener(this._webview, 'blur', () => {
-				if (this._contextKey) {
-					this._contextKey.reset();
-				}
-			}),
-			addDisposableListener(this._webview, 'devtools-opened', () => {
-				this._send('devtools-opened');
-			}),
-		);
+				case 'do-update-state':
+					this._state = event.args[0];
+					this._onDidUpdateState.fire(this._state);
+					return;
+			}
+		}));
+		this._register(addDisposableListener(this._webview, 'focus', () => {
+			if (this._contextKey) {
+				this._contextKey.set(true);
+			}
+		}));
+		this._register(addDisposableListener(this._webview, 'blur', () => {
+			if (this._contextKey) {
+				this._contextKey.reset();
+			}
+		}));
+		this._register(addDisposableListener(this._webview, 'devtools-opened', () => {
+			this._send('devtools-opened');
+		}));
 
 		this._webviewFindWidget = this._register(instantiationService.createInstance(WebviewFindWidget, this));
 
 		this.style(this._themeService.getTheme());
-		this._themeService.onThemeChange(this.style, this, this._toDispose);
+		this._register(this._themeService.onThemeChange(this.style, this));
 	}
 
 	public mountTo(parent: HTMLElement) {
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 67102680756..e9860c97d85 100644
--- a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
+++ b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
@@ -38,6 +38,7 @@ import { IWorkspaceIdentifier, getWorkspaceLabel, ISingleFolderWorkspaceIdentifi
 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 { TimeoutTimer } from 'vs/base/common/async';
 
 used();
 
@@ -431,10 +432,10 @@ class WelcomePage {
 				[{
 					label: localize('ok', "OK"),
 					run: () => {
-						const messageDelay = TPromise.timeout(300);
-						messageDelay.then(() => {
+						const messageDelay = new TimeoutTimer();
+						messageDelay.cancelAndSet(() => {
 							this.notificationService.info(strings.installing.replace('{0}', extensionSuggestion.name));
-						});
+						}, 300);
 						TPromise.join(extensionSuggestion.isKeymap ? extensions.filter(extension => isKeymapExtension(this.tipsService, extension) && extension.globallyEnabled)
 							.map(extension => {
 								return this.extensionEnablementService.setEnablement(extension.local, EnablementState.Disabled);
diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md
index 03c8304fa09..b2fd54b2e19 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md
+++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md
@@ -137,7 +137,7 @@ In a large file it can often be useful to collapse sections of code to increase
 >**Tip:** Folding is based on indentation and as a result can apply to all languages.  Simply indent your code to create a foldable section you can fold a certain number of levels with shortcuts like kb(editor.foldLevel1) through to kb(editor.foldLevel5).
 
 ### Errors and Warnings
-Errors and warnings are highlighted as you edit your code with squiggles.  In the sample below you can see a number of syntax errors.  By pressing kb(editor.action.marker.next) you can navigate across them in sequence and see the detailed error message.  As you correct them the squiggles and scrollbar indicators will update.
+Errors and warnings are highlighted as you edit your code with squiggles.  In the sample below you can see a number of syntax errors.  By pressing kb(editor.action.marker.nextInFiles) you can navigate across them in sequence and see the detailed error message.  As you correct them the squiggles and scrollbar indicators will update.
 
 ```js
 // This code has a few syntax errors
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 dd6a525c2fd..0c8665ff148 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
@@ -259,7 +259,7 @@ export class WalkThroughPart extends BaseEditor {
 
 		return super.setInput(input, options, token)
 			.then(() => {
-				return input.resolve(true);
+				return input.resolve();
 			})
 			.then(model => {
 				if (token.isCancellationRequested) {
diff --git a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts
index 81b269fa5e6..2a9d7dae0c9 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts
@@ -102,7 +102,7 @@ export class WalkThroughInput extends EditorInput {
 		return this.options.onReady;
 	}
 
-	resolve(refresh?: boolean): TPromise<WalkThroughModel> {
+	resolve(): TPromise<WalkThroughModel> {
 		if (!this.promise) {
 			this.promise = this.textModelResolverService.createModelReference(this.options.resource)
 				.then(ref => {
diff --git a/src/vs/workbench/services/actions/test/common/menuService.test.ts b/src/vs/workbench/services/actions/test/common/menuService.test.ts
index 61937dd287f..c986b7bdfac 100644
--- a/src/vs/workbench/services/actions/test/common/menuService.test.ts
+++ b/src/vs/workbench/services/actions/test/common/menuService.test.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
+import { MenuRegistry, MenuId, isIMenuItem } from 'vs/platform/actions/common/actions';
 import { MenuService } from 'vs/workbench/services/actions/common/menuService';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { NullCommandService } from 'vs/platform/commands/common/commands';
@@ -190,13 +190,15 @@ suite('MenuService', function () {
 		let foundA = false;
 		let foundB = false;
 		for (const item of MenuRegistry.getMenuItems(MenuId.CommandPalette)) {
-			if (item.command.id === 'a') {
-				assert.equal(item.command.title, 'Explicit');
-				foundA = true;
-			}
-			if (item.command.id === 'b') {
-				assert.equal(item.command.title, 'Implicit');
-				foundB = true;
+			if (isIMenuItem(item)) {
+				if (item.command.id === 'a') {
+					assert.equal(item.command.title, 'Explicit');
+					foundA = true;
+				}
+				if (item.command.id === 'b') {
+					assert.equal(item.command.title, 'Implicit');
+					foundB = true;
+				}
 			}
 		}
 		assert.equal(foundA, true);
diff --git a/src/vs/workbench/services/activity/browser/activityService.ts b/src/vs/workbench/services/activity/browser/activityService.ts
index c45b8556c40..27bbe40af63 100644
--- a/src/vs/workbench/services/activity/browser/activityService.ts
+++ b/src/vs/workbench/services/activity/browser/activityService.ts
@@ -21,7 +21,7 @@ export class ActivityService implements IActivityService {
 		@IPanelService private panelService: IPanelService
 	) { }
 
-	public showActivity(compositeOrActionId: string, badge: IBadge, clazz?: string, priority?: number): IDisposable {
+	showActivity(compositeOrActionId: string, badge: IBadge, clazz?: string, priority?: number): IDisposable {
 		if (this.panelService.getPanels().filter(p => p.id === compositeOrActionId).length) {
 			return this.panelPart.showActivity(compositeOrActionId, badge, clazz);
 		}
diff --git a/src/vs/workbench/services/activity/common/activity.ts b/src/vs/workbench/services/activity/common/activity.ts
index 6167a730512..27513b65417 100644
--- a/src/vs/workbench/services/activity/common/activity.ts
+++ b/src/vs/workbench/services/activity/common/activity.ts
@@ -13,19 +13,19 @@ export interface IBadge {
 }
 
 export class BaseBadge implements IBadge {
-	public descriptorFn: (args: any) => string;
+	descriptorFn: (args: any) => string;
 
 	constructor(descriptorFn: (args: any) => string) {
 		this.descriptorFn = descriptorFn;
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.descriptorFn(null);
 	}
 }
 
 export class NumberBadge extends BaseBadge {
-	public number: number;
+	number: number;
 
 	constructor(number: number, descriptorFn: (args: any) => string) {
 		super(descriptorFn);
@@ -33,13 +33,13 @@ export class NumberBadge extends BaseBadge {
 		this.number = number;
 	}
 
-	public getDescription(): string {
+	getDescription(): string {
 		return this.descriptorFn(this.number);
 	}
 }
 
 export class TextBadge extends BaseBadge {
-	public text: string;
+	text: string;
 
 	constructor(text: string, descriptorFn: (args: any) => string) {
 		super(descriptorFn);
diff --git a/src/vs/workbench/services/backup/node/backupFileService.ts b/src/vs/workbench/services/backup/node/backupFileService.ts
index 8b2c585dc49..a27a897af10 100644
--- a/src/vs/workbench/services/backup/node/backupFileService.ts
+++ b/src/vs/workbench/services/backup/node/backupFileService.ts
@@ -32,10 +32,9 @@ export interface IBackupFilesModel {
 export class BackupSnapshot implements ITextSnapshot {
 	private preambleHandled: boolean;
 
-	constructor(private snapshot: ITextSnapshot, private preamble: string) {
-	}
+	constructor(private snapshot: ITextSnapshot, private preamble: string) { }
 
-	public read(): string {
+	read(): string {
 		let value = this.snapshot.read();
 		if (!this.preambleHandled) {
 			this.preambleHandled = true;
@@ -54,7 +53,7 @@ export class BackupSnapshot implements ITextSnapshot {
 export class BackupFilesModel implements IBackupFilesModel {
 	private cache: { [resource: string]: number /* version ID */ } = Object.create(null);
 
-	public resolve(backupRoot: string): TPromise<IBackupFilesModel> {
+	resolve(backupRoot: string): TPromise<IBackupFilesModel> {
 		return pfs.readDirsInDir(backupRoot).then(backupSchemas => {
 
 			// For all supported schemas
@@ -74,15 +73,15 @@ export class BackupFilesModel implements IBackupFilesModel {
 		}).then(() => this, error => this);
 	}
 
-	public add(resource: Uri, versionId = 0): void {
+	add(resource: Uri, versionId = 0): void {
 		this.cache[resource.toString()] = versionId;
 	}
 
-	public count(): number {
+	count(): number {
 		return Object.keys(this.cache).length;
 	}
 
-	public has(resource: Uri, versionId?: number): boolean {
+	has(resource: Uri, versionId?: number): boolean {
 		const cachedVersionId = this.cache[resource.toString()];
 		if (typeof cachedVersionId !== 'number') {
 			return false; // unknown resource
@@ -95,15 +94,15 @@ export class BackupFilesModel implements IBackupFilesModel {
 		return true;
 	}
 
-	public get(): Uri[] {
+	get(): Uri[] {
 		return Object.keys(this.cache).map(k => Uri.parse(k));
 	}
 
-	public remove(resource: Uri): void {
+	remove(resource: Uri): void {
 		delete this.cache[resource.toString()];
 	}
 
-	public clear(): void {
+	clear(): void {
 		this.cache = Object.create(null);
 	}
 }
@@ -112,7 +111,7 @@ export class BackupFileService implements IBackupFileService {
 
 	private static readonly META_MARKER = '\n';
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private backupWorkspacePath: string;
 
@@ -130,7 +129,7 @@ export class BackupFileService implements IBackupFileService {
 		this.initialize(backupWorkspacePath);
 	}
 
-	public initialize(backupWorkspacePath: string): void {
+	initialize(backupWorkspacePath: string): void {
 		this.backupWorkspacePath = backupWorkspacePath;
 
 		this.ready = this.init();
@@ -142,13 +141,13 @@ export class BackupFileService implements IBackupFileService {
 		return model.resolve(this.backupWorkspacePath);
 	}
 
-	public hasBackups(): TPromise<boolean> {
+	hasBackups(): TPromise<boolean> {
 		return this.ready.then(model => {
 			return model.count() > 0;
 		});
 	}
 
-	public loadBackupResource(resource: Uri): TPromise<Uri> {
+	loadBackupResource(resource: Uri): TPromise<Uri> {
 		return this.ready.then(model => {
 
 			// Return directly if we have a known backup with that resource
@@ -161,7 +160,7 @@ export class BackupFileService implements IBackupFileService {
 		});
 	}
 
-	public backupResource(resource: Uri, content: ITextSnapshot, versionId?: number): TPromise<void> {
+	backupResource(resource: Uri, content: ITextSnapshot, versionId?: number): TPromise<void> {
 		if (this.isShuttingDown) {
 			return TPromise.as(void 0);
 		}
@@ -181,7 +180,7 @@ export class BackupFileService implements IBackupFileService {
 		});
 	}
 
-	public discardResourceBackup(resource: Uri): TPromise<void> {
+	discardResourceBackup(resource: Uri): TPromise<void> {
 		return this.ready.then(model => {
 			const backupResource = this.toBackupResource(resource);
 
@@ -191,7 +190,7 @@ export class BackupFileService implements IBackupFileService {
 		});
 	}
 
-	public discardAllWorkspaceBackups(): TPromise<void> {
+	discardAllWorkspaceBackups(): TPromise<void> {
 		this.isShuttingDown = true;
 
 		return this.ready.then(model => {
@@ -199,7 +198,7 @@ export class BackupFileService implements IBackupFileService {
 		});
 	}
 
-	public getWorkspaceFileBackups(): TPromise<Uri[]> {
+	getWorkspaceFileBackups(): TPromise<Uri[]> {
 		return this.ready.then(model => {
 			const readPromises: TPromise<Uri>[] = [];
 
@@ -213,7 +212,7 @@ export class BackupFileService implements IBackupFileService {
 		});
 	}
 
-	public resolveBackupContent(backup: Uri): TPromise<ITextBufferFactory> {
+	resolveBackupContent(backup: Uri): TPromise<ITextBufferFactory> {
 		return this.fileService.resolveStreamContent(backup, BACKUP_FILE_RESOLVE_OPTIONS).then(content => {
 
 			// Add a filter method to filter out everything until the meta marker
@@ -236,7 +235,7 @@ export class BackupFileService implements IBackupFileService {
 		});
 	}
 
-	public toBackupResource(resource: Uri): Uri {
+	toBackupResource(resource: Uri): Uri {
 		return Uri.file(path.join(this.backupWorkspacePath, resource.scheme, this.hashPath(resource)));
 	}
 
@@ -247,7 +246,7 @@ export class BackupFileService implements IBackupFileService {
 
 export class InMemoryBackupFileService implements IBackupFileService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private backups: Map<string, ITextSnapshot> = new Map();
 
diff --git a/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.ts b/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.ts
index f3f62fdbf02..a23fcba984b 100644
--- a/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.ts
+++ b/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.ts
@@ -197,7 +197,7 @@ class BulkEditModel implements IDisposable {
 		array.push(edit);
 	}
 
-	async prepare(): TPromise<BulkEditModel> {
+	async prepare(): Promise<BulkEditModel> {
 
 		if (this._tasks) {
 			throw new Error('illegal state - already prepared');
@@ -287,7 +287,7 @@ export class BulkEdit {
 		}
 	}
 
-	async perform(): TPromise<Selection> {
+	async perform(): Promise<Selection> {
 
 		let seen = new Set<string>();
 		let total = 0;
@@ -339,17 +339,17 @@ export class BulkEdit {
 			if (edit.newUri && edit.oldUri) {
 				await this._textFileService.move(edit.oldUri, edit.newUri, overwrite);
 			} else if (!edit.newUri && edit.oldUri) {
-				await this._textFileService.delete(edit.oldUri, true);
+				await this._textFileService.delete(edit.oldUri, { useTrash: true, recursive: edit.options && edit.options.recursive });
 			} else if (edit.newUri && !edit.oldUri) {
 				let ignoreIfExists = edit.options && edit.options.ignoreIfExists;
 				if (!ignoreIfExists || !await this._fileService.existsFile(edit.newUri)) {
-					await this._fileService.createFile(edit.newUri, undefined, { overwrite });
+					await this._textFileService.create(edit.newUri, undefined, { overwrite });
 				}
 			}
 		}
 	}
 
-	private async _performTextEdits(edits: ResourceTextEdit[], progress: IProgress<void>): TPromise<Selection> {
+	private async _performTextEdits(edits: ResourceTextEdit[], progress: IProgress<void>): Promise<Selection> {
 		this._logService.debug('_performTextEdits', JSON.stringify(edits));
 
 		const recording = Recording.start(this._fileService);
@@ -420,14 +420,14 @@ export class BulkEditService implements IBulkEditService {
 		const bulkEdit = new BulkEdit(options.editor, options.progress, this._logService, this._textModelService, this._fileService, this._textFileService, this._environmentService, this._contextService);
 		bulkEdit.add(edits);
 
-		return bulkEdit.perform().then(selection => {
+		return TPromise.wrap(bulkEdit.perform().then(selection => {
 			return { selection, ariaSummary: bulkEdit.ariaMessage() };
 		}, err => {
 			// console.log('apply FAILED');
 			// console.log(err);
 			this._logService.error(err);
 			throw err;
-		});
+		}));
 	}
 }
 
diff --git a/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts b/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
index 5bb46155fc9..6705a89acda 100644
--- a/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
+++ b/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
@@ -106,7 +106,8 @@ configurationExtPoint.setHandler(extensions => {
 
 		validateProperties(configuration, extension);
 
-		configuration.id = extension.description.uuid || extension.description.id;
+		configuration.id = node.id || extension.description.uuid || extension.description.id;
+		configuration.contributedByExtension = true;
 		configuration.title = configuration.title || extension.description.displayName || extension.description.id;
 		configurations.push(configuration);
 	}
diff --git a/src/vs/workbench/services/configuration/common/configurationModels.ts b/src/vs/workbench/services/configuration/common/configurationModels.ts
index 0d0fda5d2c1..68d7dc962d3 100644
--- a/src/vs/workbench/services/configuration/common/configurationModels.ts
+++ b/src/vs/workbench/services/configuration/common/configurationModels.ts
@@ -8,7 +8,7 @@ import { equals } from 'vs/base/common/objects';
 import { compare, toValuesTree, IConfigurationChangeEvent, ConfigurationTarget, IConfigurationModel, IConfigurationOverrides } from 'vs/platform/configuration/common/configuration';
 import { Configuration as BaseConfiguration, ConfigurationModelParser, ConfigurationChangeEvent, ConfigurationModel, AbstractConfigurationChangeEvent } from 'vs/platform/configuration/common/configurationModels';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { IConfigurationRegistry, IConfigurationPropertySchema, Extensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
+import { IConfigurationRegistry, IConfigurationPropertySchema, Extensions, ConfigurationScope, OVERRIDE_PROPERTY_PATTERN } from 'vs/platform/configuration/common/configurationRegistry';
 import { IStoredWorkspaceFolder } from 'vs/platform/workspaces/common/workspaces';
 import { Workspace } from 'vs/platform/workspace/common/workspace';
 import { ResourceMap } from 'vs/base/common/map';
@@ -101,18 +101,27 @@ export class FolderSettingsModelParser extends ConfigurationModelParser {
 	}
 
 	private parseWorkspaceSettings(rawSettings: any): void {
-		const rawWorkspaceSettings = {};
 		const configurationProperties = Registry.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurationProperties();
-		for (let key in rawSettings) {
-			const scope = this.getScope(key, configurationProperties);
-			if (this.scopes.indexOf(scope) !== -1) {
-				rawWorkspaceSettings[key] = rawSettings[key];
-			}
-		}
+		const rawWorkspaceSettings = this.filterByScope(rawSettings, configurationProperties, true);
 		const configurationModel = this.parseRaw(rawWorkspaceSettings);
 		this._settingsModel = new ConfigurationModel(configurationModel.contents, configurationModel.keys, configurationModel.overrides);
 	}
 
+	private filterByScope(properties: {}, configurationProperties: { [qualifiedKey: string]: IConfigurationPropertySchema }, filterOverriddenProperties: boolean): {} {
+		const result = {};
+		for (let key in properties) {
+			if (OVERRIDE_PROPERTY_PATTERN.test(key) && filterOverriddenProperties) {
+				result[key] = this.filterByScope(properties[key], configurationProperties, false);
+			} else {
+				const scope = this.getScope(key, configurationProperties);
+				if (this.scopes.indexOf(scope) !== -1) {
+					result[key] = properties[key];
+				}
+			}
+		}
+		return result;
+	}
+
 	private getScope(key: string, configurationProperties: { [qualifiedKey: string]: IConfigurationPropertySchema }): ConfigurationScope {
 		const propertySchema = configurationProperties[key];
 		return propertySchema ? propertySchema.scope : ConfigurationScope.WINDOW;
diff --git a/src/vs/workbench/services/configuration/node/configuration.ts b/src/vs/workbench/services/configuration/node/configuration.ts
index a47582c4722..e09d62ad085 100644
--- a/src/vs/workbench/services/configuration/node/configuration.ts
+++ b/src/vs/workbench/services/configuration/node/configuration.ts
@@ -284,7 +284,7 @@ export class FileServiceBasedFolderConfiguration extends AbstractFolderConfigura
 				}
 			}).then(null, err => [] /* never fail this call */);
 
-		return bulkContentFetchromise.then(() => TPromise.join(workspaceFilePathToConfiguration).then(result => collections.values(result)));
+		return bulkContentFetchromise.then(() => TPromise.join(collections.values(workspaceFilePathToConfiguration)));
 	}
 
 	private handleWorkspaceFileEvents(event: FileChangesEvent): void {
@@ -489,4 +489,4 @@ export class FolderConfiguration extends Disposable implements IFolderConfigurat
 		}
 		return TPromise.as(null);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/services/configuration/node/configurationEditingService.ts b/src/vs/workbench/services/configuration/node/configurationEditingService.ts
index ffea6529bbf..cc274bdbdb2 100644
--- a/src/vs/workbench/services/configuration/node/configurationEditingService.ts
+++ b/src/vs/workbench/services/configuration/node/configurationEditingService.ts
@@ -371,7 +371,7 @@ export class ConfigurationEditingService {
 			return false;
 		}
 		const parseErrors: json.ParseError[] = [];
-		json.parse(model.getValue(), parseErrors, { allowTrailingComma: true });
+		json.parse(model.getValue(), parseErrors);
 		return parseErrors.length > 0;
 	}
 
diff --git a/src/vs/workbench/services/configuration/node/configurationService.ts b/src/vs/workbench/services/configuration/node/configurationService.ts
index f304dc4c546..f464bea68ba 100644
--- a/src/vs/workbench/services/configuration/node/configurationService.ts
+++ b/src/vs/workbench/services/configuration/node/configurationService.ts
@@ -80,7 +80,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 		this._register(this.userConfiguration.onDidChangeConfiguration(() => this.onUserConfigurationChanged()));
 		this._register(this.workspaceConfiguration.onDidUpdateConfiguration(() => this.onWorkspaceConfigurationChanged()));
 
-		this._register(Registry.as<IConfigurationRegistry>(Extensions.Configuration).onDidRegisterConfiguration(e => this.registerConfigurationSchemas()));
+		this._register(Registry.as<IConfigurationRegistry>(Extensions.Configuration).onDidSchemaChange(e => this.registerConfigurationSchemas()));
 		this._register(Registry.as<IConfigurationRegistry>(Extensions.Configuration).onDidRegisterConfiguration(configurationProperties => this.onDefaultConfigurationChanged(configurationProperties)));
 
 		this.workspaceEditingQueue = new Queue<void>();
@@ -295,9 +295,9 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 		return this._configuration.keys();
 	}
 
-	initialize(arg: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IWindowConfiguration): TPromise<any> {
+	initialize(arg: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IWindowConfiguration, postInitialisationTask: () => void = () => null): TPromise<any> {
 		return this.createWorkspace(arg)
-			.then(workspace => this.updateWorkspaceAndInitializeConfiguration(workspace));
+			.then(workspace => this.updateWorkspaceAndInitializeConfiguration(workspace, postInitialisationTask));
 	}
 
 	acquireFileService(fileService: IFileService): void {
@@ -361,7 +361,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 		return TPromise.as(new Workspace(id));
 	}
 
-	private updateWorkspaceAndInitializeConfiguration(workspace: Workspace): TPromise<void> {
+	private updateWorkspaceAndInitializeConfiguration(workspace: Workspace, postInitialisationTask: () => void): TPromise<void> {
 		const hasWorkspaceBefore = !!this.workspace;
 		let previousState: WorkbenchState;
 		let previousWorkspacePath: string;
@@ -377,6 +377,9 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 		}
 
 		return this.initializeConfiguration().then(() => {
+
+			postInitialisationTask(); // Post initialisation task should be run before triggering events.
+
 			// Trigger changes after configuration initialization so that configuration is up to date.
 			if (hasWorkspaceBefore) {
 				const newState = this.getWorkbenchState();
diff --git a/src/vs/workbench/services/configuration/node/jsonEditingService.ts b/src/vs/workbench/services/configuration/node/jsonEditingService.ts
index 2c47d99e7c6..13f2fe32f22 100644
--- a/src/vs/workbench/services/configuration/node/jsonEditingService.ts
+++ b/src/vs/workbench/services/configuration/node/jsonEditingService.ts
@@ -95,7 +95,7 @@ export class JSONEditingService implements IJSONEditingService {
 
 	private hasParseErrors(model: ITextModel): boolean {
 		const parseErrors: json.ParseError[] = [];
-		json.parse(model.getValue(), parseErrors, { allowTrailingComma: true });
+		json.parse(model.getValue(), parseErrors);
 		return parseErrors.length > 0;
 	}
 
diff --git a/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts b/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts
index 2a397b9df49..ec8107bed48 100644
--- a/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts
+++ b/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts
@@ -30,7 +30,8 @@ suite('FolderSettingsModelParser', () => {
 				'FolderSettingsModelParser.resource': {
 					'type': 'string',
 					'default': 'isSet',
-					scope: ConfigurationScope.RESOURCE
+					scope: ConfigurationScope.RESOURCE,
+					overridable: true
 				},
 				'FolderSettingsModelParser.application': {
 					'type': 'string',
@@ -57,6 +58,14 @@ suite('FolderSettingsModelParser', () => {
 		assert.deepEqual(testObject.configurationModel.contents, { 'FolderSettingsModelParser': { 'resource': 'resource' } });
 	});
 
+	test('parse overridable resource settings', () => {
+		const testObject = new FolderSettingsModelParser('settings', [ConfigurationScope.RESOURCE]);
+
+		testObject.parse(JSON.stringify({ '[json]': { 'FolderSettingsModelParser.window': 'window', 'FolderSettingsModelParser.resource': 'resource', 'FolderSettingsModelParser.application': 'executable' } }));
+
+		assert.deepEqual(testObject.configurationModel.overrides, [{ 'contents': { 'FolderSettingsModelParser': { 'resource': 'resource' } }, 'identifiers': ['json'] }]);
+	});
+
 	test('reprocess folder settings excludes application setting', () => {
 		const testObject = new FolderSettingsModelParser('settings', [ConfigurationScope.RESOURCE, ConfigurationScope.WINDOW]);
 
diff --git a/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts b/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
index 5c323ca2409..8832ac16a31 100644
--- a/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
+++ b/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
@@ -12,30 +12,29 @@ import * as dom from 'vs/base/browser/dom';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 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';
+import { Disposable } from 'vs/base/common/lifecycle';
 
-export class ContextMenuService implements IContextMenuService {
+export class ContextMenuService extends Disposable implements IContextMenuService {
 
-	public _serviceBrand: any;
-	private _onDidContextMenu = new Emitter<void>();
+	_serviceBrand: any;
+
+	private _onDidContextMenu = this._register(new Emitter<void>());
+	get onDidContextMenu(): Event<void> { return this._onDidContextMenu.event; }
 
 	constructor(
 		@INotificationService private notificationService: INotificationService,
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IKeybindingService private keybindingService: IKeybindingService
 	) {
+		super();
 	}
 
-	public get onDidContextMenu(): Event<void> {
-		return this._onDidContextMenu.event;
-	}
-
-	public showContextMenu(delegate: IContextMenuDelegate): void {
+	showContextMenu(delegate: IContextMenuDelegate): void {
 		delegate.getActions().then(actions => {
 			if (!actions.length) {
 				return TPromise.as(null);
diff --git a/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts b/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
index 627c221fa6c..2b63e252efb 100644
--- a/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
+++ b/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
@@ -54,7 +54,7 @@ export const NullCrashReporterService: ICrashReporterService = {
 
 export class CrashReporterService implements ICrashReporterService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private options: Electron.CrashReporterStartOptions;
 	private isEnabled: boolean;
@@ -114,7 +114,7 @@ export class CrashReporterService implements ICrashReporterService {
 		return submitURL;
 	}
 
-	public getChildProcessStartOptions(name: string): Electron.CrashReporterStartOptions {
+	getChildProcessStartOptions(name: string): Electron.CrashReporterStartOptions {
 
 		// Experimental crash reporting support for child processes on Mac only for now
 		if (this.isEnabled && isMacintosh) {
diff --git a/src/vs/workbench/services/decorations/browser/decorations.ts b/src/vs/workbench/services/decorations/browser/decorations.ts
index e777db83119..6d1e6607375 100644
--- a/src/vs/workbench/services/decorations/browser/decorations.ts
+++ b/src/vs/workbench/services/decorations/browser/decorations.ts
@@ -9,7 +9,7 @@ import URI from 'vs/base/common/uri';
 import { Event } from 'vs/base/common/event';
 import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import { TPromise } from 'vs/base/common/winjs.base';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export const IDecorationsService = createDecorator<IDecorationsService>('IFileDecorationsService');
 
@@ -32,7 +32,7 @@ export interface IDecoration {
 export interface IDecorationsProvider {
 	readonly label: string;
 	readonly onDidChange: Event<URI[]>;
-	provideDecorations(uri: URI): IDecorationData | TPromise<IDecorationData>;
+	provideDecorations(uri: URI, token: CancellationToken): IDecorationData | Thenable<IDecorationData>;
 }
 
 export interface IResourceDecorationChangeEvent {
diff --git a/src/vs/workbench/services/decorations/browser/decorationsService.ts b/src/vs/workbench/services/decorations/browser/decorationsService.ts
index 513955a5b04..146bafc26a3 100644
--- a/src/vs/workbench/services/decorations/browser/decorationsService.ts
+++ b/src/vs/workbench/services/decorations/browser/decorationsService.ts
@@ -17,8 +17,8 @@ import { IdGenerator } from 'vs/base/common/idGenerator';
 import { IIterator } from 'vs/base/common/iterator';
 import { isFalsyOrWhitespace } from 'vs/base/common/strings';
 import { localize } from 'vs/nls';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
+import { CancellationTokenSource } from 'vs/base/common/cancellation';
 
 class DecorationRule {
 
@@ -180,7 +180,7 @@ class DecorationStyles {
 		let usedDecorations = new Set<string>();
 		for (let e = iter.next(); !e.done; e = iter.next()) {
 			e.value.data.forEach((value, key) => {
-				if (!isThenable<any>(value) && value) {
+				if (value && !(value instanceof DecorationDataRequest)) {
 					usedDecorations.add(DecorationRule.keyOf(value));
 				}
 			});
@@ -229,9 +229,16 @@ class FileDecorationChangeEvent implements IResourceDecorationChangeEvent {
 	}
 }
 
+class DecorationDataRequest {
+	constructor(
+		readonly source: CancellationTokenSource,
+		readonly thenable: Thenable<void>,
+	) { }
+}
+
 class DecorationProviderWrapper {
 
-	readonly data = TernarySearchTree.forPaths<TPromise<void> | IDecorationData>();
+	readonly data = TernarySearchTree.forPaths<DecorationDataRequest | IDecorationData>();
 	private readonly _dispoable: IDisposable;
 
 	constructor(
@@ -275,7 +282,7 @@ class DecorationProviderWrapper {
 			item = this._fetchData(uri);
 		}
 
-		if (item && !isThenable<void>(item)) {
+		if (item && !(item instanceof DecorationDataRequest)) {
 			// found something (which isn't pending anymore)
 			callback(item, false);
 		}
@@ -285,7 +292,7 @@ class DecorationProviderWrapper {
 			const iter = this.data.findSuperstr(key);
 			if (iter) {
 				for (let item = iter.next(); !item.done; item = iter.next()) {
-					if (item.value && !isThenable<void>(item.value)) {
+					if (item.value && !(item.value instanceof DecorationDataRequest)) {
 						callback(item.value, true);
 					}
 				}
@@ -297,27 +304,28 @@ class DecorationProviderWrapper {
 
 		// check for pending request and cancel it
 		const pendingRequest = this.data.get(uri.toString());
-		if (TPromise.is(pendingRequest)) {
-			pendingRequest.cancel();
+		if (pendingRequest instanceof DecorationDataRequest) {
+			pendingRequest.source.cancel();
 			this.data.delete(uri.toString());
 		}
 
-		const dataOrThenable = this._provider.provideDecorations(uri);
+		const source = new CancellationTokenSource();
+		const dataOrThenable = this._provider.provideDecorations(uri, source.token);
 		if (!isThenable(dataOrThenable)) {
 			// sync -> we have a result now
 			return this._keepItem(uri, dataOrThenable);
 
 		} else {
 			// async -> we have a result soon
-			const request = TPromise.wrap(dataOrThenable).then(data => {
+			const request = new DecorationDataRequest(source, Promise.resolve(dataOrThenable).then(data => {
 				if (this.data.get(uri.toString()) === request) {
 					this._keepItem(uri, data);
 				}
-			}, err => {
+			}).catch(err => {
 				if (!isPromiseCanceledError(err) && this.data.get(uri.toString()) === request) {
 					this.data.delete(uri.toString());
 				}
-			});
+			}));
 
 			this.data.set(uri.toString(), request);
 			return undefined;
diff --git a/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts b/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts
index f8469b69e23..c94ec82944a 100644
--- a/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts
+++ b/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts
@@ -12,6 +12,7 @@ import URI from 'vs/base/common/uri';
 import { Event, toPromise, Emitter } from 'vs/base/common/event';
 import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
 import { TPromise } from 'vs/base/common/winjs.base';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 suite('DecorationsService', function () {
 
@@ -34,7 +35,7 @@ suite('DecorationsService', function () {
 			readonly onDidChange: Event<URI[]> = Event.None;
 			provideDecorations(uri: URI) {
 				callCounter += 1;
-				return new TPromise<IDecorationData>(resolve => {
+				return new Promise<IDecorationData>(resolve => {
 					setTimeout(() => resolve({
 						color: 'someBlue',
 						tooltip: 'T'
@@ -174,6 +175,7 @@ suite('DecorationsService', function () {
 	test('Decorations not showing up for second root folder #48502', async function () {
 
 		let cancelCount = 0;
+		let winjsCancelCount = 0;
 		let callCount = 0;
 
 		let provider = new class implements IDecorationsProvider {
@@ -183,14 +185,19 @@ suite('DecorationsService', function () {
 
 			label: string = 'foo';
 
-			provideDecorations(uri: URI): TPromise<IDecorationData> {
+			provideDecorations(uri: URI, token: CancellationToken): TPromise<IDecorationData> {
+
+				token.onCancellationRequested(() => {
+					cancelCount += 1;
+				});
+
 				return new TPromise(resolve => {
 					callCount += 1;
 					setTimeout(() => {
 						resolve({ letter: 'foo' });
 					}, 10);
 				}, () => {
-					cancelCount += 1;
+					winjsCancelCount += 1;
 				});
 			}
 		};
@@ -204,6 +211,7 @@ suite('DecorationsService', function () {
 		service.getDecoration(uri, false);
 
 		assert.equal(cancelCount, 1);
+		assert.equal(winjsCancelCount, 0);
 		assert.equal(callCount, 2);
 
 		reg.dispose();
@@ -219,7 +227,7 @@ suite('DecorationsService', function () {
 				if (uri.path.match(/hello$/)) {
 					return { tooltip: 'FOO', weight: 17, bubble: true };
 				} else {
-					return new TPromise<IDecorationData>(_resolve => resolve = _resolve);
+					return new Promise<IDecorationData>(_resolve => resolve = _resolve);
 				}
 			}
 		});
diff --git a/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts b/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts
index df621fb08e1..610c5ef1946 100644
--- a/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts
+++ b/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts
@@ -31,14 +31,13 @@ interface IMassagedMessageBoxOptions {
 
 export class DialogService implements IDialogService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	constructor(
 		@IWindowService private windowService: IWindowService
-	) {
-	}
+	) { }
 
-	public confirm(confirmation: IConfirmation): TPromise<IConfirmationResult> {
+	confirm(confirmation: IConfirmation): TPromise<IConfirmationResult> {
 		const { options, buttonIndexMap } = this.massageMessageBoxOptions(this.getConfirmOptions(confirmation));
 
 		return this.windowService.showMessageBox(options).then(result => {
@@ -86,7 +85,7 @@ export class DialogService implements IDialogService {
 		return opts;
 	}
 
-	public show(severity: Severity, message: string, buttons: string[], dialogOptions?: IDialogOptions): TPromise<number> {
+	show(severity: Severity, message: string, buttons: string[], dialogOptions?: IDialogOptions): TPromise<number> {
 		const { options, buttonIndexMap } = this.massageMessageBoxOptions({
 			message,
 			buttons,
diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts
index 4feecb72897..7b29d31a644 100644
--- a/src/vs/workbench/services/editor/browser/editorService.ts
+++ b/src/vs/workbench/services/editor/browser/editorService.ts
@@ -25,7 +25,7 @@ import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
 import { localize } from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IEditorGroupsService, IEditorGroup, GroupsOrder, IEditorReplacement, GroupChangeKind, preferredSideBySideGroupDirection } from 'vs/workbench/services/group/common/editorGroupsService';
-import { IResourceEditor, ACTIVE_GROUP_TYPE, SIDE_GROUP_TYPE, SIDE_GROUP, ACTIVE_GROUP, IResourceEditorReplacement, IOpenEditorOverrideHandler } from 'vs/workbench/services/editor/common/editorService';
+import { IResourceEditor, ACTIVE_GROUP_TYPE, SIDE_GROUP_TYPE, SIDE_GROUP, IResourceEditorReplacement, IOpenEditorOverrideHandler } from 'vs/workbench/services/editor/common/editorService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { Disposable, IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
 import { coalesce } from 'vs/base/common/arrays';
@@ -260,18 +260,13 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 			return group;
 		}
 
-		// Group: Active Group
-		if (group === ACTIVE_GROUP) {
-			targetGroup = this.editorGroupService.activeGroup;
-		}
-
 		// Group: Side by Side
-		else if (group === SIDE_GROUP) {
+		if (group === SIDE_GROUP) {
 			targetGroup = this.findSideBySideGroup();
 		}
 
 		// Group: Specific Group
-		else if (typeof group === 'number') {
+		else if (typeof group === 'number' && group >= 0) {
 			targetGroup = this.editorGroupService.getGroup(group);
 		}
 
@@ -462,7 +457,7 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 
 	//#region createInput()
 
-	createInput(input: IEditorInputWithOptions | IEditorInput | IResourceEditor): EditorInput {
+	createInput(input: IEditorInputWithOptions | IEditorInput | IResourceEditor, options?: { forceFileInput: boolean }): EditorInput {
 
 		// Typed Editor Input Support (EditorInput)
 		if (input instanceof EditorInput) {
@@ -478,8 +473,8 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 		// Side by Side Support
 		const resourceSideBySideInput = <IResourceSideBySideInput>input;
 		if (resourceSideBySideInput.masterResource && resourceSideBySideInput.detailResource) {
-			const masterInput = this.createInput({ resource: resourceSideBySideInput.masterResource });
-			const detailInput = this.createInput({ resource: resourceSideBySideInput.detailResource });
+			const masterInput = this.createInput({ resource: resourceSideBySideInput.masterResource }, options);
+			const detailInput = this.createInput({ resource: resourceSideBySideInput.detailResource }, options);
 
 			return new SideBySideEditorInput(
 				resourceSideBySideInput.label || masterInput.getName(),
@@ -492,8 +487,8 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 		// Diff Editor Support
 		const resourceDiffInput = <IResourceDiffInput>input;
 		if (resourceDiffInput.leftResource && resourceDiffInput.rightResource) {
-			const leftInput = this.createInput({ resource: resourceDiffInput.leftResource });
-			const rightInput = this.createInput({ resource: resourceDiffInput.rightResource });
+			const leftInput = this.createInput({ resource: resourceDiffInput.leftResource }, options);
+			const rightInput = this.createInput({ resource: resourceDiffInput.rightResource }, options);
 			const label = resourceDiffInput.label || localize('compareLabels', "{0} ↔ {1}", this.toDiffLabel(leftInput, this.workspaceContextService, this.environmentService), this.toDiffLabel(rightInput, this.workspaceContextService, this.environmentService));
 
 			return new DiffEditorInput(label, resourceDiffInput.description, leftInput, rightInput);
@@ -518,13 +513,13 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 				label = basename(resourceInput.resource.fsPath); // derive the label from the path (but not for data URIs)
 			}
 
-			return this.createOrGet(resourceInput.resource, this.instantiationService, label, resourceInput.description, resourceInput.encoding) as EditorInput;
+			return this.createOrGet(resourceInput.resource, this.instantiationService, label, resourceInput.description, resourceInput.encoding, options && options.forceFileInput) as EditorInput;
 		}
 
 		return null;
 	}
 
-	private createOrGet(resource: URI, instantiationService: IInstantiationService, label: string, description: string, encoding?: string): ICachedEditorInput {
+	private createOrGet(resource: URI, instantiationService: IInstantiationService, label: string, description: string, encoding?: string, forceFileInput?: boolean): ICachedEditorInput {
 		if (EditorService.CACHE.has(resource)) {
 			const input = EditorService.CACHE.get(resource);
 			if (input instanceof ResourceEditorInput) {
@@ -540,7 +535,7 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 		let input: ICachedEditorInput;
 
 		// File
-		if (this.fileService.canHandleResource(resource)) {
+		if (this.fileService.canHandleResource(resource) || forceFileInput /* fix for https://github.com/Microsoft/vscode/issues/48275 */) {
 			input = this.fileInputFactory.createFileInput(resource, encoding, instantiationService);
 		}
 
diff --git a/src/vs/workbench/services/editor/common/editorService.ts b/src/vs/workbench/services/editor/common/editorService.ts
index b6b0baa44bc..88209389946 100644
--- a/src/vs/workbench/services/editor/common/editorService.ts
+++ b/src/vs/workbench/services/editor/common/editorService.ts
@@ -166,5 +166,5 @@ export interface IEditorService {
 	/**
 	 * Converts a lightweight input to a workbench editor input.
 	 */
-	createInput(input: IResourceEditor): IEditorInput;
+	createInput(input: IResourceEditor, options?: { forceFileInput: boolean }): IEditorInput;
 }
\ No newline at end of file
diff --git a/src/vs/workbench/services/editor/test/browser/editorService.test.ts b/src/vs/workbench/services/editor/test/browser/editorService.test.ts
index f5c38e6dd49..41138949711 100644
--- a/src/vs/workbench/services/editor/test/browser/editorService.test.ts
+++ b/src/vs/workbench/services/editor/test/browser/editorService.test.ts
@@ -494,7 +494,7 @@ suite('Editor service', () => {
 		assertActiveEditorChangedEvent(true);
 		assertVisibleEditorsChangedEvent(true);
 
-		editor = await service.openEditor(input, { forceOpen: true });
+		editor = await service.openEditor(input, { forceReload: true });
 		assertActiveEditorChangedEvent(false);
 		assertVisibleEditorsChangedEvent(false);
 
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
index 4c8fae279e7..c2f0c78bfe2 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
@@ -544,9 +544,12 @@ export class ExtensionService extends Disposable implements IExtensionService {
 				const extensionsToDisable: IExtensionIdentifier[] = [];
 				const userMigratedSystemExtensions: IExtensionIdentifier[] = [{ id: BetterMergeId }];
 
-				const enableProposedApiForAll = !this._environmentService.isBuilt || (!!this._environmentService.extensionDevelopmentPath && product.nameLong.indexOf('Insiders') >= 0);
 				const enableProposedApiFor: string | string[] = this._environmentService.args['enable-proposed-api'] || [];
 
+				const enableProposedApiForAll = !this._environmentService.isBuilt ||
+					(!!this._environmentService.extensionDevelopmentPath && product.nameLong.indexOf('Insiders') >= 0) ||
+					(enableProposedApiFor.length === 0 && 'enable-proposed-api' in this._environmentService.args);
+
 				for (const extension of allExtensions) {
 					const isExtensionUnderDevelopment = this._environmentService.isExtensionDevelopment && extension.extensionLocation.scheme === Schemas.file && extension.extensionLocation.fsPath.indexOf(this._environmentService.extensionDevelopmentPath) === 0;
 					// Do not disable extensions under development
@@ -646,7 +649,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 		}
 	}
 
-	private static async _validateExtensionsCache(windowService: IWindowService, notificationService: INotificationService, environmentService: IEnvironmentService, cacheKey: string, input: ExtensionScannerInput): TPromise<void> {
+	private static async _validateExtensionsCache(windowService: IWindowService, notificationService: INotificationService, environmentService: IEnvironmentService, cacheKey: string, input: ExtensionScannerInput): Promise<void> {
 		const cacheFolder = path.join(environmentService.userDataPath, MANIFEST_CACHE_FOLDER);
 		const cacheFile = path.join(cacheFolder, cacheKey);
 
@@ -681,7 +684,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 		);
 	}
 
-	private static async _readExtensionCache(environmentService: IEnvironmentService, cacheKey: string): TPromise<IExtensionCacheData> {
+	private static async _readExtensionCache(environmentService: IEnvironmentService, cacheKey: string): Promise<IExtensionCacheData> {
 		const cacheFolder = path.join(environmentService.userDataPath, MANIFEST_CACHE_FOLDER);
 		const cacheFile = path.join(cacheFolder, cacheKey);
 
@@ -695,7 +698,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 		return null;
 	}
 
-	private static async _writeExtensionCache(environmentService: IEnvironmentService, cacheKey: string, cacheContents: IExtensionCacheData): TPromise<void> {
+	private static async _writeExtensionCache(environmentService: IEnvironmentService, cacheKey: string, cacheContents: IExtensionCacheData): Promise<void> {
 		const cacheFolder = path.join(environmentService.userDataPath, MANIFEST_CACHE_FOLDER);
 		const cacheFile = path.join(cacheFolder, cacheKey);
 
@@ -712,7 +715,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 		}
 	}
 
-	private static async _scanExtensionsWithCache(windowService: IWindowService, notificationService: INotificationService, environmentService: IEnvironmentService, cacheKey: string, input: ExtensionScannerInput, log: ILog): TPromise<IExtensionDescription[]> {
+	private static async _scanExtensionsWithCache(windowService: IWindowService, notificationService: INotificationService, environmentService: IEnvironmentService, cacheKey: string, input: ExtensionScannerInput, log: ILog): Promise<IExtensionDescription[]> {
 		if (input.devMode) {
 			// Do not cache when running out of sources...
 			return ExtensionScanner.scanExtensions(input, log);
@@ -785,7 +788,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 				log
 			);
 
-			let finalBuiltinExtensions: TPromise<IExtensionDescription[]> = builtinExtensions;
+			let finalBuiltinExtensions: TPromise<IExtensionDescription[]> = TPromise.wrap(builtinExtensions);
 
 			if (devMode) {
 				const builtInExtensionsFilePath = path.normalize(path.join(URI.parse(require.toUrl('')).fsPath, '..', 'build', 'builtInExtensions.json'));
diff --git a/src/vs/workbench/services/extensions/node/extensionPoints.ts b/src/vs/workbench/services/extensions/node/extensionPoints.ts
index 8de75c2f9a6..90cfe42920d 100644
--- a/src/vs/workbench/services/extensions/node/extensionPoints.ts
+++ b/src/vs/workbench/services/extensions/node/extensionPoints.ts
@@ -208,7 +208,7 @@ class ExtensionManifestNLSReplacer extends ExtensionManifestHandler {
 	 * Parses original message bundle, returns null if the original message bundle is null.
 	 */
 	private static resolveOriginalMessageBundle(originalMessageBundle: string, errors: json.ParseError[]) {
-		return new TPromise<{ [key: string]: string; }>((c, e, p) => {
+		return new TPromise<{ [key: string]: string; }>((c, e) => {
 			if (originalMessageBundle) {
 				pfs.readFile(originalMessageBundle).then(originalBundleContent => {
 					c(json.parse(originalBundleContent.toString(), errors));
@@ -226,7 +226,7 @@ class ExtensionManifestNLSReplacer extends ExtensionManifestHandler {
 	 * If the localized file is not present, returns null for the original and marks original as localized.
 	 */
 	private static findMessageBundles(nlsConfig: NlsConfiguration, basename: string): TPromise<{ localized: string, original: string }> {
-		return new TPromise<{ localized: string, original: string }>((c, e, p) => {
+		return new TPromise<{ localized: string, original: string }>((c, e) => {
 			function loop(basename: string, locale: string): void {
 				let toCheck = `${basename}.nls.${locale}.json`;
 				pfs.fileExists(toCheck).then(exists => {
@@ -524,7 +524,7 @@ export class ExtensionScanner {
 	/**
 	 * Scan a list of extensions defined in `absoluteFolderPath`
 	 */
-	public static async scanExtensions(input: ExtensionScannerInput, log: ILog, resolver: IExtensionResolver = null): TPromise<IExtensionDescription[]> {
+	public static async scanExtensions(input: ExtensionScannerInput, log: ILog, resolver: IExtensionResolver = null): Promise<IExtensionDescription[]> {
 		const absoluteFolderPath = input.absoluteFolderPath;
 		const isBuiltin = input.isBuiltin;
 		const isUnderDevelopment = input.isUnderDevelopment;
diff --git a/src/vs/workbench/services/files/electron-browser/encoding.ts b/src/vs/workbench/services/files/electron-browser/encoding.ts
index c1b99f40985..2c9e88b3830 100644
--- a/src/vs/workbench/services/files/electron-browser/encoding.ts
+++ b/src/vs/workbench/services/files/electron-browser/encoding.ts
@@ -14,7 +14,7 @@ import { join, extname } from 'path';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 
 export interface IEncodingOverride {
 	parent?: uri;
@@ -26,9 +26,8 @@ export interface IEncodingOverride {
 // service and then ideally be passed in as option to the file service
 // the file service should talk about string | Buffer for reading and writing and only convert
 // to strings if a encoding is provided
-export class ResourceEncodings implements IResourceEncodings {
+export class ResourceEncodings extends Disposable implements IResourceEncodings {
 	private encodingOverride: IEncodingOverride[];
-	private toDispose: IDisposable[];
 
 	constructor(
 		private textResourceConfigurationService: ITextResourceConfigurationService,
@@ -36,8 +35,9 @@ export class ResourceEncodings implements IResourceEncodings {
 		private contextService: IWorkspaceContextService,
 		encodingOverride?: IEncodingOverride[]
 	) {
+		super();
+
 		this.encodingOverride = encodingOverride || this.getEncodingOverrides();
-		this.toDispose = [];
 
 		this.registerListeners();
 	}
@@ -45,12 +45,12 @@ export class ResourceEncodings implements IResourceEncodings {
 	private registerListeners(): void {
 
 		// Workspace Folder Change
-		this.toDispose.push(this.contextService.onDidChangeWorkspaceFolders(() => {
+		this._register(this.contextService.onDidChangeWorkspaceFolders(() => {
 			this.encodingOverride = this.getEncodingOverrides();
 		}));
 	}
 
-	public getReadEncoding(resource: uri, options: IResolveContentOptions, detected: encoding.IDetectedEncodingResult): string {
+	getReadEncoding(resource: uri, options: IResolveContentOptions, detected: encoding.IDetectedEncodingResult): string {
 		let preferredEncoding: string;
 
 		// Encoding passed in as option
@@ -79,7 +79,7 @@ export class ResourceEncodings implements IResourceEncodings {
 		return this.getEncodingForResource(resource, preferredEncoding);
 	}
 
-	public getWriteEncoding(resource: uri, preferredEncoding?: string): string {
+	getWriteEncoding(resource: uri, preferredEncoding?: string): string {
 		return this.getEncodingForResource(resource, preferredEncoding);
 	}
 
@@ -138,8 +138,4 @@ export class ResourceEncodings implements IResourceEncodings {
 
 		return null;
 	}
-
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
-	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/services/files/electron-browser/fileService.ts b/src/vs/workbench/services/files/electron-browser/fileService.ts
index 75a2c671e52..b91d4371d27 100644
--- a/src/vs/workbench/services/files/electron-browser/fileService.ts
+++ b/src/vs/workbench/services/files/electron-browser/fileService.ts
@@ -18,11 +18,11 @@ import * as arrays from 'vs/base/common/arrays';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as objects from 'vs/base/common/objects';
 import * as extfs from 'vs/base/node/extfs';
-import { nfcall, ThrottledDelayer, asWinJSImport } from 'vs/base/common/async';
+import { nfcall, ThrottledDelayer, toWinJsPromise } from 'vs/base/common/async';
 import uri from 'vs/base/common/uri';
 import * as nls from 'vs/nls';
 import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform';
-import { dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, toDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import * as pfs from 'vs/base/node/pfs';
 import * as encoding from 'vs/base/node/encoding';
@@ -76,9 +76,9 @@ export interface IFileServiceTestOptions {
 	encodingOverride?: IEncodingOverride[];
 }
 
-export class FileService implements IFileService {
+export class FileService extends Disposable implements IFileService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private static readonly FS_EVENT_DELAY = 50; // aggregate and only emit events when changes have stopped for this duration (in ms)
 	private static readonly FS_REWATCH_DELAY = 300; // delay to rewatch a file that was renamed or deleted (in ms)
@@ -89,11 +89,14 @@ export class FileService implements IFileService {
 	private static readonly ENOSPC_ERROR = 'ENOSPC';
 	private static readonly ENOSPC_ERROR_IGNORE_KEY = 'ignoreEnospcError';
 
-	protected readonly _onFileChanges: Emitter<FileChangesEvent>;
-	protected readonly _onAfterOperation: Emitter<FileOperationEvent>;
-	protected readonly _onDidChangeFileSystemProviderRegistrations = new Emitter<IFileSystemProviderRegistrationEvent>();
+	protected readonly _onFileChanges: Emitter<FileChangesEvent> = this._register(new Emitter<FileChangesEvent>());
+	get onFileChanges(): Event<FileChangesEvent> { return this._onFileChanges.event; }
 
-	protected toDispose: IDisposable[];
+	protected readonly _onAfterOperation: Emitter<FileOperationEvent> = this._register(new Emitter<FileOperationEvent>());
+	get onAfterOperation(): Event<FileOperationEvent> { return this._onAfterOperation.event; }
+
+	protected readonly _onDidChangeFileSystemProviderRegistrations = this._register(new Emitter<IFileSystemProviderRegistrationEvent>());
+	get onDidChangeFileSystemProviderRegistrations(): Event<IFileSystemProviderRegistrationEvent> { return this._onDidChangeFileSystemProviderRegistrations.event; }
 
 	private activeWorkspaceFileChangeWatcher: IDisposable;
 	private activeFileChangesWatchers: ResourceMap<fs.FSWatcher>;
@@ -112,13 +115,7 @@ export class FileService implements IFileService {
 		private notificationService: INotificationService,
 		private options: IFileServiceTestOptions = Object.create(null)
 	) {
-		this.toDispose = [];
-
-		this._onFileChanges = new Emitter<FileChangesEvent>();
-		this.toDispose.push(this._onFileChanges);
-
-		this._onAfterOperation = new Emitter<FileOperationEvent>();
-		this.toDispose.push(this._onAfterOperation);
+		super();
 
 		this.activeFileChangesWatchers = new ResourceMap<fs.FSWatcher>();
 		this.fileChangesWatchDelayer = new ThrottledDelayer<void>(FileService.FS_EVENT_DELAY);
@@ -129,7 +126,7 @@ export class FileService implements IFileService {
 		this.registerListeners();
 	}
 
-	public get encoding(): ResourceEncodings {
+	get encoding(): ResourceEncodings {
 		return this._encoding;
 	}
 
@@ -141,7 +138,7 @@ export class FileService implements IFileService {
 		});
 
 		// Workbench State Change
-		this.toDispose.push(this.contextService.onDidChangeWorkbenchState(() => {
+		this._register(this.contextService.onDidChangeWorkbenchState(() => {
 			if (this.lifecycleService.phase >= LifecyclePhase.Running) {
 				this.setupFileWatching();
 			}
@@ -195,14 +192,6 @@ export class FileService implements IFileService {
 		}
 	}
 
-	public get onFileChanges(): Event<FileChangesEvent> {
-		return this._onFileChanges.event;
-	}
-
-	public get onAfterOperation(): Event<FileOperationEvent> {
-		return this._onAfterOperation.event;
-	}
-
 	private setupFileWatching(): void {
 
 		// dispose old if any
@@ -240,30 +229,28 @@ export class FileService implements IFileService {
 		}
 	}
 
-	public readonly onDidChangeFileSystemProviderRegistrations: Event<IFileSystemProviderRegistrationEvent> = this._onDidChangeFileSystemProviderRegistrations.event;
-
-	public registerProvider(scheme: string, provider: IFileSystemProvider): IDisposable {
+	registerProvider(scheme: string, provider: IFileSystemProvider): IDisposable {
 		throw new Error('not implemented');
 	}
 
-	public canHandleResource(resource: uri): boolean {
+	canHandleResource(resource: uri): boolean {
 		return resource.scheme === Schemas.file;
 	}
 
-	public resolveFile(resource: uri, options?: IResolveFileOptions): TPromise<IFileStat> {
+	resolveFile(resource: uri, options?: IResolveFileOptions): TPromise<IFileStat> {
 		return this.resolve(resource, options);
 	}
 
-	public resolveFiles(toResolve: { resource: uri, options?: IResolveFileOptions }[]): TPromise<IResolveFileResult[]> {
+	resolveFiles(toResolve: { resource: uri, options?: IResolveFileOptions }[]): TPromise<IResolveFileResult[]> {
 		return TPromise.join(toResolve.map(resourceAndOptions => this.resolve(resourceAndOptions.resource, resourceAndOptions.options)
 			.then(stat => ({ stat, success: true }), error => ({ stat: void 0, success: false }))));
 	}
 
-	public existsFile(resource: uri): TPromise<boolean> {
+	existsFile(resource: uri): TPromise<boolean> {
 		return this.resolveFile(resource).then(() => true, () => false);
 	}
 
-	public resolveContent(resource: uri, options?: IResolveContentOptions): TPromise<IContent> {
+	resolveContent(resource: uri, options?: IResolveContentOptions): TPromise<IContent> {
 		return this.resolveStreamContent(resource, options).then(streamContent => {
 			return new TPromise<IContent>((resolve, reject) => {
 
@@ -286,7 +273,7 @@ export class FileService implements IFileService {
 		});
 	}
 
-	public resolveStreamContent(resource: uri, options?: IResolveContentOptions): TPromise<IStreamContent> {
+	resolveStreamContent(resource: uri, options?: IResolveContentOptions): TPromise<IStreamContent> {
 
 		// Guard early against attempts to resolve an invalid file path
 		if (resource.scheme !== Schemas.file || !resource.fsPath) {
@@ -577,7 +564,7 @@ export class FileService implements IFileService {
 		});
 	}
 
-	public updateContent(resource: uri, value: string | ITextSnapshot, options: IUpdateContentOptions = Object.create(null)): TPromise<IFileStat> {
+	updateContent(resource: uri, value: string | ITextSnapshot, options: IUpdateContentOptions = Object.create(null)): TPromise<IFileStat> {
 		if (options.writeElevated) {
 			return this.doUpdateContentElevated(resource, value, options);
 		}
@@ -691,7 +678,7 @@ export class FileService implements IFileService {
 			return this.updateContent(uri.file(tmpPath), value, writeOptions).then(() => {
 
 				// 3.) invoke our CLI as super user
-				return asWinJSImport(import('sudo-prompt')).then(sudoPrompt => {
+				return toWinJsPromise(import('sudo-prompt')).then(sudoPrompt => {
 					return new TPromise<void>((c, e) => {
 						const promptOptions = {
 							name: this.environmentService.appNameLong.replace('-', ''),
@@ -739,7 +726,7 @@ export class FileService implements IFileService {
 		});
 	}
 
-	public createFile(resource: uri, content: string = '', options: ICreateFileOptions = Object.create(null)): TPromise<IFileStat> {
+	createFile(resource: uri, content: string = '', options: ICreateFileOptions = Object.create(null)): TPromise<IFileStat> {
 		const absolutePath = this.toAbsolutePath(resource);
 
 		let checkFilePromise: TPromise<boolean>;
@@ -770,7 +757,7 @@ export class FileService implements IFileService {
 		});
 	}
 
-	public createFolder(resource: uri): TPromise<IFileStat> {
+	createFolder(resource: uri): TPromise<IFileStat> {
 
 		// 1.) Create folder
 		const absolutePath = this.toAbsolutePath(resource);
@@ -849,11 +836,11 @@ export class FileService implements IFileService {
 		));
 	}
 
-	public moveFile(source: uri, target: uri, overwrite?: boolean): TPromise<IFileStat> {
+	moveFile(source: uri, target: uri, overwrite?: boolean): TPromise<IFileStat> {
 		return this.moveOrCopyFile(source, target, false, overwrite);
 	}
 
-	public copyFile(source: uri, target: uri, overwrite?: boolean): TPromise<IFileStat> {
+	copyFile(source: uri, target: uri, overwrite?: boolean): TPromise<IFileStat> {
 		return this.moveOrCopyFile(source, target, true, overwrite);
 	}
 
@@ -899,7 +886,7 @@ export class FileService implements IFileService {
 					return TPromise.wrapError<boolean>(new Error(nls.localize('unableToMoveCopyError', "Unable to move/copy. File would replace folder it is contained in."))); // catch this corner case!
 				}
 
-				deleteTargetPromise = this.del(uri.file(targetPath));
+				deleteTargetPromise = this.del(uri.file(targetPath), { recursive: true });
 			}
 
 			return deleteTargetPromise.then(() => {
@@ -920,12 +907,12 @@ export class FileService implements IFileService {
 		});
 	}
 
-	public del(resource: uri, useTrash?: boolean): TPromise<void> {
-		if (useTrash) {
+	del(resource: uri, options?: { useTrash?: boolean, recursive?: boolean }): TPromise<void> {
+		if (options && options.useTrash) {
 			return this.doMoveItemToTrash(resource);
 		}
 
-		return this.doDelete(resource);
+		return this.doDelete(resource, options && options.recursive);
 	}
 
 	private doMoveItemToTrash(resource: uri): TPromise<void> {
@@ -942,13 +929,34 @@ export class FileService implements IFileService {
 		return TPromise.as(void 0);
 	}
 
-	private doDelete(resource: uri): TPromise<void> {
+	private doDelete(resource: uri, recursive: boolean): TPromise<void> {
 		const absolutePath = this.toAbsolutePath(resource);
 
-		return pfs.del(absolutePath, os.tmpdir()).then(() => {
+		let assertNonRecursiveDelete: TPromise<void>;
+		if (!recursive) {
+			assertNonRecursiveDelete = pfs.stat(absolutePath).then(stat => {
+				if (!stat.isDirectory()) {
+					return TPromise.as(void 0);
+				}
 
-			// Events
-			this._onAfterOperation.fire(new FileOperationEvent(resource, FileOperation.DELETE));
+				return pfs.readdir(absolutePath).then(children => {
+					if (children.length === 0) {
+						return TPromise.as(void 0);
+					}
+
+					return TPromise.wrapError(new Error(nls.localize('deleteFailed', "Failed to delete non-empty folder '{0}'.", paths.basename(absolutePath))));
+				});
+			}, error => TPromise.as(void 0) /* ignore errors */);
+		} else {
+			assertNonRecursiveDelete = TPromise.as(void 0);
+		}
+
+		return assertNonRecursiveDelete.then(() => {
+			return pfs.del(absolutePath, os.tmpdir()).then(() => {
+
+				// Events
+				this._onAfterOperation.fire(new FileOperationEvent(resource, FileOperation.DELETE));
+			});
 		});
 	}
 
@@ -979,7 +987,7 @@ export class FileService implements IFileService {
 		});
 	}
 
-	public watchFileChanges(resource: uri): void {
+	watchFileChanges(resource: uri): void {
 		assert.ok(resource && resource.scheme === Schemas.file, `Invalid resource for watching: ${resource}`);
 
 		// Create or get watcher for provided path
@@ -1068,7 +1076,7 @@ export class FileService implements IFileService {
 		});
 	}
 
-	public unwatchFileChanges(resource: uri): void {
+	unwatchFileChanges(resource: uri): void {
 		const watcher = this.activeFileChangesWatchers.get(resource);
 		if (watcher) {
 			watcher.close();
@@ -1076,8 +1084,8 @@ export class FileService implements IFileService {
 		}
 	}
 
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
+	dispose(): void {
+		super.dispose();
 
 		if (this.activeWorkspaceFileChangeWatcher) {
 			this.activeWorkspaceFileChangeWatcher.dispose();
@@ -1123,7 +1131,7 @@ export class StatResolver {
 		this.etag = etag(size, mtime);
 	}
 
-	public resolve(options: IResolveFileOptions): TPromise<IFileStat> {
+	resolve(options: IResolveFileOptions): TPromise<IFileStat> {
 
 		// General Data
 		const fileStat: IFileStat = {
diff --git a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
index 108c385d1ae..3f2e2a1806f 100644
--- a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
+++ b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
@@ -6,7 +6,7 @@
 
 import { posix } from 'path';
 import { flatten, isFalsyOrEmpty } from 'vs/base/common/arrays';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import { TernarySearchTree, keys } from 'vs/base/common/map';
 import { Schemas } from 'vs/base/common/network';
 import URI from 'vs/base/common/uri';
@@ -86,9 +86,8 @@ export function toDeepIFileStat(provider: IFileSystemProvider, tuple: [URI, ISta
 	});
 }
 
-class WorkspaceWatchLogic {
+class WorkspaceWatchLogic extends Disposable {
 
-	private _disposables: IDisposable[] = [];
 	private _watches = new Map<string, URI>();
 
 	constructor(
@@ -96,9 +95,11 @@ class WorkspaceWatchLogic {
 		@IConfigurationService private _configurationService: IConfigurationService,
 		@IWorkspaceContextService private _contextService: IWorkspaceContextService,
 	) {
+		super();
+
 		this._refresh();
 
-		this._disposables.push(this._contextService.onDidChangeWorkspaceFolders(e => {
+		this._register(this._contextService.onDidChangeWorkspaceFolders(e => {
 			for (const removed of e.removed) {
 				this._unwatchWorkspace(removed.uri);
 			}
@@ -106,10 +107,10 @@ class WorkspaceWatchLogic {
 				this._watchWorkspace(added.uri);
 			}
 		}));
-		this._disposables.push(this._contextService.onDidChangeWorkbenchState(e => {
+		this._register(this._contextService.onDidChangeWorkbenchState(e => {
 			this._refresh();
 		}));
-		this._disposables.push(this._configurationService.onDidChangeConfiguration(e => {
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('files.watcherExclude')) {
 				this._refresh();
 			}
@@ -118,7 +119,7 @@ class WorkspaceWatchLogic {
 
 	dispose(): void {
 		this._unwatchWorkspaces();
-		this._disposables = dispose(this._disposables);
+		super.dispose();
 	}
 
 	private _refresh(): void {
@@ -184,7 +185,7 @@ export class RemoteFileService extends FileService {
 
 		this._provider = new Map<string, IFileSystemProvider>();
 		this._lastKnownSchemes = JSON.parse(this._storageService.get('remote_schemes', undefined, '[]'));
-		this.toDispose.push(new WorkspaceWatchLogic(this, configurationService, contextService));
+		this._register(new WorkspaceWatchLogic(this, configurationService, contextService));
 	}
 
 	registerProvider(scheme: string, provider: IFileSystemProvider): IDisposable {
@@ -519,12 +520,12 @@ export class RemoteFileService extends FileService {
 
 	// --- delete
 
-	del(resource: URI, useTrash?: boolean): TPromise<void> {
+	del(resource: URI, options?: { useTrash?: boolean, recursive?: boolean }): TPromise<void> {
 		if (resource.scheme === Schemas.file) {
-			return super.del(resource, useTrash);
+			return super.del(resource, options);
 		} else {
 			return this._withProvider(resource).then(RemoteFileService._throwIfFileSystemIsReadonly).then(provider => {
-				return provider.delete(resource).then(() => {
+				return provider.delete(resource, { recursive: options && options.recursive }).then(() => {
 					this._onAfterOperation.fire(new FileOperationEvent(resource, FileOperation.DELETE));
 				});
 			});
@@ -561,7 +562,7 @@ export class RemoteFileService extends FileService {
 	private _doMoveWithInScheme(source: URI, target: URI, overwrite?: boolean): TPromise<IFileStat> {
 
 		const prepare = overwrite
-			? this.del(target).then(undefined, err => { /*ignore*/ })
+			? this.del(target, { recursive: true }).then(undefined, err => { /*ignore*/ })
 			: TPromise.as(null);
 
 		return prepare.then(() => this._withProvider(source)).then(RemoteFileService._throwIfFileSystemIsReadonly).then(provider => {
@@ -582,7 +583,7 @@ export class RemoteFileService extends FileService {
 
 	private _doMoveAcrossScheme(source: URI, target: URI, overwrite?: boolean): TPromise<IFileStat> {
 		return this.copyFile(source, target, overwrite).then(() => {
-			return this.del(source);
+			return this.del(source, { recursive: true });
 		}).then(() => {
 			return this.resolveFile(target);
 		}).then(fileStat => {
@@ -615,7 +616,7 @@ export class RemoteFileService extends FileService {
 			}
 
 			const prepare = overwrite
-				? this.del(target).then(undefined, err => { /*ignore*/ })
+				? this.del(target, { recursive: true }).then(undefined, err => { /*ignore*/ })
 				: TPromise.as(null);
 
 			return prepare.then(() => {
@@ -650,7 +651,7 @@ export class RemoteFileService extends FileService {
 
 	private _activeWatches = new Map<string, { unwatch: Thenable<IDisposable>, count: number }>();
 
-	public watchFileChanges(resource: URI, opts?: IWatchOptions): void {
+	watchFileChanges(resource: URI, opts?: IWatchOptions): void {
 		if (resource.scheme === Schemas.file) {
 			return super.watchFileChanges(resource);
 		}
@@ -676,7 +677,7 @@ export class RemoteFileService extends FileService {
 		});
 	}
 
-	public unwatchFileChanges(resource: URI): void {
+	unwatchFileChanges(resource: URI): void {
 		if (resource.scheme === Schemas.file) {
 			return super.unwatchFileChanges(resource);
 		}
diff --git a/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts b/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts
index b11e518b965..98691d9a030 100644
--- a/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts
@@ -9,11 +9,12 @@ import * as path from 'path';
 import * as platform from 'vs/base/common/platform';
 import * as watcher from 'vs/workbench/services/files/node/watcher/common';
 import * as nsfw from 'vscode-nsfw';
-import { IWatcherService, IWatcherRequest } from 'vs/workbench/services/files/node/watcher/nsfw/watcher';
-import { TPromise, ProgressCallback, TValueCallback, ErrorCallback } from 'vs/base/common/winjs.base';
+import { IWatcherService, IWatcherRequest, IWatcherOptions, IWatchError } from 'vs/workbench/services/files/node/watcher/nsfw/watcher';
+import { TPromise, TValueCallback } from 'vs/base/common/winjs.base';
 import { ThrottledDelayer } from 'vs/base/common/async';
 import { FileChangeType } from 'vs/platform/files/common/files';
 import { normalizeNFC } from 'vs/base/common/normalization';
+import { Event, Emitter } from 'vs/base/common/event';
 
 const nsfwActionToRawChangeType: { [key: number]: number } = [];
 nsfwActionToRawChangeType[nsfw.actions.CREATED] = FileChangeType.ADDED;
@@ -35,20 +36,15 @@ export class NsfwWatcherService implements IWatcherService {
 	private static readonly FS_EVENT_DELAY = 50; // aggregate and only emit events when changes have stopped for this duration (in ms)
 
 	private _pathWatchers: { [watchPath: string]: IPathWatcher } = {};
-	private _watcherPromise: TPromise<void>;
-	private _progressCallback: ProgressCallback;
-	private _errorCallback: ErrorCallback;
 	private _verboseLogging: boolean;
 	private enospcErrorLogged: boolean;
 
-	public initialize(verboseLogging: boolean): TPromise<void> {
-		this._verboseLogging = true;
-		this._watcherPromise = new TPromise<void>((c, e, p) => {
-			this._errorCallback = e;
-			this._progressCallback = p;
+	private _onWatchEvent = new Emitter<watcher.IRawFileChange[] | IWatchError>();
+	readonly onWatchEvent = this._onWatchEvent.event;
 
-		});
-		return this._watcherPromise;
+	watch(options: IWatcherOptions): Event<watcher.IRawFileChange[] | IWatchError> {
+		this._verboseLogging = options.verboseLogging;
+		return this.onWatchEvent;
 	}
 
 	private _watch(request: IWatcherRequest): void {
@@ -70,7 +66,7 @@ export class NsfwWatcherService implements IWatcherService {
 			// See https://github.com/Microsoft/vscode/issues/7950
 			if (e === 'Inotify limit reached' && !this.enospcErrorLogged) {
 				this.enospcErrorLogged = true;
-				this._errorCallback(new Error('Inotify limit reached (ENOSPC)'));
+				this._onWatchEvent.fire({ message: 'Inotify limit reached (ENOSPC)' });
 			}
 		});
 
@@ -119,7 +115,7 @@ export class NsfwWatcherService implements IWatcherService {
 
 				// Broadcast to clients normalized
 				const res = watcher.normalize(events);
-				this._progressCallback(res);
+				this._onWatchEvent.fire(res);
 
 				// Logging
 				if (this._verboseLogging) {
diff --git a/src/vs/workbench/services/files/node/watcher/nsfw/watcher.ts b/src/vs/workbench/services/files/node/watcher/nsfw/watcher.ts
index 7e571c74ea4..771933f3559 100644
--- a/src/vs/workbench/services/files/node/watcher/nsfw/watcher.ts
+++ b/src/vs/workbench/services/files/node/watcher/nsfw/watcher.ts
@@ -6,13 +6,23 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
+import { Event } from 'vs/base/common/event';
+import { IRawFileChange } from 'vs/workbench/services/files/node/watcher/common';
 
 export interface IWatcherRequest {
 	basePath: string;
 	ignored: string[];
 }
 
+export interface IWatcherOptions {
+	verboseLogging: boolean;
+}
+
+export interface IWatchError {
+	message: string;
+}
+
 export interface IWatcherService {
-	initialize(verboseLogging: boolean): TPromise<void>;
+	watch(options: IWatcherOptions): Event<IRawFileChange[] | IWatchError>;
 	setRoots(roots: IWatcherRequest[]): TPromise<void>;
 }
\ No newline at end of file
diff --git a/src/vs/workbench/services/files/node/watcher/nsfw/watcherIpc.ts b/src/vs/workbench/services/files/node/watcher/nsfw/watcherIpc.ts
index 88ebc3d19da..1502478f301 100644
--- a/src/vs/workbench/services/files/node/watcher/nsfw/watcherIpc.ts
+++ b/src/vs/workbench/services/files/node/watcher/nsfw/watcherIpc.ts
@@ -7,21 +7,31 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IWatcherRequest, IWatcherService } from './watcher';
+import { IWatcherRequest, IWatcherService, IWatcherOptions, IWatchError } from './watcher';
+import { Event } from 'vs/base/common/event';
+import { IRawFileChange } from 'vs/workbench/services/files/node/watcher/common';
 
 export interface IWatcherChannel extends IChannel {
-	call(command: 'initialize', verboseLogging: boolean): TPromise<void>;
+	listen(event: 'watch', verboseLogging: boolean): Event<IRawFileChange[] | Error>;
+	listen<T>(event: string, arg?: any): Event<T>;
+
 	call(command: 'setRoots', request: IWatcherRequest[]): TPromise<void>;
-	call(command: string, arg: any): TPromise<any>;
+	call<T>(command: string, arg?: any): TPromise<T>;
 }
 
 export class WatcherChannel implements IWatcherChannel {
 
 	constructor(private service: IWatcherService) { }
 
+	listen(event: string, arg?: any): Event<any> {
+		switch (event) {
+			case 'watch': return this.service.watch(arg);
+		}
+		throw new Error('No events');
+	}
+
 	call(command: string, arg: any): TPromise<any> {
 		switch (command) {
-			case 'initialize': return this.service.initialize(arg);
 			case 'setRoots': return this.service.setRoots(arg);
 		}
 		return undefined;
@@ -32,8 +42,8 @@ export class WatcherChannelClient implements IWatcherService {
 
 	constructor(private channel: IWatcherChannel) { }
 
-	initialize(verboseLogging: boolean): TPromise<void> {
-		return this.channel.call('initialize', verboseLogging);
+	watch(options: IWatcherOptions): Event<IRawFileChange[] | IWatchError> {
+		return this.channel.listen('watch', options);
 	}
 
 	setRoots(roots: IWatcherRequest[]): TPromise<void> {
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 e5403578de2..d2791142347 100644
--- a/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts
@@ -5,7 +5,6 @@
 
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
 import { getNextTickChannel } from 'vs/base/parts/ipc/common/ipc';
 import { Client } from 'vs/base/parts/ipc/node/ipc.cp';
 import uri from 'vs/base/common/uri';
@@ -16,7 +15,8 @@ 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';
+import { filterEvent } from 'vs/base/common/event';
+import { IWatchError } from 'vs/workbench/services/files/node/watcher/nsfw/watcher';
 
 export class FileWatcher {
 	private static readonly MAX_RESTARTS = 5;
@@ -24,7 +24,7 @@ export class FileWatcher {
 	private service: WatcherChannelClient;
 	private isDisposed: boolean;
 	private restartCounter: number;
-	private toDispose: IDisposable[];
+	private toDispose: IDisposable[] = [];
 
 	constructor(
 		private contextService: IWorkspaceContextService,
@@ -35,17 +35,14 @@ export class FileWatcher {
 	) {
 		this.isDisposed = false;
 		this.restartCounter = 0;
-		this.toDispose = [];
 	}
 
 	public startWatching(): () => void {
-		const args = ['--type=watcherService'];
-
 		const client = new Client(
 			uri.parse(require.toUrl('bootstrap')).fsPath,
 			{
 				serverName: 'Watcher',
-				args,
+				args: ['--type=watcherService'],
 				env: {
 					AMD_ENTRYPOINT: 'vs/workbench/services/files/node/watcher/nsfw/watcherApp',
 					PIPE_LOGGING: 'true',
@@ -55,16 +52,7 @@ export class FileWatcher {
 		);
 		this.toDispose.push(client);
 
-		// Initialize watcher
-		const channel = getNextTickChannel(client.getChannel<IWatcherChannel>('watcher'));
-		this.service = new WatcherChannelClient(channel);
-		this.service.initialize(this.verboseLogging).then(null, err => {
-			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;
-		}, (events: IRawFileChange[]) => this.onRawFileEvents(events)).done(() => {
-
+		client.onDidProcessExit(() => {
 			// our watcher app should never be completed because it keeps on watching. being in here indicates
 			// that the watcher process died and we want to restart it here. we only do it a max number of times
 			if (!this.isDisposed) {
@@ -76,11 +64,20 @@ export class FileWatcher {
 					this.errorLogger('[FileWatcher] failed to start after retrying for some time, giving up. Please report this as a bug report!');
 				}
 			}
-		}, error => {
-			if (!this.isDisposed) {
-				this.errorLogger(error);
-			}
-		});
+		}, null, this.toDispose);
+
+		// Initialize watcher
+		const channel = getNextTickChannel(client.getChannel<IWatcherChannel>('watcher'));
+		this.service = new WatcherChannelClient(channel);
+
+		const options = { verboseLogging: this.verboseLogging };
+		const onWatchEvent = filterEvent(this.service.watch(options), () => !this.isDisposed);
+
+		const onError = filterEvent<any, IWatchError>(onWatchEvent, (e): e is IWatchError => typeof e.message === 'string');
+		onError(err => this.errorLogger(err.message), null, this.toDispose);
+
+		const onFileChanges = filterEvent<any, IRawFileChange[]>(onWatchEvent, (e): e is IRawFileChange[] => Array.isArray(e) && e.length > 0);
+		onFileChanges(e => this.onFileChanges(toFileChangesEvent(e)), null, this.toDispose);
 
 		// Start watching
 		this.updateFolders();
@@ -118,17 +115,6 @@ export class FileWatcher {
 		}));
 	}
 
-	private onRawFileEvents(events: IRawFileChange[]): void {
-		if (this.isDisposed) {
-			return;
-		}
-
-		// Emit through event emitter
-		if (events.length > 0) {
-			this.onFileChanges(toFileChangesEvent(events));
-		}
-	}
-
 	private dispose(): void {
 		this.isDisposed = true;
 		this.toDispose = dispose(this.toDispose);
diff --git a/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts b/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts
index 550297d06f0..ec8c491949c 100644
--- a/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts
@@ -21,7 +21,8 @@ import { normalizeNFC } from 'vs/base/common/normalization';
 import { realcaseSync } from 'vs/base/node/extfs';
 import { isMacintosh } from 'vs/base/common/platform';
 import * as watcherCommon from 'vs/workbench/services/files/node/watcher/common';
-import { IWatcherRequest, IWatcherService, IWatcherOptions } from 'vs/workbench/services/files/node/watcher/unix/watcher';
+import { IWatcherRequest, IWatcherService, IWatcherOptions, IWatchError } from 'vs/workbench/services/files/node/watcher/unix/watcher';
+import { Emitter, Event } from 'vs/base/common/event';
 
 interface IWatcher {
 	requests: ExtendedWatcherRequest[];
@@ -44,29 +45,20 @@ export class ChokidarWatcherService implements IWatcherService {
 	private _watchers: { [watchPath: string]: IWatcher };
 	private _watcherCount: number;
 
-	private _watcherPromise: TPromise<void>;
 	private _options: IWatcherOptions & IChockidarWatcherOptions;
 
 	private spamCheckStartTime: number;
 	private spamWarningLogged: boolean;
 	private enospcErrorLogged: boolean;
-	private _errorCallback: (error: Error) => void;
-	private _fileChangeCallback: (changes: watcherCommon.IRawFileChange[]) => void;
 
-	public initialize(options: IWatcherOptions & IChockidarWatcherOptions): TPromise<void> {
+	private _onWatchEvent = new Emitter<watcherCommon.IRawFileChange[] | IWatchError>();
+	readonly onWatchEvent = this._onWatchEvent.event;
+
+	watch(options: IWatcherOptions & IChockidarWatcherOptions): Event<watcherCommon.IRawFileChange[] | IWatchError> {
 		this._options = options;
 		this._watchers = Object.create(null);
 		this._watcherCount = 0;
-		this._watcherPromise = new TPromise<void>((c, e, p) => {
-			this._errorCallback = (error) => {
-				this.stop();
-				e(error);
-			};
-			this._fileChangeCallback = p;
-		}, () => {
-			this.stop();
-		});
-		return this._watcherPromise;
+		return this.onWatchEvent;
 	}
 
 	public setRoots(requests: IWatcherRequest[]): TPromise<void> {
@@ -233,7 +225,7 @@ export class ChokidarWatcherService implements IWatcherService {
 
 				// Broadcast to clients normalized
 				const res = watcherCommon.normalize(events);
-				this._fileChangeCallback(res);
+				this._onWatchEvent.fire(res);
 
 				// Logging
 				if (this._options.verboseLogging) {
@@ -257,7 +249,8 @@ export class ChokidarWatcherService implements IWatcherService {
 				if ((<any>error).code === 'ENOSPC') {
 					if (!this.enospcErrorLogged) {
 						this.enospcErrorLogged = true;
-						this._errorCallback(new Error('Inotify limit reached (ENOSPC)'));
+						this.stop();
+						this._onWatchEvent.fire({ message: 'Inotify limit reached (ENOSPC)' });
 					}
 				} else {
 					console.error(error.toString());
diff --git a/src/vs/workbench/services/files/node/watcher/unix/test/chockidarWatcherService.test.ts b/src/vs/workbench/services/files/node/watcher/unix/test/chockidarWatcherService.test.ts
index 9f9ce6309c7..ef26ad06b85 100644
--- a/src/vs/workbench/services/files/node/watcher/unix/test/chockidarWatcherService.test.ts
+++ b/src/vs/workbench/services/files/node/watcher/unix/test/chockidarWatcherService.test.ts
@@ -137,19 +137,15 @@ suite.skip('Chockidar watching', () => {
 		await pfs.mkdirp(bFolder);
 		await pfs.mkdirp(b2Folder);
 
-		const promise = service.initialize({ verboseLogging: false, pollingInterval: 200 });
-		promise.then(null,
-			e => {
-				console.log('set error', e);
-				error = e;
-			},
-			p => {
-				if (Array.isArray(p)) {
-					result.push(...p);
-				}
+		const opts = { verboseLogging: false, pollingInterval: 200 };
+		service.watch(opts)(e => {
+			if (Array.isArray(e)) {
+				result.push(...e);
+			} else {
+				console.log('set error', e.message);
+				error = e.message;
 			}
-		);
-
+		});
 	});
 
 	suiteTeardown(async () => {
diff --git a/src/vs/workbench/services/files/node/watcher/unix/watcher.ts b/src/vs/workbench/services/files/node/watcher/unix/watcher.ts
index 8ed35e6c792..771933f3559 100644
--- a/src/vs/workbench/services/files/node/watcher/unix/watcher.ts
+++ b/src/vs/workbench/services/files/node/watcher/unix/watcher.ts
@@ -6,6 +6,8 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
+import { Event } from 'vs/base/common/event';
+import { IRawFileChange } from 'vs/workbench/services/files/node/watcher/common';
 
 export interface IWatcherRequest {
 	basePath: string;
@@ -16,7 +18,11 @@ export interface IWatcherOptions {
 	verboseLogging: boolean;
 }
 
-export interface IWatcherService {
-	initialize(options: IWatcherOptions): TPromise<void>;
-	setRoots(roots: IWatcherRequest[]): TPromise<void>;
+export interface IWatchError {
+	message: string;
 }
+
+export interface IWatcherService {
+	watch(options: IWatcherOptions): Event<IRawFileChange[] | IWatchError>;
+	setRoots(roots: IWatcherRequest[]): TPromise<void>;
+}
\ No newline at end of file
diff --git a/src/vs/workbench/services/files/node/watcher/unix/watcherIpc.ts b/src/vs/workbench/services/files/node/watcher/unix/watcherIpc.ts
index bf2fba4664b..1502478f301 100644
--- a/src/vs/workbench/services/files/node/watcher/unix/watcherIpc.ts
+++ b/src/vs/workbench/services/files/node/watcher/unix/watcherIpc.ts
@@ -7,21 +7,31 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IWatcherRequest, IWatcherService, IWatcherOptions } from 'vs/workbench/services/files/node/watcher/unix/watcher';
+import { IWatcherRequest, IWatcherService, IWatcherOptions, IWatchError } from './watcher';
+import { Event } from 'vs/base/common/event';
+import { IRawFileChange } from 'vs/workbench/services/files/node/watcher/common';
 
 export interface IWatcherChannel extends IChannel {
-	call(command: 'initialize', options: IWatcherOptions): TPromise<void>;
+	listen(event: 'watch', verboseLogging: boolean): Event<IRawFileChange[] | Error>;
+	listen<T>(event: string, arg?: any): Event<T>;
+
 	call(command: 'setRoots', request: IWatcherRequest[]): TPromise<void>;
-	call(command: string, arg: any): TPromise<any>;
+	call<T>(command: string, arg?: any): TPromise<T>;
 }
 
 export class WatcherChannel implements IWatcherChannel {
 
 	constructor(private service: IWatcherService) { }
 
+	listen(event: string, arg?: any): Event<any> {
+		switch (event) {
+			case 'watch': return this.service.watch(arg);
+		}
+		throw new Error('No events');
+	}
+
 	call(command: string, arg: any): TPromise<any> {
 		switch (command) {
-			case 'initialize': return this.service.initialize(arg);
 			case 'setRoots': return this.service.setRoots(arg);
 		}
 		return undefined;
@@ -32,8 +42,8 @@ export class WatcherChannelClient implements IWatcherService {
 
 	constructor(private channel: IWatcherChannel) { }
 
-	initialize(options: IWatcherOptions): TPromise<void> {
-		return this.channel.call('initialize', options);
+	watch(options: IWatcherOptions): Event<IRawFileChange[] | IWatchError> {
+		return this.channel.listen('watch', options);
 	}
 
 	setRoots(roots: IWatcherRequest[]): TPromise<void> {
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 e51c287854f..45ca79e02f5 100644
--- a/src/vs/workbench/services/files/node/watcher/unix/watcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/unix/watcherService.ts
@@ -5,7 +5,6 @@
 
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
 import { getNextTickChannel } from 'vs/base/parts/ipc/common/ipc';
 import { Client } from 'vs/base/parts/ipc/node/ipc.cp';
 import uri from 'vs/base/common/uri';
@@ -13,10 +12,11 @@ import { toFileChangesEvent, IRawFileChange } from 'vs/workbench/services/files/
 import { IWatcherChannel, WatcherChannelClient } from 'vs/workbench/services/files/node/watcher/unix/watcherIpc';
 import { FileChangesEvent, IFilesConfiguration } from 'vs/platform/files/common/files';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { isPromiseCanceledError } from 'vs/base/common/errors';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { Schemas } from 'vs/base/common/network';
+import { filterEvent } from 'vs/base/common/event';
+import { IWatchError } from 'vs/workbench/services/files/node/watcher/unix/watcher';
 
 export class FileWatcher {
 	private static readonly MAX_RESTARTS = 5;
@@ -55,20 +55,7 @@ export class FileWatcher {
 		);
 		this.toDispose.push(client);
 
-		const channel = getNextTickChannel(client.getChannel<IWatcherChannel>('watcher'));
-		this.service = new WatcherChannelClient(channel);
-
-		const options = {
-			verboseLogging: this.verboseLogging
-		};
-
-		this.service.initialize(options).then(null, err => {
-			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;
-		}, (events: IRawFileChange[]) => this.onRawFileEvents(events)).done(() => {
-
+		client.onDidProcessExit(() => {
 			// our watcher app should never be completed because it keeps on watching. being in here indicates
 			// that the watcher process died and we want to restart it here. we only do it a max number of times
 			if (!this.isDisposed) {
@@ -80,11 +67,19 @@ export class FileWatcher {
 					this.errorLogger('[FileWatcher] failed to start after retrying for some time, giving up. Please report this as a bug report!');
 				}
 			}
-		}, error => {
-			if (!this.isDisposed) {
-				this.errorLogger(error);
-			}
-		});
+		}, null, this.toDispose);
+
+		const channel = getNextTickChannel(client.getChannel<IWatcherChannel>('watcher'));
+		this.service = new WatcherChannelClient(channel);
+
+		const options = { verboseLogging: this.verboseLogging };
+		const onWatchEvent = filterEvent(this.service.watch(options), () => !this.isDisposed);
+
+		const onError = filterEvent<any, IWatchError>(onWatchEvent, (e): e is IWatchError => typeof e.message === 'string');
+		onError(err => this.errorLogger(err.message), null, this.toDispose);
+
+		const onFileChanges = filterEvent<any, IRawFileChange[]>(onWatchEvent, (e): e is IRawFileChange[] => Array.isArray(e) && e.length > 0);
+		onFileChanges(e => this.onFileChanges(toFileChangesEvent(e)), null, this.toDispose);
 
 		// Start watching
 		this.updateFolders();
@@ -123,17 +118,6 @@ export class FileWatcher {
 		}));
 	}
 
-	private onRawFileEvents(events: IRawFileChange[]): void {
-		if (this.isDisposed) {
-			return;
-		}
-
-		// Emit through event emitter
-		if (events.length > 0) {
-			this.onFileChanges(toFileChangesEvent(events));
-		}
-	}
-
 	private dispose(): void {
 		this.isDisposed = true;
 		this.toDispose = dispose(this.toDispose);
diff --git a/src/vs/workbench/services/files/test/electron-browser/fileService.test.ts b/src/vs/workbench/services/files/test/electron-browser/fileService.test.ts
index d9a7806a66d..e57b8041f6b 100644
--- a/src/vs/workbench/services/files/test/electron-browser/fileService.test.ts
+++ b/src/vs/workbench/services/files/test/electron-browser/fileService.test.ts
@@ -476,7 +476,7 @@ suite('FileService', () => {
 		});
 	});
 
-	test('deleteFolder', function () {
+	test('deleteFolder (recursive)', function () {
 		let event: FileOperationEvent;
 		const toDispose = service.onAfterOperation(e => {
 			event = e;
@@ -484,7 +484,7 @@ suite('FileService', () => {
 
 		const resource = uri.file(path.join(testDir, 'deep'));
 		return service.resolveFile(resource).then(source => {
-			return service.del(source.resource).then(() => {
+			return service.del(source.resource, { recursive: true }).then(() => {
 				assert.equal(fs.existsSync(source.resource.fsPath), false);
 
 				assert.ok(event);
@@ -495,6 +495,17 @@ suite('FileService', () => {
 		});
 	});
 
+	test('deleteFolder (non recursive)', function () {
+		const resource = uri.file(path.join(testDir, 'deep'));
+		return service.resolveFile(resource).then(source => {
+			return service.del(source.resource).then(() => {
+				return TPromise.wrapError(new Error('Unexpected'));
+			}, error => {
+				return TPromise.as(true);
+			});
+		});
+	});
+
 	test('resolveFile', function () {
 		return service.resolveFile(uri.file(testDir), { resolveTo: [uri.file(path.join(testDir, 'deep'))] }).then(r => {
 			assert.equal(r.children.length, 8);
diff --git a/src/vs/workbench/services/history/electron-browser/history.ts b/src/vs/workbench/services/history/electron-browser/history.ts
index 10b941f25af..0cb907bc631 100644
--- a/src/vs/workbench/services/history/electron-browser/history.ts
+++ b/src/vs/workbench/services/history/electron-browser/history.ts
@@ -16,7 +16,7 @@ import { IHistoryService } from 'vs/workbench/services/history/common/history';
 import { FileChangesEvent, IFileService, FileChangeType, FILES_EXCLUDE_CONFIG } from 'vs/platform/files/common/files';
 import { Selection } from 'vs/editor/common/core/selection';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -49,15 +49,15 @@ export class TextEditorState {
 		} : void 0;
 	}
 
-	public get editorInput(): IEditorInput {
+	get editorInput(): IEditorInput {
 		return this._editorInput;
 	}
 
-	public get selection(): ITextEditorSelection {
+	get selection(): ITextEditorSelection {
 		return this.textEditorSelection;
 	}
 
-	public justifiesNewPushState(other: TextEditorState, event?: ICursorPositionChangedEvent): boolean {
+	justifiesNewPushState(other: TextEditorState, event?: ICursorPositionChangedEvent): boolean {
 		if (event && event.source === 'api') {
 			return true; // always let API source win (e.g. "Go to definition" should add a history entry)
 		}
@@ -97,17 +97,15 @@ interface IRecentlyClosedFile {
 	index: number;
 }
 
-export class HistoryService implements IHistoryService {
+export class HistoryService extends Disposable implements IHistoryService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private static readonly STORAGE_KEY = 'history.entries';
 	private static readonly MAX_HISTORY_ITEMS = 200;
 	private static readonly MAX_STACK_ITEMS = 20;
 	private static readonly MAX_RECENTLY_CLOSED_EDITORS = 20;
 
-	private toUnbind: IDisposable[];
-
 	private activeEditorListeners: IDisposable[];
 	private lastActiveEditor: IEditorIdentifier;
 
@@ -135,7 +133,8 @@ export class HistoryService implements IHistoryService {
 		@IWindowsService private windowService: IWindowsService,
 		@IInstantiationService private instantiationService: IInstantiationService,
 	) {
-		this.toUnbind = [];
+		super();
+
 		this.activeEditorListeners = [];
 
 		this.fileInputFactory = Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactories).getFileInputFactory();
@@ -145,11 +144,11 @@ export class HistoryService implements IHistoryService {
 		this.stack = [];
 		this.recentlyClosedFiles = [];
 		this.loaded = false;
-		this.resourceFilter = instantiationService.createInstance(
+		this.resourceFilter = this._register(instantiationService.createInstance(
 			ResourceGlobMatcher,
 			(root: URI) => this.getExcludes(root),
 			(event: IConfigurationChangeEvent) => event.affectsConfiguration(FILES_EXCLUDE_CONFIG) || event.affectsConfiguration('search.exclude')
-		);
+		));
 
 		this.registerListeners();
 	}
@@ -161,12 +160,12 @@ export class HistoryService implements IHistoryService {
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(this.editorService.onDidActiveEditorChange(() => this.onActiveEditorChanged()));
-		this.toUnbind.push(this.editorService.onDidOpenEditorFail(event => this.remove(event.editor)));
-		this.toUnbind.push(this.editorService.onDidCloseEditor(event => this.onEditorClosed(event)));
-		this.toUnbind.push(this.lifecycleService.onShutdown(reason => this.saveHistory()));
-		this.toUnbind.push(this.fileService.onFileChanges(event => this.onFileChanges(event)));
-		this.toUnbind.push(this.resourceFilter.onExpressionChange(() => this.handleExcludesChange()));
+		this._register(this.editorService.onDidActiveEditorChange(() => this.onActiveEditorChanged()));
+		this._register(this.editorService.onDidOpenEditorFail(event => this.remove(event.editor)));
+		this._register(this.editorService.onDidCloseEditor(event => this.onEditorClosed(event)));
+		this._register(this.lifecycleService.onShutdown(reason => this.saveHistory()));
+		this._register(this.fileService.onFileChanges(event => this.onFileChanges(event)));
+		this._register(this.resourceFilter.onExpressionChange(() => this.handleExcludesChange()));
 	}
 
 	private onActiveEditorChanged(): void {
@@ -236,7 +235,7 @@ export class HistoryService implements IHistoryService {
 		}
 	}
 
-	public reopenLastClosedEditor(): void {
+	reopenLastClosedEditor(): void {
 		this.ensureHistoryLoaded();
 
 		let lastClosedFile = this.recentlyClosedFiles.pop();
@@ -249,7 +248,7 @@ export class HistoryService implements IHistoryService {
 		}
 	}
 
-	public forward(acrossEditors?: boolean): void {
+	forward(acrossEditors?: boolean): void {
 		if (this.stack.length > this.index + 1) {
 			if (acrossEditors) {
 				this.doForwardAcrossEditors();
@@ -287,7 +286,7 @@ export class HistoryService implements IHistoryService {
 		}
 	}
 
-	public back(acrossEditors?: boolean): void {
+	back(acrossEditors?: boolean): void {
 		if (this.index > 0) {
 			if (acrossEditors) {
 				this.doBackAcrossEditors();
@@ -297,7 +296,7 @@ export class HistoryService implements IHistoryService {
 		}
 	}
 
-	public last(): void {
+	last(): void {
 		if (this.lastIndex === -1) {
 			this.back();
 		} else {
@@ -329,7 +328,7 @@ export class HistoryService implements IHistoryService {
 		}
 	}
 
-	public clear(): void {
+	clear(): void {
 		this.ensureHistoryLoaded();
 
 		this.index = -1;
@@ -421,9 +420,9 @@ export class HistoryService implements IHistoryService {
 		this.removeExcludedFromHistory();
 	}
 
-	public remove(input: IEditorInput | IResourceInput): void;
-	public remove(input: FileChangesEvent): void;
-	public remove(arg1: IEditorInput | IResourceInput | FileChangesEvent): void {
+	remove(input: IEditorInput | IResourceInput): void;
+	remove(input: FileChangesEvent): void;
+	remove(arg1: IEditorInput | IResourceInput | FileChangesEvent): void {
 		this.removeFromHistory(arg1);
 		this.removeFromStack(arg1);
 		this.removeFromRecentlyClosedFiles(arg1);
@@ -502,7 +501,7 @@ export class HistoryService implements IHistoryService {
 		this.add(editor.input);
 	}
 
-	public add(input: IEditorInput, selection?: ITextEditorSelection): void {
+	add(input: IEditorInput, selection?: ITextEditorSelection): void {
 		if (!this.navigatingInStack) {
 			this.addOrReplaceInStack(input, selection);
 		}
@@ -667,7 +666,7 @@ export class HistoryService implements IHistoryService {
 		return resourceInput && resourceInput.resource.toString() === resource.toString();
 	}
 
-	public getHistory(): (IEditorInput | IResourceInput)[] {
+	getHistory(): (IEditorInput | IResourceInput)[] {
 		this.ensureHistoryLoaded();
 
 		return this.history.slice(0);
@@ -748,7 +747,7 @@ export class HistoryService implements IHistoryService {
 		}).filter(input => !!input);
 	}
 
-	public getLastActiveWorkspaceRoot(schemeFilter?: string): URI {
+	getLastActiveWorkspaceRoot(schemeFilter?: string): URI {
 
 		// No Folder: return early
 		const folders = this.contextService.getWorkspace().folders;
@@ -796,7 +795,7 @@ export class HistoryService implements IHistoryService {
 		return void 0;
 	}
 
-	public getLastActiveFile(): URI {
+	getLastActiveFile(): URI {
 		const history = this.getHistory();
 		for (let i = 0; i < history.length; i++) {
 			let resource: URI;
@@ -815,8 +814,4 @@ export class HistoryService implements IHistoryService {
 
 		return void 0;
 	}
-
-	public dispose(): void {
-		this.toUnbind = dispose(this.toUnbind);
-	}
 }
diff --git a/src/vs/workbench/services/keybinding/common/keybindingEditing.ts b/src/vs/workbench/services/keybinding/common/keybindingEditing.ts
index 98b80945993..e267f9b788c 100644
--- a/src/vs/workbench/services/keybinding/common/keybindingEditing.ts
+++ b/src/vs/workbench/services/keybinding/common/keybindingEditing.ts
@@ -74,10 +74,11 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 		return this.resolveAndValidate()
 			.then(reference => {
 				const model = reference.object.textEditorModel;
-				if (keybindingItem.isDefault) {
-					this.updateDefaultKeybinding(key, keybindingItem, model);
-				} else {
-					this.updateUserKeybinding(key, keybindingItem, model);
+				const userKeybindingEntries = <IUserFriendlyKeybinding[]>json.parse(model.getValue());
+				const userKeybindingEntryIndex = this.findUserKeybindingEntryIndex(keybindingItem, userKeybindingEntries);
+				this.updateKeybinding(key, keybindingItem, model, userKeybindingEntryIndex);
+				if (keybindingItem.isDefault && keybindingItem.resolvedKeybinding) {
+					this.removeDefaultKeybinding(keybindingItem, model);
 				}
 				return this.save().then(() => reference.dispose());
 			});
@@ -112,32 +113,16 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 		return this.textFileService.save(this.resource);
 	}
 
-	private updateUserKeybinding(newKey: string, keybindingItem: ResolvedKeybindingItem, model: ITextModel): void {
+	private updateKeybinding(newKey: string, keybindingItem: ResolvedKeybindingItem, model: ITextModel, userKeybindingEntryIndex: number): void {
 		const { tabSize, insertSpaces } = model.getOptions();
 		const eol = model.getEOL();
-		const userKeybindingEntries = <IUserFriendlyKeybinding[]>json.parse(model.getValue());
-		const userKeybindingEntryIndex = this.findUserKeybindingEntryIndex(keybindingItem, userKeybindingEntries);
-		if (userKeybindingEntryIndex !== -1) {
-			this.applyEditsToBuffer(setProperty(model.getValue(), [userKeybindingEntryIndex, 'key'], newKey, { tabSize, insertSpaces, eol })[0], model);
-		}
-	}
-
-	private updateDefaultKeybinding(newKey: string, keybindingItem: ResolvedKeybindingItem, model: ITextModel): void {
-		const { tabSize, insertSpaces } = model.getOptions();
-		const eol = model.getEOL();
-		const userKeybindingEntries = <IUserFriendlyKeybinding[]>json.parse(model.getValue());
-		const userKeybindingEntryIndex = this.findUserKeybindingEntryIndex(keybindingItem, userKeybindingEntries);
 		if (userKeybindingEntryIndex !== -1) {
 			// Update the keybinding with new key
 			this.applyEditsToBuffer(setProperty(model.getValue(), [userKeybindingEntryIndex, 'key'], newKey, { tabSize, insertSpaces, eol })[0], model);
 		} else {
-			// Add the new keybinidng with new key
+			// Add the new keybinding with new key
 			this.applyEditsToBuffer(setProperty(model.getValue(), [-1], this.asObject(newKey, keybindingItem.command, keybindingItem.when, false), { tabSize, insertSpaces, eol })[0], model);
 		}
-		if (keybindingItem.resolvedKeybinding) {
-			// Unassign the default keybinding
-			this.applyEditsToBuffer(setProperty(model.getValue(), [-1], this.asObject(keybindingItem.resolvedKeybinding.getUserSettingsLabel(), keybindingItem.command, keybindingItem.when, true), { tabSize, insertSpaces, eol })[0], model);
-		}
 	}
 
 	private removeUserKeybinding(keybindingItem: ResolvedKeybindingItem, model: ITextModel): void {
@@ -160,8 +145,8 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 		const { tabSize, insertSpaces } = model.getOptions();
 		const eol = model.getEOL();
 		const userKeybindingEntries = <IUserFriendlyKeybinding[]>json.parse(model.getValue());
-		const index = this.findUnassignedDefaultKeybindingEntryIndex(keybindingItem, userKeybindingEntries);
-		if (index !== -1) {
+		const indices = this.findUnassignedDefaultKeybindingEntryIndex(keybindingItem, userKeybindingEntries).reverse();
+		for (const index of indices) {
 			this.applyEditsToBuffer(setProperty(model.getValue(), [index], void 0, { tabSize, insertSpaces, eol })[0], model);
 		}
 	}
@@ -183,13 +168,14 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 		return -1;
 	}
 
-	private findUnassignedDefaultKeybindingEntryIndex(keybindingItem: ResolvedKeybindingItem, userKeybindingEntries: IUserFriendlyKeybinding[]): number {
+	private findUnassignedDefaultKeybindingEntryIndex(keybindingItem: ResolvedKeybindingItem, userKeybindingEntries: IUserFriendlyKeybinding[]): number[] {
+		const indices = [];
 		for (let index = 0; index < userKeybindingEntries.length; index++) {
 			if (userKeybindingEntries[index].command === `-${keybindingItem.command}`) {
-				return index;
+				indices.push(index);
 			}
 		}
-		return -1;
+		return indices;
 	}
 
 	private asObject(key: string, command: string, when: ContextKeyExpr, negate: boolean): any {
@@ -255,7 +241,7 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 
 	private parse(model: ITextModel): { result: IUserFriendlyKeybinding[], parseErrors: json.ParseError[] } {
 		const parseErrors: json.ParseError[] = [];
-		const result = json.parse(model.getValue(), parseErrors, { allowTrailingComma: true });
+		const result = json.parse(model.getValue(), parseErrors);
 		return { result, parseErrors };
 	}
 
diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts b/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts
index 2fe4c81b71f..71af610716f 100644
--- a/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts
+++ b/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts
@@ -55,7 +55,7 @@ interface Modifiers {
 	shiftKey?: boolean;
 }
 
-suite('Keybindings Editing', () => {
+suite('KeybindingsEditing', () => {
 
 	let instantiationService: TestInstantiationService;
 	let testObject: KeybindingsEditingService;
@@ -220,6 +220,21 @@ suite('Keybindings Editing', () => {
 			.then(() => assert.deepEqual(getUserKeybindings(), []));
 	});
 
+	test('reset mulitple removed keybindings', () => {
+		writeToKeybindingsFile({ key: 'alt+c', command: '-b' });
+		writeToKeybindingsFile({ key: 'alt+shift+c', command: '-b' });
+		writeToKeybindingsFile({ key: 'escape', command: '-b' });
+		return testObject.resetKeybinding(aResolvedKeybindingItem({ command: 'b', isDefault: false }))
+			.then(() => assert.deepEqual(getUserKeybindings(), []));
+	});
+
+	test('add a new keybinding to unassigned keybinding', () => {
+		writeToKeybindingsFile({ key: 'alt+c', command: '-a' });
+		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: '-a' }, { key: 'shift+alt+c', command: 'a' }];
+		return testObject.editKeybinding('shift+alt+c', aResolvedKeybindingItem({ command: 'a', isDefault: false }))
+			.then(() => assert.deepEqual(getUserKeybindings(), expected));
+	});
+
 	function writeToKeybindingsFile(...keybindings: IUserFriendlyKeybinding[]) {
 		fs.writeFileSync(keybindingsFile, JSON.stringify(keybindings || []));
 	}
diff --git a/src/vs/workbench/services/notification/common/notificationService.ts b/src/vs/workbench/services/notification/common/notificationService.ts
index 52fbfe0638c..bd0daafa022 100644
--- a/src/vs/workbench/services/notification/common/notificationService.ts
+++ b/src/vs/workbench/services/notification/common/notificationService.ts
@@ -7,31 +7,22 @@
 
 import { INotificationService, INotification, INotificationHandle, Severity, NotificationMessage, INotificationActions, IPromptChoice } from 'vs/platform/notification/common/notification';
 import { INotificationsModel, NotificationsModel } from 'vs/workbench/common/notifications';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { dispose, Disposable } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Action } from 'vs/base/common/actions';
 import { once } from 'vs/base/common/event';
 
-export class NotificationService implements INotificationService {
+export class NotificationService extends Disposable implements INotificationService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
-	private _model: INotificationsModel;
-	private toDispose: IDisposable[];
+	private _model: INotificationsModel = this._register(new NotificationsModel());
 
-	constructor() {
-		this.toDispose = [];
-
-		const model = new NotificationsModel();
-		this.toDispose.push(model);
-		this._model = model;
-	}
-
-	public get model(): INotificationsModel {
+	get model(): INotificationsModel {
 		return this._model;
 	}
 
-	public info(message: NotificationMessage | NotificationMessage[]): void {
+	info(message: NotificationMessage | NotificationMessage[]): void {
 		if (Array.isArray(message)) {
 			message.forEach(m => this.info(m));
 
@@ -41,7 +32,7 @@ export class NotificationService implements INotificationService {
 		this.model.notify({ severity: Severity.Info, message });
 	}
 
-	public warn(message: NotificationMessage | NotificationMessage[]): void {
+	warn(message: NotificationMessage | NotificationMessage[]): void {
 		if (Array.isArray(message)) {
 			message.forEach(m => this.warn(m));
 
@@ -51,7 +42,7 @@ export class NotificationService implements INotificationService {
 		this.model.notify({ severity: Severity.Warning, message });
 	}
 
-	public error(message: NotificationMessage | NotificationMessage[]): void {
+	error(message: NotificationMessage | NotificationMessage[]): void {
 		if (Array.isArray(message)) {
 			message.forEach(m => this.error(m));
 
@@ -61,11 +52,11 @@ export class NotificationService implements INotificationService {
 		this.model.notify({ severity: Severity.Error, message });
 	}
 
-	public notify(notification: INotification): INotificationHandle {
+	notify(notification: INotification): INotificationHandle {
 		return this.model.notify(notification);
 	}
 
-	public prompt(severity: Severity, message: string, choices: IPromptChoice[], onCancel?: () => void): INotificationHandle {
+	prompt(severity: Severity, message: string, choices: IPromptChoice[], onCancel?: () => void): INotificationHandle {
 		let handle: INotificationHandle;
 		let choiceClicked = false;
 
@@ -109,8 +100,4 @@ export class NotificationService implements INotificationService {
 
 		return handle;
 	}
-
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
-	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/services/preferences/common/preferences.ts b/src/vs/workbench/services/preferences/common/preferences.ts
index 82028544ee6..8c649215708 100644
--- a/src/vs/workbench/services/preferences/common/preferences.ts
+++ b/src/vs/workbench/services/preferences/common/preferences.ts
@@ -25,6 +25,7 @@ export interface ISettingsGroup {
 	title: string;
 	titleRange: IRange;
 	sections: ISettingsSection[];
+	contributedByExtension: boolean;
 }
 
 export interface ISettingsSection {
diff --git a/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts b/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
index b81ca559188..045707197af 100644
--- a/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
+++ b/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
@@ -70,7 +70,7 @@ export class KeybindingsEditorInput extends EditorInput {
 		return nls.localize('keybindingsInputName', "Keyboard Shortcuts");
 	}
 
-	resolve(refresh?: boolean): TPromise<KeybindingsEditorModel> {
+	resolve(): TPromise<KeybindingsEditorModel> {
 		return TPromise.as(this.keybindingsModel);
 	}
 
@@ -97,7 +97,7 @@ export class SettingsEditor2Input extends EditorInput {
 		return nls.localize('settingsEditor2InputName', "Settings (Preview)");
 	}
 
-	resolve(refresh?: boolean): TPromise<DefaultSettingsEditorModel> {
+	resolve(): TPromise<DefaultSettingsEditorModel> {
 		return <TPromise<DefaultSettingsEditorModel>>this.preferencesService.createPreferencesEditorModel(URI.parse('vscode://defaultsettings/0/settings.json'));
 	}
 
diff --git a/src/vs/workbench/services/preferences/common/preferencesModels.ts b/src/vs/workbench/services/preferences/common/preferencesModels.ts
index a20abf46e45..4f3ca88dfe0 100644
--- a/src/vs/workbench/services/preferences/common/preferencesModels.ts
+++ b/src/vs/workbench/services/preferences/common/preferencesModels.ts
@@ -189,7 +189,8 @@ export class SettingsEditorModel extends AbstractSettingsModel implements ISetti
 					settings: filteredSettings
 				}],
 				title: modelGroup.title,
-				titleRange: modelGroup.titleRange
+				titleRange: modelGroup.titleRange,
+				contributedByExtension: !!modelGroup.contributedByExtension
 			};
 		}
 
@@ -503,7 +504,7 @@ export class DefaultSettings extends Disposable {
 			if (!settingsGroup) {
 				settingsGroup = result.filter(g => g.title === title)[0];
 				if (!settingsGroup) {
-					settingsGroup = { sections: [{ settings: [] }], id: config.id, title: title, titleRange: null, range: null };
+					settingsGroup = { sections: [{ settings: [] }], id: config.id, title: title, titleRange: null, range: null, contributedByExtension: !!config.contributedByExtension };
 					result.push(settingsGroup);
 				}
 			} else {
@@ -512,7 +513,7 @@ export class DefaultSettings extends Disposable {
 		}
 		if (config.properties) {
 			if (!settingsGroup) {
-				settingsGroup = { sections: [{ settings: [] }], id: config.id, title: config.id, titleRange: null, range: null };
+				settingsGroup = { sections: [{ settings: [] }], id: config.id, title: config.id, titleRange: null, range: null, contributedByExtension: !!config.contributedByExtension };
 				result.push(settingsGroup);
 			}
 			const configurationSettings: ISetting[] = [...settingsGroup.sections[settingsGroup.sections.length - 1].settings, ...this.parseSettings(config.properties)];
diff --git a/src/vs/workbench/services/progress/browser/progressService.ts b/src/vs/workbench/services/progress/browser/progressService.ts
index 6f6e6b5da76..b68cb4c8b77 100644
--- a/src/vs/workbench/services/progress/browser/progressService.ts
+++ b/src/vs/workbench/services/progress/browser/progressService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as lifecycle from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as types from 'vs/base/common/types';
 import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
@@ -21,21 +21,20 @@ interface ProgressState {
 	whileDelay?: number;
 }
 
-export abstract class ScopedService {
-
-	protected toDispose: lifecycle.IDisposable[];
+export abstract class ScopedService extends Disposable {
 
 	constructor(private viewletService: IViewletService, private panelService: IPanelService, private scopeId: string) {
-		this.toDispose = [];
+		super();
+
 		this.registerListeners();
 	}
 
-	public registerListeners(): void {
-		this.toDispose.push(this.viewletService.onDidViewletOpen(viewlet => this.onScopeOpened(viewlet.getId())));
-		this.toDispose.push(this.panelService.onDidPanelOpen(panel => this.onScopeOpened(panel.getId())));
+	registerListeners(): void {
+		this._register(this.viewletService.onDidViewletOpen(viewlet => this.onScopeOpened(viewlet.getId())));
+		this._register(this.panelService.onDidPanelOpen(panel => this.onScopeOpened(panel.getId())));
 
-		this.toDispose.push(this.viewletService.onDidViewletClose(viewlet => this.onScopeClosed(viewlet.getId())));
-		this.toDispose.push(this.panelService.onDidPanelClose(panel => this.onScopeClosed(panel.getId())));
+		this._register(this.viewletService.onDidViewletClose(viewlet => this.onScopeClosed(viewlet.getId())));
+		this._register(this.panelService.onDidPanelClose(panel => this.onScopeClosed(panel.getId())));
 	}
 
 	private onScopeClosed(scopeId: string) {
@@ -50,13 +49,13 @@ export abstract class ScopedService {
 		}
 	}
 
-	public abstract onScopeActivated(): void;
+	abstract onScopeActivated(): void;
 
-	public abstract onScopeDeactivated(): void;
+	abstract onScopeDeactivated(): void;
 }
 
 export class ScopedProgressService extends ScopedService implements IProgressService {
-	public _serviceBrand: any;
+	_serviceBrand: any;
 	private isActive: boolean;
 	private progressbar: ProgressBar;
 	private progressState: ProgressState;
@@ -75,11 +74,11 @@ export class ScopedProgressService extends ScopedService implements IProgressSer
 		this.progressState = Object.create(null);
 	}
 
-	public onScopeDeactivated(): void {
+	onScopeDeactivated(): void {
 		this.isActive = false;
 	}
 
-	public onScopeActivated(): void {
+	onScopeActivated(): void {
 		this.isActive = true;
 
 		// Return early if progress state indicates that progress is done
@@ -127,9 +126,9 @@ export class ScopedProgressService extends ScopedService implements IProgressSer
 		this.progressState.whileDelay = void 0;
 	}
 
-	public show(infinite: boolean, delay?: number): IProgressRunner;
-	public show(total: number, delay?: number): IProgressRunner;
-	public show(infiniteOrTotal: boolean | number, delay?: number): IProgressRunner {
+	show(infinite: boolean, delay?: number): IProgressRunner;
+	show(total: number, delay?: number): IProgressRunner;
+	show(infiniteOrTotal: boolean | number, delay?: number): IProgressRunner {
 		let infinite: boolean;
 		let total: number;
 
@@ -207,7 +206,7 @@ export class ScopedProgressService extends ScopedService implements IProgressSer
 		};
 	}
 
-	public showWhile(promise: TPromise<any>, delay?: number): TPromise<void> {
+	showWhile(promise: TPromise<any>, delay?: number): TPromise<void> {
 		let stack: boolean = !!this.progressState.whilePromise;
 
 		// Reset State
@@ -252,21 +251,17 @@ export class ScopedProgressService extends ScopedService implements IProgressSer
 			this.progressbar.infinite().show(delay);
 		}
 	}
-
-	public dispose(): void {
-		this.toDispose = lifecycle.dispose(this.toDispose);
-	}
 }
 
 export class ProgressService implements IProgressService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	constructor(private progressbar: ProgressBar) { }
 
-	public show(infinite: boolean, delay?: number): IProgressRunner;
-	public show(total: number, delay?: number): IProgressRunner;
-	public show(infiniteOrTotal: boolean | number, delay?: number): IProgressRunner {
+	show(infinite: boolean, delay?: number): IProgressRunner;
+	show(total: number, delay?: number): IProgressRunner;
+	show(infiniteOrTotal: boolean | number, delay?: number): IProgressRunner {
 		if (typeof infiniteOrTotal === 'boolean') {
 			this.progressbar.infinite().show(delay);
 		} else {
@@ -292,7 +287,7 @@ export class ProgressService implements IProgressService {
 		};
 	}
 
-	public showWhile(promise: TPromise<any>, delay?: number): TPromise<void> {
+	showWhile(promise: TPromise<any>, delay?: number): TPromise<void> {
 		const stop = () => {
 			this.progressbar.stop().hide();
 		};
diff --git a/src/vs/workbench/services/progress/browser/progressService2.ts b/src/vs/workbench/services/progress/browser/progressService2.ts
index df20cc78925..9a1eacf76a6 100644
--- a/src/vs/workbench/services/progress/browser/progressService2.ts
+++ b/src/vs/workbench/services/progress/browser/progressService2.ts
@@ -15,7 +15,7 @@ import { OcticonLabel } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { StatusbarAlignment, IStatusbarRegistry, StatusbarItemDescriptor, Extensions, IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { always } from 'vs/base/common/async';
+import { always, timeout } from 'vs/base/common/async';
 import { ProgressBadge, IActivityService } from 'vs/workbench/services/activity/common/activity';
 import { INotificationService, Severity, INotificationHandle, INotificationActions } from 'vs/platform/notification/common/notification';
 import { Action } from 'vs/base/common/actions';
@@ -130,8 +130,8 @@ export class ProgressService2 implements IProgressService2 {
 			this._updateWindowProgress();
 
 			// show progress for at least 150ms
-			always(TPromise.join([
-				TPromise.timeout(150),
+			always(Promise.all([
+				timeout(150),
 				promise
 			]), () => {
 				const idx = this._stack.indexOf(task);
@@ -142,7 +142,7 @@ export class ProgressService2 implements IProgressService2 {
 		}, 150);
 
 		// cancel delay if promise finishes below 150ms
-		always(TPromise.wrap(promise), () => clearTimeout(delayHandle));
+		always(promise, () => clearTimeout(delayHandle));
 		return promise;
 	}
 
@@ -270,7 +270,7 @@ export class ProgressService2 implements IProgressService2 {
 		});
 
 		// Show progress for at least 800ms and then hide once done or canceled
-		always(TPromise.join([TPromise.timeout(800), p]), () => {
+		always(Promise.all([timeout(800), p]), () => {
 			if (handle) {
 				handle.close();
 			}
diff --git a/src/vs/workbench/services/search/node/fileSearch.ts b/src/vs/workbench/services/search/node/fileSearch.ts
index 0652e2239be..1182c79e506 100644
--- a/src/vs/workbench/services/search/node/fileSearch.ts
+++ b/src/vs/workbench/services/search/node/fileSearch.ts
@@ -123,78 +123,61 @@ export class FileWalker {
 		this.fileWalkStartTime = Date.now();
 
 		// Support that the file pattern is a full path to a file that exists
-		this.checkFilePatternAbsoluteMatch((exists, size) => {
-			if (this.isCanceled) {
-				return done(null, this.isLimitHit);
-			}
+		if (this.isCanceled) {
+			return done(null, this.isLimitHit);
+		}
 
-			// Report result from file pattern if matching
-			if (exists) {
-				this.resultCount++;
-				onResult({
-					relativePath: this.filePattern,
-					basename: path.basename(this.filePattern),
-					size
-				});
-
-				// Optimization: a match on an absolute path is a good result and we do not
-				// continue walking the entire root paths array for other matches because
-				// it is very unlikely that another file would match on the full absolute path
-				return done(null, this.isLimitHit);
-			}
-
-			// For each extra file
-			if (extraFiles) {
-				extraFiles.forEach(extraFilePath => {
-					const basename = path.basename(extraFilePath);
-					if (this.globalExcludePattern && this.globalExcludePattern(extraFilePath, basename)) {
-						return; // excluded
-					}
-
-					// File: Check for match on file pattern and include pattern
-					this.matchFile(onResult, { relativePath: extraFilePath /* no workspace relative path */, basename });
-				});
-			}
-
-			let traverse = this.nodeJSTraversal;
-			if (!this.maxFilesize) {
-				if (this.useRipgrep) {
-					this.traversal = Traversal.Ripgrep;
-					traverse = this.cmdTraversal;
-				} else if (platform.isMacintosh) {
-					this.traversal = Traversal.MacFind;
-					traverse = this.cmdTraversal;
-					// Disable 'dir' for now (#11181, #11179, #11183, #11182).
-				} /* else if (platform.isWindows) {
-					this.traversal = Traversal.WindowsDir;
-					traverse = this.windowsDirTraversal;
-				} */ else if (platform.isLinux) {
-					this.traversal = Traversal.LinuxFind;
-					traverse = this.cmdTraversal;
+		// For each extra file
+		if (extraFiles) {
+			extraFiles.forEach(extraFilePath => {
+				const basename = path.basename(extraFilePath);
+				if (this.globalExcludePattern && this.globalExcludePattern(extraFilePath, basename)) {
+					return; // excluded
 				}
-			}
 
-			const isNodeTraversal = traverse === this.nodeJSTraversal;
-			if (!isNodeTraversal) {
-				this.cmdForkStartTime = Date.now();
-			}
-
-			// For each root folder
-			flow.parallel<IFolderSearch, void>(folderQueries, (folderQuery: IFolderSearch, rootFolderDone: (err: Error, result: void) => void) => {
-				this.call(traverse, this, folderQuery, onResult, onMessage, (err?: Error) => {
-					if (err) {
-						const errorMessage = toErrorMessage(err);
-						console.error(errorMessage);
-						this.errors.push(errorMessage);
-						rootFolderDone(err, undefined);
-					} else {
-						rootFolderDone(undefined, undefined);
-					}
-				});
-			}, (errors, result) => {
-				const err = errors ? errors.filter(e => !!e)[0] : null;
-				done(err, this.isLimitHit);
+				// File: Check for match on file pattern and include pattern
+				this.matchFile(onResult, { relativePath: extraFilePath /* no workspace relative path */, basename });
 			});
+		}
+
+		let traverse = this.nodeJSTraversal;
+		if (!this.maxFilesize) {
+			if (this.useRipgrep) {
+				this.traversal = Traversal.Ripgrep;
+				traverse = this.cmdTraversal;
+			} else if (platform.isMacintosh) {
+				this.traversal = Traversal.MacFind;
+				traverse = this.cmdTraversal;
+				// Disable 'dir' for now (#11181, #11179, #11183, #11182).
+			} /* else if (platform.isWindows) {
+				this.traversal = Traversal.WindowsDir;
+				traverse = this.windowsDirTraversal;
+			} */ else if (platform.isLinux) {
+				this.traversal = Traversal.LinuxFind;
+				traverse = this.cmdTraversal;
+			}
+		}
+
+		const isNodeTraversal = traverse === this.nodeJSTraversal;
+		if (!isNodeTraversal) {
+			this.cmdForkStartTime = Date.now();
+		}
+
+		// For each root folder
+		flow.parallel<IFolderSearch, void>(folderQueries, (folderQuery: IFolderSearch, rootFolderDone: (err: Error, result: void) => void) => {
+			this.call(traverse, this, folderQuery, onResult, onMessage, (err?: Error) => {
+				if (err) {
+					const errorMessage = toErrorMessage(err);
+					console.error(errorMessage);
+					this.errors.push(errorMessage);
+					rootFolderDone(err, undefined);
+				} else {
+					rootFolderDone(undefined, undefined);
+				}
+			});
+		}, (errors, result) => {
+			const err = errors ? errors.filter(e => !!e)[0] : null;
+			done(err, this.isLimitHit);
 		});
 	}
 
@@ -568,16 +551,6 @@ export class FileWalker {
 		};
 	}
 
-	private checkFilePatternAbsoluteMatch(clb: (exists: boolean, size?: number) => void): void {
-		if (!this.filePattern || !path.isAbsolute(this.filePattern)) {
-			return clb(false);
-		}
-
-		return fs.stat(this.filePattern, (error, stat) => {
-			return clb(!error && !stat.isDirectory(), stat && stat.size); // only existing files
-		});
-	}
-
 	private checkFilePatternRelativeMatch(basePath: string, clb: (matchPath: string, size?: number) => void): void {
 		if (!this.filePattern || path.isAbsolute(this.filePattern)) {
 			return clb(null);
diff --git a/src/vs/workbench/services/search/node/rawSearchService.ts b/src/vs/workbench/services/search/node/rawSearchService.ts
index 7f8387e9d29..fd40541b99c 100644
--- a/src/vs/workbench/services/search/node/rawSearchService.ts
+++ b/src/vs/workbench/services/search/node/rawSearchService.ts
@@ -6,23 +6,22 @@
 'use strict';
 
 import * as fs from 'fs';
-import { isAbsolute, sep, join } from 'path';
-
 import * as gracefulFs from 'graceful-fs';
-gracefulFs.gracefulify(fs);
-
+import { join, sep } from 'path';
 import * as arrays from 'vs/base/common/arrays';
 import * as objects from 'vs/base/common/objects';
 import * as strings from 'vs/base/common/strings';
 import { PPromise, TPromise } from 'vs/base/common/winjs.base';
-import { FileWalker, Engine as FileSearchEngine } from 'vs/workbench/services/search/node/fileSearch';
+import { compareItemsByScore, IItemAccessor, prepareQuery, ScorerCache } from 'vs/base/parts/quickopen/common/quickOpenScorer';
 import { MAX_FILE_SIZE } from 'vs/platform/files/node/files';
+import { ICachedSearchStats, IProgress } from 'vs/platform/search/common/search';
+import { Engine as FileSearchEngine, FileWalker } from 'vs/workbench/services/search/node/fileSearch';
 import { RipgrepEngine } from 'vs/workbench/services/search/node/ripgrepTextSearch';
 import { Engine as TextSearchEngine } from 'vs/workbench/services/search/node/textSearch';
 import { TextSearchWorkerProvider } from 'vs/workbench/services/search/node/textSearchWorkerProvider';
-import { IRawSearchService, IRawSearch, IRawFileMatch, ISerializedFileMatch, ISerializedSearchProgressItem, ISerializedSearchComplete, ISearchEngine, IFileSearchProgressItem, ITelemetryEvent } from './search';
-import { ICachedSearchStats, IProgress } from 'vs/platform/search/common/search';
-import { compareItemsByScore, IItemAccessor, ScorerCache, prepareQuery } from 'vs/base/parts/quickopen/common/quickOpenScorer';
+import { IFileSearchProgressItem, IRawFileMatch, IRawSearch, IRawSearchService, ISearchEngine, ISerializedFileMatch, ISerializedSearchComplete, ISerializedSearchProgressItem, ITelemetryEvent } from './search';
+
+gracefulFs.gracefulify(fs);
 
 export class SearchService implements IRawSearchService {
 
@@ -271,10 +270,6 @@ export class SearchService implements IRawSearchService {
 	}
 
 	private getResultsFromCache(cache: Cache, searchValue: string): PPromise<[ISerializedSearchComplete, IRawFileMatch[], CacheStats], IProgress> {
-		if (isAbsolute(searchValue)) {
-			return null; // bypass cache if user looks up an absolute path where matching goes directly on disk
-		}
-
 		// Find cache entries by prefix of search value
 		const hasPathSep = searchValue.indexOf(sep) >= 0;
 		let cached: PPromise<[ISerializedSearchComplete, IRawFileMatch[]], IFileSearchProgressItem>;
diff --git a/src/vs/workbench/services/search/node/searchIpc.ts b/src/vs/workbench/services/search/node/searchIpc.ts
index 4e9575e0d55..ffa1d267bb9 100644
--- a/src/vs/workbench/services/search/node/searchIpc.ts
+++ b/src/vs/workbench/services/search/node/searchIpc.ts
@@ -8,6 +8,7 @@
 import { PPromise, TPromise } from 'vs/base/common/winjs.base';
 import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { IRawSearchService, IRawSearch, ISerializedSearchComplete, ISerializedSearchProgressItem, ITelemetryEvent } from './search';
+import { Event } from 'vs/base/common/event';
 
 export interface ISearchChannel extends IChannel {
 	call(command: 'fileSearch', search: IRawSearch): PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem>;
@@ -21,6 +22,10 @@ export class SearchChannel implements ISearchChannel {
 
 	constructor(private service: IRawSearchService) { }
 
+	listen<T>(event: string, arg?: any): Event<T> {
+		throw new Error('No events');
+	}
+
 	call(command: string, arg?: any): TPromise<any> {
 		switch (command) {
 			case 'fileSearch': return this.service.fileSearch(arg);
diff --git a/src/vs/workbench/services/search/node/searchService.ts b/src/vs/workbench/services/search/node/searchService.ts
index f9bb3b703fe..cc292c17701 100644
--- a/src/vs/workbench/services/search/node/searchService.ts
+++ b/src/vs/workbench/services/search/node/searchService.ts
@@ -32,6 +32,7 @@ export class SearchService implements ISearchService {
 
 	private diskSearch: DiskSearch;
 	private readonly searchProviders: ISearchResultProvider[] = [];
+	private fileSearchProvider: ISearchResultProvider;
 	private forwardingTelemetry: PPromise<void, ITelemetryEvent>;
 
 	constructor(
@@ -46,13 +47,22 @@ export class SearchService implements ISearchService {
 		this.diskSearch = new DiskSearch(!environmentService.isBuilt || environmentService.verbose, /*timeout=*/undefined, environmentService.debugSearch);
 	}
 
-	public registerSearchResultProvider(provider: ISearchResultProvider): IDisposable {
-		this.searchProviders.push(provider);
+	public registerSearchResultProvider(scheme: string, provider: ISearchResultProvider): IDisposable {
+		if (scheme === 'file') {
+			this.fileSearchProvider = provider;
+		} else {
+			this.searchProviders.push(provider);
+		}
+
 		return {
 			dispose: () => {
-				const idx = this.searchProviders.indexOf(provider);
-				if (idx >= 0) {
-					this.searchProviders.splice(idx, 1);
+				if (scheme === 'file') {
+					this.fileSearchProvider = null;
+				} else {
+					const idx = this.searchProviders.indexOf(provider);
+					if (idx >= 0) {
+						this.searchProviders.splice(idx, 1);
+					}
 				}
 			}
 		};
@@ -115,32 +125,32 @@ export class SearchService implements ISearchService {
 				});
 
 			const providerPromise = this.extensionService.whenInstalledExtensionsRegistered().then(() => {
-				// If no search providers are registered, fall back on DiskSearch
 				// TODO@roblou this is not properly waiting for search-rg to finish registering itself
-				if (this.searchProviders.length) {
-					return TPromise.join(this.searchProviders.map(p => searchWithProvider(p)))
-						.then(completes => {
-							completes = completes.filter(c => !!c);
-							if (!completes.length) {
-								return null;
-							}
+				// If no search provider has been registered for the 'file' schema, fall back on DiskSearch
+				const providers = [
+					this.fileSearchProvider || this.diskSearch,
+					...this.searchProviders
+				];
+				return TPromise.join(providers.map(p => searchWithProvider(p)))
+					.then(completes => {
+						completes = completes.filter(c => !!c);
+						if (!completes.length) {
+							return null;
+						}
 
-							return <ISearchComplete>{
-								limitHit: completes[0] && completes[0].limitHit,
-								stats: completes[0].stats,
-								results: arrays.flatten(completes.map(c => c.results))
-							};
-						}, errs => {
-							if (!Array.isArray(errs)) {
-								errs = [errs];
-							}
+						return <ISearchComplete>{
+							limitHit: completes[0] && completes[0].limitHit,
+							stats: completes[0].stats,
+							results: arrays.flatten(completes.map(c => c.results))
+						};
+					}, errs => {
+						if (!Array.isArray(errs)) {
+							errs = [errs];
+						}
 
-							errs = errs.filter(e => !!e);
-							return TPromise.wrapError(errs[0]);
-						});
-				} else {
-					return searchWithProvider(this.diskSearch);
-				}
+						errs = errs.filter(e => !!e);
+						return TPromise.wrapError(errs[0]);
+					});
 			});
 
 			combinedPromise = providerPromise.then(value => {
@@ -248,7 +258,12 @@ export class SearchService implements ISearchService {
 	}
 
 	public clearCache(cacheKey: string): TPromise<void> {
-		return this.diskSearch.clearCache(cacheKey);
+		return TPromise.join([
+			...this.searchProviders,
+			this.fileSearchProvider,
+			this.diskSearch
+		].map(provider => provider && provider.clearCache(cacheKey)))
+			.then(() => { });
 	}
 
 	private forwardTelemetry() {
diff --git a/src/vs/workbench/services/search/node/worker/searchWorkerIpc.ts b/src/vs/workbench/services/search/node/worker/searchWorkerIpc.ts
index 5260dc0b80d..70aade1c801 100644
--- a/src/vs/workbench/services/search/node/worker/searchWorkerIpc.ts
+++ b/src/vs/workbench/services/search/node/worker/searchWorkerIpc.ts
@@ -10,6 +10,7 @@ import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { ISerializedFileMatch } from '../search';
 import { IPatternInfo } from 'vs/platform/search/common/search';
 import { SearchWorker } from './searchWorker';
+import { Event } from 'vs/base/common/event';
 
 export interface ISearchWorkerSearchArgs {
 	pattern: IPatternInfo;
@@ -41,6 +42,10 @@ export class SearchWorkerChannel implements ISearchWorkerChannel {
 	constructor(private worker: SearchWorker) {
 	}
 
+	listen<T>(event: string, arg?: any): Event<T> {
+		throw new Error('No events');
+	}
+
 	call(command: string, arg?: any): TPromise<any> {
 		switch (command) {
 			case 'initialize': return this.worker.initialize();
diff --git a/src/vs/workbench/services/search/test/node/search.test.ts b/src/vs/workbench/services/search/test/node/search.test.ts
index c4a69c77005..1d19c3d0c76 100644
--- a/src/vs/workbench/services/search/test/node/search.test.ts
+++ b/src/vs/workbench/services/search/test/node/search.test.ts
@@ -578,29 +578,6 @@ suite('FileSearchEngine', () => {
 		});
 	});
 
-	test('Files: absolute path to file ignores excludes', function (done: () => void) {
-		this.timeout(testTimeout);
-		let engine = new FileSearchEngine({
-			folderQueries: ROOT_FOLDER_QUERY,
-			filePattern: path.normalize(path.join(require.toUrl('./fixtures'), 'site.css')),
-			excludePattern: { '**/*.css': true }
-		});
-
-		let count = 0;
-		let res: IRawFileMatch;
-		engine.search((result) => {
-			if (result) {
-				count++;
-			}
-			res = result;
-		}, () => { }, (error) => {
-			assert.ok(!error);
-			assert.equal(count, 1);
-			assert.equal(path.basename(res.relativePath), 'site.css');
-			done();
-		});
-	});
-
 	test('Files: relative path matched once', function (done: () => void) {
 		this.timeout(testTimeout);
 		let engine = new FileSearchEngine({
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
index 5d4c9496046..f9e41489ea9 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -12,7 +12,6 @@ import { onUnexpectedError } from 'vs/base/common/errors';
 import { guessMimeTypes } from 'vs/base/common/mime';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import URI from 'vs/base/common/uri';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import * as diagnostics from 'vs/base/common/diagnostics';
 import * as types from 'vs/base/common/types';
 import { IMode } from 'vs/editor/common/modes';
@@ -33,17 +32,27 @@ 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';
 import { isLinux } from 'vs/base/common/platform';
+import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 
 /**
  * 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.
  */
 export class TextFileEditorModel extends BaseTextEditorModel implements ITextFileEditorModel {
 
-	public static DEFAULT_CONTENT_CHANGE_BUFFER_DELAY = CONTENT_CHANGE_EVENT_BUFFER_DELAY;
-	public static DEFAULT_ORPHANED_CHANGE_BUFFER_DELAY = 100;
+	static DEFAULT_CONTENT_CHANGE_BUFFER_DELAY = CONTENT_CHANGE_EVENT_BUFFER_DELAY;
+	static DEFAULT_ORPHANED_CHANGE_BUFFER_DELAY = 100;
 
 	private static saveErrorHandler: ISaveErrorHandler;
+	static setSaveErrorHandler(handler: ISaveErrorHandler): void { TextFileEditorModel.saveErrorHandler = handler; }
+
 	private static saveParticipant: ISaveParticipant;
+	static setSaveParticipant(handler: ISaveParticipant): void { TextFileEditorModel.saveParticipant = handler; }
+
+	private readonly _onDidContentChange: Emitter<StateChange> = this._register(new Emitter<StateChange>());
+	get onDidContentChange(): Event<StateChange> { return this._onDidContentChange.event; }
+
+	private readonly _onDidStateChange: Emitter<StateChange> = this._register(new Emitter<StateChange>());
+	get onDidStateChange(): Event<StateChange> { return this._onDidStateChange.event; }
 
 	private resource: URI;
 	private contentEncoding: string; 			// encoding as reported from disk
@@ -52,20 +61,16 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 	private versionId: number;
 	private bufferSavedVersionId: number;
 	private lastResolvedDiskStat: IFileStat;
-	private toDispose: IDisposable[];
 	private blockModelContentChange: boolean;
 	private autoSaveAfterMillies: number;
 	private autoSaveAfterMilliesEnabled: boolean;
-	private autoSavePromise: TPromise<void>;
+	private autoSaveDisposable: IDisposable;
 	private contentChangeEventScheduler: RunOnceScheduler;
 	private orphanedChangeEventScheduler: RunOnceScheduler;
 	private saveSequentializer: SaveSequentializer;
 	private disposed: boolean;
 	private lastSaveAttemptTime: number;
 	private createTextEditorModelPromise: TPromise<TextFileEditorModel>;
-	private readonly _onDidContentChange: Emitter<StateChange>;
-	private readonly _onDidStateChange: Emitter<StateChange>;
-
 	private inConflictMode: boolean;
 	private inOrphanMode: boolean;
 	private inErrorMode: boolean;
@@ -86,12 +91,8 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		@IHashService private hashService: IHashService
 	) {
 		super(modelService, modeService);
+
 		this.resource = resource;
-		this.toDispose = [];
-		this._onDidContentChange = new Emitter<StateChange>();
-		this._onDidStateChange = new Emitter<StateChange>();
-		this.toDispose.push(this._onDidContentChange);
-		this.toDispose.push(this._onDidStateChange);
 		this.preferredEncoding = preferredEncoding;
 		this.inOrphanMode = false;
 		this.dirty = false;
@@ -99,11 +100,8 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		this.lastSaveAttemptTime = 0;
 		this.saveSequentializer = new SaveSequentializer();
 
-		this.contentChangeEventScheduler = new RunOnceScheduler(() => this._onDidContentChange.fire(StateChange.CONTENT_CHANGE), TextFileEditorModel.DEFAULT_CONTENT_CHANGE_BUFFER_DELAY);
-		this.toDispose.push(this.contentChangeEventScheduler);
-
-		this.orphanedChangeEventScheduler = new RunOnceScheduler(() => this._onDidStateChange.fire(StateChange.ORPHANED_CHANGE), TextFileEditorModel.DEFAULT_ORPHANED_CHANGE_BUFFER_DELAY);
-		this.toDispose.push(this.orphanedChangeEventScheduler);
+		this.contentChangeEventScheduler = this._register(new RunOnceScheduler(() => this._onDidContentChange.fire(StateChange.CONTENT_CHANGE), TextFileEditorModel.DEFAULT_CONTENT_CHANGE_BUFFER_DELAY));
+		this.orphanedChangeEventScheduler = this._register(new RunOnceScheduler(() => this._onDidStateChange.fire(StateChange.ORPHANED_CHANGE), TextFileEditorModel.DEFAULT_ORPHANED_CHANGE_BUFFER_DELAY));
 
 		this.updateAutoSaveConfiguration(textFileService.getAutoSaveConfiguration());
 
@@ -111,10 +109,10 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 	}
 
 	private registerListeners(): void {
-		this.toDispose.push(this.fileService.onFileChanges(e => this.onFileChanges(e)));
-		this.toDispose.push(this.textFileService.onAutoSaveConfigurationChange(config => this.updateAutoSaveConfiguration(config)));
-		this.toDispose.push(this.textFileService.onFilesAssociationChange(e => this.onFilesAssociationChange()));
-		this.toDispose.push(this.onDidStateChange(e => this.onStateChange(e)));
+		this._register(this.fileService.onFileChanges(e => this.onFileChanges(e)));
+		this._register(this.textFileService.onAutoSaveConfigurationChange(config => this.updateAutoSaveConfiguration(config)));
+		this._register(this.textFileService.onFilesAssociationChange(e => this.onFilesAssociationChange()));
+		this._register(this.onDidStateChange(e => this.onStateChange(e)));
 	}
 
 	private onStateChange(e: StateChange): void {
@@ -184,71 +182,34 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 	}
 
 	private updateAutoSaveConfiguration(config: IAutoSaveConfiguration): void {
-		if (typeof config.autoSaveDelay === 'number' && config.autoSaveDelay > 0) {
-			this.autoSaveAfterMillies = config.autoSaveDelay;
-			this.autoSaveAfterMilliesEnabled = true;
-		} else {
-			this.autoSaveAfterMillies = void 0;
-			this.autoSaveAfterMilliesEnabled = false;
-		}
+		const autoSaveAfterMilliesEnabled = (typeof config.autoSaveDelay === 'number') && config.autoSaveDelay > 0;
+
+		this.autoSaveAfterMilliesEnabled = autoSaveAfterMilliesEnabled;
+		this.autoSaveAfterMillies = autoSaveAfterMilliesEnabled ? config.autoSaveDelay : void 0;
 	}
 
 	private onFilesAssociationChange(): void {
-		this.updateTextEditorModelMode();
-	}
-
-	private updateTextEditorModelMode(modeId?: string): void {
 		if (!this.textEditorModel) {
 			return;
 		}
 
 		const firstLineText = this.getFirstLineText(this.textEditorModel);
-		const mode = this.getOrCreateMode(this.modeService, modeId, firstLineText);
+		const mode = this.getOrCreateMode(this.modeService, void 0, firstLineText);
 
 		this.modelService.setMode(this.textEditorModel, mode);
 	}
 
-	public get onDidContentChange(): Event<StateChange> {
-		return this._onDidContentChange.event;
-	}
-
-	public get onDidStateChange(): Event<StateChange> {
-		return this._onDidStateChange.event;
-	}
-
-	/**
-	 * The current version id of the model.
-	 */
-	public getVersionId(): number {
+	getVersionId(): number {
 		return this.versionId;
 	}
 
-	/**
-	 * Set a save error handler to install code that executes when save errors occur.
-	 */
-	public static setSaveErrorHandler(handler: ISaveErrorHandler): void {
-		TextFileEditorModel.saveErrorHandler = handler;
-	}
-
-	/**
-	 * Set a save participant handler to react on models getting saved.
-	 */
-	public static setSaveParticipant(handler: ISaveParticipant): void {
-		TextFileEditorModel.saveParticipant = handler;
-	}
-
-	/**
-	 * Discards any local changes and replaces the model with the contents of the version on disk.
-	 *
-	 * @param if the parameter soft is true, will not attempt to load the contents from disk.
-	 */
-	public revert(soft?: boolean): TPromise<void> {
+	revert(soft?: boolean): TPromise<void> {
 		if (!this.isResolved()) {
 			return TPromise.wrap<void>(null);
 		}
 
 		// Cancel any running auto-save
-		this.cancelAutoSavePromise();
+		this.cancelPendingAutoSave();
 
 		// Unset flags
 		const undo = this.setDirty(false);
@@ -273,12 +234,12 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		});
 	}
 
-	public load(options?: ILoadOptions): TPromise<TextFileEditorModel> {
+	load(options?: ILoadOptions): TPromise<TextFileEditorModel> {
 		diag('load() - enter', this.resource, new Date());
 
-		// It is very important to not reload the model when the model is dirty. We only want to reload the model from the disk
-		// if no save is pending to avoid data loss. This might cause a save conflict in case the file has been modified on the disk
-		// meanwhile, but this is a very low risk.
+		// It is very important to not reload the model when the model is dirty.
+		// We also only want to reload the model from the disk if no save is pending
+		// to avoid data loss.
 		if (this.dirty || this.saveSequentializer.hasPendingSave()) {
 			diag('load() - exit - without loading because model is dirty or being saved', this.resource, new Date());
 
@@ -287,14 +248,14 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 
 		// Only for new models we support to load from backup
 		if (!this.textEditorModel && !this.createTextEditorModelPromise) {
-			return this.loadWithBackup(options);
+			return this.loadFromBackup(options);
 		}
 
 		// Otherwise load from file resource
 		return this.loadFromFile(options);
 	}
 
-	private loadWithBackup(options?: ILoadOptions): TPromise<TextFileEditorModel> {
+	private loadFromBackup(options?: ILoadOptions): TPromise<TextFileEditorModel> {
 		return this.backupFileService.loadBackupResource(this.resource).then(backup => {
 
 			// Make sure meanwhile someone else did not suceed or start loading
@@ -334,42 +295,55 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			etag = this.lastResolvedDiskStat.etag; // otherwise respect etag to support caching
 		}
 
+		// Ensure to track the versionId before doing a long running operation
+		// to make sure the model was not changed in the meantime which would
+		// indicate that the user or program has made edits. If we would ignore
+		// this, we could potentially loose the changes that were made because
+		// after resolving the content we update the model and reset the dirty
+		// flag.
+		const currentVersionId = this.versionId;
+
 		// Resolve Content
 		return this.textFileService
 			.resolveTextContent(this.resource, { acceptTextOnly: !allowBinary, etag, encoding: this.preferredEncoding })
-			.then(content => this.handleLoadSuccess(content), error => this.handleLoadError(error));
-	}
+			.then(content => {
 
-	private handleLoadSuccess(content: IRawTextContent): TPromise<TextFileEditorModel> {
+				// Clear orphaned state when loading was successful
+				this.setOrphaned(false);
 
-		// Clear orphaned state when load was successful
-		this.setOrphaned(false);
+				// Guard against the model having changed in the meantime
+				if (currentVersionId === this.versionId) {
+					return this.loadWithContent(content);
+				}
 
-		return this.loadWithContent(content);
-	}
+				return this;
+			}, error => {
+				const result = error.fileOperationResult;
 
-	private handleLoadError(error: FileOperationError): TPromise<TextFileEditorModel> {
-		const result = error.fileOperationResult;
+				// Apply orphaned state based on error code
+				this.setOrphaned(result === FileOperationResult.FILE_NOT_FOUND);
 
-		// Apply orphaned state based on error code
-		this.setOrphaned(result === FileOperationResult.FILE_NOT_FOUND);
+				// NotModified status is expected and can be handled gracefully
+				if (result === FileOperationResult.FILE_NOT_MODIFIED_SINCE) {
 
-		// NotModified status is expected and can be handled gracefully
-		if (result === FileOperationResult.FILE_NOT_MODIFIED_SINCE) {
-			this.setDirty(false); // Ensure we are not tracking a stale state
+					// Guard against the model having changed in the meantime
+					if (currentVersionId === this.versionId) {
+						this.setDirty(false); // Ensure we are not tracking a stale state
+					}
 
-			return TPromise.as<TextFileEditorModel>(this);
-		}
+					return TPromise.as<TextFileEditorModel>(this);
+				}
 
-		// Ignore when a model has been resolved once and the file was deleted meanwhile. Since
-		// we already have the model loaded, we can return to this state and update the orphaned
-		// flag to indicate that this model has no version on disk anymore.
-		if (this.isResolved() && result === FileOperationResult.FILE_NOT_FOUND) {
-			return TPromise.as<TextFileEditorModel>(this);
-		}
+				// Ignore when a model has been resolved once and the file was deleted meanwhile. Since
+				// we already have the model loaded, we can return to this state and update the orphaned
+				// flag to indicate that this model has no version on disk anymore.
+				if (this.isResolved() && result === FileOperationResult.FILE_NOT_FOUND) {
+					return TPromise.as<TextFileEditorModel>(this);
+				}
 
-		// Otherwise bubble up the error
-		return TPromise.wrapError<TextFileEditorModel>(error);
+				// Otherwise bubble up the error
+				return TPromise.wrapError<TextFileEditorModel>(error);
+			});
 	}
 
 	private loadWithContent(content: IRawTextContent, backup?: URI): TPromise<TextFileEditorModel> {
@@ -400,7 +374,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		diag('load() - resolved content', this.resource, new Date());
 
 		// Update our resolved disk stat model
-		const resolvedStat: IFileStat = {
+		this.updateLastResolvedDiskStat({
 			resource: this.resource,
 			name: content.name,
 			mtime: content.mtime,
@@ -409,8 +383,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			isSymbolicLink: false,
 			children: void 0,
 			isReadonly: content.isReadonly
-		};
-		this.updateLastResolvedDiskStat(resolvedStat);
+		} as IFileStat);
 
 		// Keep the original encoding to not loose it when saving
 		const oldEncoding = this.contentEncoding;
@@ -504,7 +477,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		// where `value` was captured in the content change listener closure scope.
 
 		// Content Change
-		this.toDispose.push(this.textEditorModel.onDidChangeContent(() => this.onModelContentChanged()));
+		this._register(this.textEditorModel.onDidChangeContent(() => this.onModelContentChanged()));
 	}
 
 	private doLoadBackup(backup: URI): TPromise<ITextBufferFactory> {
@@ -580,35 +553,32 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		}
 	}
 
-	private doAutoSave(versionId: number): TPromise<void> {
+	private doAutoSave(versionId: number): void {
 		diag(`doAutoSave() - enter for versionId ${versionId}`, this.resource, new Date());
 
 		// Cancel any currently running auto saves to make this the one that succeeds
-		this.cancelAutoSavePromise();
+		this.cancelPendingAutoSave();
 
-		// Create new save promise and keep it
-		this.autoSavePromise = TPromise.timeout(this.autoSaveAfterMillies).then(() => {
+		// Create new save timer and store it for disposal as needed
+		const handle = setTimeout(() => {
 
 			// Only trigger save if the version id has not changed meanwhile
 			if (versionId === this.versionId) {
 				this.doSave(versionId, { reason: SaveReason.AUTO }).done(null, onUnexpectedError); // Very important here to not return the promise because if the timeout promise is canceled it will bubble up the error otherwise - do not change
 			}
-		});
+		}, this.autoSaveAfterMillies);
 
-		return this.autoSavePromise;
+		this.autoSaveDisposable = toDisposable(() => clearTimeout(handle));
 	}
 
-	private cancelAutoSavePromise(): void {
-		if (this.autoSavePromise) {
-			this.autoSavePromise.cancel();
-			this.autoSavePromise = void 0;
+	private cancelPendingAutoSave(): void {
+		if (this.autoSaveDisposable) {
+			this.autoSaveDisposable.dispose();
+			this.autoSaveDisposable = void 0;
 		}
 	}
 
-	/**
-	 * Saves the current versionId of this editor model if it is dirty.
-	 */
-	public save(options: ISaveOptions = Object.create(null)): TPromise<void> {
+	save(options: ISaveOptions = Object.create(null)): TPromise<void> {
 		if (!this.isResolved()) {
 			return TPromise.wrap<void>(null);
 		}
@@ -616,7 +586,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		diag('save() - enter', this.resource, new Date());
 
 		// Cancel any currently running auto saves to make this the one that succeeds
-		this.cancelAutoSavePromise();
+		this.cancelPendingAutoSave();
 
 		return this.doSave(this.versionId, options);
 	}
@@ -876,31 +846,19 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		TextFileEditorModel.saveErrorHandler.onSaveError(error, this);
 	}
 
-	/**
-	 * Returns true if the content of this model has changes that are not yet saved back to the disk.
-	 */
-	public isDirty(): boolean {
+	isDirty(): boolean {
 		return this.dirty;
 	}
 
-	/**
-	 * Returns the time in millies when this working copy was attempted to be saved.
-	 */
-	public getLastSaveAttemptTime(): number {
+	getLastSaveAttemptTime(): number {
 		return this.lastSaveAttemptTime;
 	}
 
-	/**
-	 * Returns the time in millies when this working copy was last modified by the user or some other program.
-	 */
-	public getETag(): string {
+	getETag(): string {
 		return this.lastResolvedDiskStat ? this.lastResolvedDiskStat.etag : null;
 	}
 
-	/**
-	 * Answers if this model is in a specific state.
-	 */
-	public hasState(state: ModelState): boolean {
+	hasState(state: ModelState): boolean {
 		switch (state) {
 			case ModelState.CONFLICT:
 				return this.inConflictMode;
@@ -917,11 +875,11 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		}
 	}
 
-	public getEncoding(): string {
+	getEncoding(): string {
 		return this.preferredEncoding || this.contentEncoding;
 	}
 
-	public setEncoding(encoding: string, mode: EncodingMode): void {
+	setEncoding(encoding: string, mode: EncodingMode): void {
 		if (!this.isNewEncoding(encoding)) {
 			return; // return early if the encoding is already the same
 		}
@@ -958,7 +916,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		}
 	}
 
-	public updatePreferredEncoding(encoding: string): void {
+	updatePreferredEncoding(encoding: string): void {
 		if (!this.isNewEncoding(encoding)) {
 			return;
 		}
@@ -981,45 +939,35 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		return true;
 	}
 
-	public isResolved(): boolean {
+	isResolved(): boolean {
 		return !types.isUndefinedOrNull(this.lastResolvedDiskStat);
 	}
 
-	public isReadonly(): boolean {
+	isReadonly(): boolean {
 		return this.lastResolvedDiskStat && this.lastResolvedDiskStat.isReadonly;
 	}
 
-	/**
-	 * Returns true if the dispose() method of this model has been called.
-	 */
-	public isDisposed(): boolean {
+	isDisposed(): boolean {
 		return this.disposed;
 	}
 
-	/**
-	 * Returns the full resource URI of the file this text file editor model is about.
-	 */
-	public getResource(): URI {
+	getResource(): URI {
 		return this.resource;
 	}
 
-	/**
-	 * Stat accessor only used by tests.
-	 */
-	public getStat(): IFileStat {
+	getStat(): IFileStat {
 		return this.lastResolvedDiskStat;
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.disposed = true;
 		this.inConflictMode = false;
 		this.inOrphanMode = false;
 		this.inErrorMode = false;
 
-		this.toDispose = dispose(this.toDispose);
 		this.createTextEditorModelPromise = null;
 
-		this.cancelAutoSavePromise();
+		this.cancelPendingAutoSave();
 
 		super.dispose();
 	}
@@ -1041,7 +989,7 @@ export class SaveSequentializer {
 	private _pendingSave: IPendingSave;
 	private _nextSave: ISaveOperation;
 
-	public hasPendingSave(versionId?: number): boolean {
+	hasPendingSave(versionId?: number): boolean {
 		if (!this._pendingSave) {
 			return false;
 		}
@@ -1053,11 +1001,11 @@ export class SaveSequentializer {
 		return !!this._pendingSave;
 	}
 
-	public get pendingSave(): TPromise<void> {
+	get pendingSave(): TPromise<void> {
 		return this._pendingSave ? this._pendingSave.promise : void 0;
 	}
 
-	public setPending(versionId: number, promise: TPromise<void>): TPromise<void> {
+	setPending(versionId: number, promise: TPromise<void>): TPromise<void> {
 		this._pendingSave = { versionId, promise };
 
 		promise.done(() => this.donePending(versionId), () => this.donePending(versionId));
@@ -1086,7 +1034,7 @@ export class SaveSequentializer {
 		}
 	}
 
-	public setNext(run: () => TPromise<void>): TPromise<void> {
+	setNext(run: () => TPromise<void>): TPromise<void> {
 
 		// this is our first next save, so we create associated promise with it
 		// so that we can return a promise that completes when the save operation
@@ -1120,7 +1068,7 @@ class DefaultSaveErrorHandler implements ISaveErrorHandler {
 
 	constructor(@INotificationService private notificationService: INotificationService) { }
 
-	public onSaveError(error: any, model: TextFileEditorModel): void {
+	onSaveError(error: any, model: TextFileEditorModel): void {
 		this.notificationService.error(nls.localize('genericSaveError', "Failed to save '{0}': {1}", path.basename(model.getResource().fsPath), toErrorMessage(error, false)));
 	}
 }
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts b/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
index 7b19b9d0a36..32e0164ecae 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
@@ -8,23 +8,38 @@ import { Event, Emitter, debounceEvent } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
 import URI from 'vs/base/common/uri';
 import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { dispose, IDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { ITextFileEditorModel, ITextFileEditorModelManager, TextFileModelChangeEvent, StateChange, IModelLoadOrCreateOptions, ILoadOptions } from 'vs/workbench/services/textfile/common/textfiles';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ResourceMap } from 'vs/base/common/map';
+import { onUnexpectedError } from 'vs/base/common/errors';
 
-export class TextFileEditorModelManager implements ITextFileEditorModelManager {
-	private toUnbind: IDisposable[];
+export class TextFileEditorModelManager extends Disposable implements ITextFileEditorModelManager {
 
-	private readonly _onModelDisposed: Emitter<URI>;
-	private readonly _onModelContentChanged: Emitter<TextFileModelChangeEvent>;
-	private readonly _onModelDirty: Emitter<TextFileModelChangeEvent>;
-	private readonly _onModelSaveError: Emitter<TextFileModelChangeEvent>;
-	private readonly _onModelSaved: Emitter<TextFileModelChangeEvent>;
-	private readonly _onModelReverted: Emitter<TextFileModelChangeEvent>;
-	private readonly _onModelEncodingChanged: Emitter<TextFileModelChangeEvent>;
-	private readonly _onModelOrphanedChanged: Emitter<TextFileModelChangeEvent>;
+	private readonly _onModelDisposed: Emitter<URI> = this._register(new Emitter<URI>());
+	get onModelDisposed(): Event<URI> { return this._onModelDisposed.event; }
+
+	private readonly _onModelContentChanged: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
+	get onModelContentChanged(): Event<TextFileModelChangeEvent> { return this._onModelContentChanged.event; }
+
+	private readonly _onModelDirty: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
+	get onModelDirty(): Event<TextFileModelChangeEvent> { return this._onModelDirty.event; }
+
+	private readonly _onModelSaveError: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
+	get onModelSaveError(): Event<TextFileModelChangeEvent> { return this._onModelSaveError.event; }
+
+	private readonly _onModelSaved: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
+	get onModelSaved(): Event<TextFileModelChangeEvent> { return this._onModelSaved.event; }
+
+	private readonly _onModelReverted: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
+	get onModelReverted(): Event<TextFileModelChangeEvent> { return this._onModelReverted.event; }
+
+	private readonly _onModelEncodingChanged: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
+	get onModelEncodingChanged(): Event<TextFileModelChangeEvent> { return this._onModelEncodingChanged.event; }
+
+	private readonly _onModelOrphanedChanged: Emitter<TextFileModelChangeEvent> = this._register(new Emitter<TextFileModelChangeEvent>());
+	get onModelOrphanedChanged(): Event<TextFileModelChangeEvent> { return this._onModelOrphanedChanged.event; }
 
 	private _onModelsDirtyEvent: Event<TextFileModelChangeEvent[]>;
 	private _onModelsSaveError: Event<TextFileModelChangeEvent[]>;
@@ -41,25 +56,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		@ILifecycleService private lifecycleService: ILifecycleService,
 		@IInstantiationService private instantiationService: IInstantiationService
 	) {
-		this.toUnbind = [];
-
-		this._onModelDisposed = new Emitter<URI>();
-		this._onModelContentChanged = new Emitter<TextFileModelChangeEvent>();
-		this._onModelDirty = new Emitter<TextFileModelChangeEvent>();
-		this._onModelSaveError = new Emitter<TextFileModelChangeEvent>();
-		this._onModelSaved = new Emitter<TextFileModelChangeEvent>();
-		this._onModelReverted = new Emitter<TextFileModelChangeEvent>();
-		this._onModelEncodingChanged = new Emitter<TextFileModelChangeEvent>();
-		this._onModelOrphanedChanged = new Emitter<TextFileModelChangeEvent>();
-
-		this.toUnbind.push(this._onModelDisposed);
-		this.toUnbind.push(this._onModelContentChanged);
-		this.toUnbind.push(this._onModelDirty);
-		this.toUnbind.push(this._onModelSaveError);
-		this.toUnbind.push(this._onModelSaved);
-		this.toUnbind.push(this._onModelReverted);
-		this.toUnbind.push(this._onModelEncodingChanged);
-		this.toUnbind.push(this._onModelOrphanedChanged);
+		super();
 
 		this.mapResourceToModel = new ResourceMap<ITextFileEditorModel>();
 		this.mapResourceToDisposeListener = new ResourceMap<IDisposable>();
@@ -76,39 +73,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		this.lifecycleService.onShutdown(this.dispose, this);
 	}
 
-	public get onModelDisposed(): Event<URI> {
-		return this._onModelDisposed.event;
-	}
-
-	public get onModelContentChanged(): Event<TextFileModelChangeEvent> {
-		return this._onModelContentChanged.event;
-	}
-
-	public get onModelDirty(): Event<TextFileModelChangeEvent> {
-		return this._onModelDirty.event;
-	}
-
-	public get onModelSaveError(): Event<TextFileModelChangeEvent> {
-		return this._onModelSaveError.event;
-	}
-
-	public get onModelSaved(): Event<TextFileModelChangeEvent> {
-		return this._onModelSaved.event;
-	}
-
-	public get onModelReverted(): Event<TextFileModelChangeEvent> {
-		return this._onModelReverted.event;
-	}
-
-	public get onModelEncodingChanged(): Event<TextFileModelChangeEvent> {
-		return this._onModelEncodingChanged.event;
-	}
-
-	public get onModelOrphanedChanged(): Event<TextFileModelChangeEvent> {
-		return this._onModelOrphanedChanged.event;
-	}
-
-	public get onModelsDirty(): Event<TextFileModelChangeEvent[]> {
+	get onModelsDirty(): Event<TextFileModelChangeEvent[]> {
 		if (!this._onModelsDirtyEvent) {
 			this._onModelsDirtyEvent = this.debounce(this.onModelDirty);
 		}
@@ -116,7 +81,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		return this._onModelsDirtyEvent;
 	}
 
-	public get onModelsSaveError(): Event<TextFileModelChangeEvent[]> {
+	get onModelsSaveError(): Event<TextFileModelChangeEvent[]> {
 		if (!this._onModelsSaveError) {
 			this._onModelsSaveError = this.debounce(this.onModelSaveError);
 		}
@@ -124,7 +89,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		return this._onModelsSaveError;
 	}
 
-	public get onModelsSaved(): Event<TextFileModelChangeEvent[]> {
+	get onModelsSaved(): Event<TextFileModelChangeEvent[]> {
 		if (!this._onModelsSaved) {
 			this._onModelsSaved = this.debounce(this.onModelSaved);
 		}
@@ -132,7 +97,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		return this._onModelsSaved;
 	}
 
-	public get onModelsReverted(): Event<TextFileModelChangeEvent[]> {
+	get onModelsReverted(): Event<TextFileModelChangeEvent[]> {
 		if (!this._onModelsReverted) {
 			this._onModelsReverted = this.debounce(this.onModelReverted);
 		}
@@ -155,11 +120,11 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		return 250;
 	}
 
-	public get(resource: URI): ITextFileEditorModel {
+	get(resource: URI): ITextFileEditorModel {
 		return this.mapResourceToModel.get(resource);
 	}
 
-	public loadOrCreate(resource: URI, options?: IModelLoadOrCreateOptions): TPromise<ITextFileEditorModel> {
+	loadOrCreate(resource: URI, options?: IModelLoadOrCreateOptions): TPromise<ITextFileEditorModel> {
 
 		// Return early if model is currently being loaded
 		const pendingLoad = this.mapResourceToPendingModelLoaders.get(resource);
@@ -178,7 +143,17 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		let model = this.get(resource);
 		if (model) {
 			if (options && options.reload) {
-				modelPromise = model.load(modelLoadOptions);
+
+				// async reload: trigger a reload but return immediately
+				if (options.reload.async) {
+					modelPromise = TPromise.as(model);
+					model.load(options).then(null, onUnexpectedError);
+				}
+
+				// sync reload: do not return until model reloaded
+				else {
+					modelPromise = model.load(modelLoadOptions);
+				}
 			} else {
 				modelPromise = TPromise.as(model);
 			}
@@ -249,7 +224,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		});
 	}
 
-	public getAll(resource?: URI, filter?: (model: ITextFileEditorModel) => boolean): ITextFileEditorModel[] {
+	getAll(resource?: URI, filter?: (model: ITextFileEditorModel) => boolean): ITextFileEditorModel[] {
 		if (resource) {
 			const res = this.mapResourceToModel.get(resource);
 
@@ -266,7 +241,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		return res;
 	}
 
-	public add(resource: URI, model: ITextFileEditorModel): void {
+	add(resource: URI, model: ITextFileEditorModel): void {
 		const knownModel = this.mapResourceToModel.get(resource);
 		if (knownModel === model) {
 			return; // already cached
@@ -286,7 +261,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		}));
 	}
 
-	public remove(resource: URI): void {
+	remove(resource: URI): void {
 		this.mapResourceToModel.delete(resource);
 
 		const disposeListener = this.mapResourceToDisposeListener.get(resource);
@@ -308,7 +283,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		}
 	}
 
-	public clear(): void {
+	clear(): void {
 
 		// model caches
 		this.mapResourceToModel.clear();
@@ -327,7 +302,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		this.mapResourceToModelContentChangeListener.clear();
 	}
 
-	public disposeModel(model: TextFileEditorModel): void {
+	disposeModel(model: TextFileEditorModel): void {
 		if (!model) {
 			return; // we need data!
 		}
@@ -346,8 +321,4 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 
 		model.dispose();
 	}
-
-	public dispose(): void {
-		this.toUnbind = dispose(this.toUnbind);
-	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/services/textfile/common/textFileService.ts b/src/vs/workbench/services/textfile/common/textFileService.ts
index 0e4d700b9d0..f77b7d2ecc1 100644
--- a/src/vs/workbench/services/textfile/common/textFileService.ts
+++ b/src/vs/workbench/services/textfile/common/textFileService.ts
@@ -20,7 +20,7 @@ import { ILifecycleService, ShutdownReason } from 'vs/platform/lifecycle/common/
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IFileService, IResolveContentOptions, IFilesConfiguration, FileOperationError, FileOperationResult, AutoSaveConfiguration, HotExitConfiguration } from 'vs/platform/files/common/files';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { UntitledEditorModel } from 'vs/workbench/common/editor/untitledEditorModel';
@@ -44,27 +44,26 @@ export interface IBackupResult {
  *
  * It also adds diagnostics and logging around file system operations.
  */
-export abstract class TextFileService implements ITextFileService {
+export abstract class TextFileService extends Disposable implements ITextFileService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
-	private readonly _onWillMove = new Emitter<IWillMoveEvent>();
-	readonly onWillMove: Event<IWillMoveEvent> = this._onWillMove.event;
+	private readonly _onFilesAssociationChange: Emitter<void> = this._register(new Emitter<void>());
+	get onAutoSaveConfigurationChange(): Event<IAutoSaveConfiguration> { return this._onAutoSaveConfigurationChange.event; }
+
+	private readonly _onAutoSaveConfigurationChange: Emitter<IAutoSaveConfiguration> = this._register(new Emitter<IAutoSaveConfiguration>());
+	get onFilesAssociationChange(): Event<void> { return this._onFilesAssociationChange.event; }
+
+	private readonly _onWillMove = this._register(new Emitter<IWillMoveEvent>());
+	get onWillMove(): Event<IWillMoveEvent> { return this._onWillMove.event; }
 
-	private toUnbind: IDisposable[];
 	private _models: TextFileEditorModelManager;
-
-	private readonly _onFilesAssociationChange: Emitter<void>;
 	private currentFilesAssociationConfig: { [key: string]: string; };
-
-	private readonly _onAutoSaveConfigurationChange: Emitter<IAutoSaveConfiguration>;
 	private configuredAutoSaveDelay: number;
 	private configuredAutoSaveOnFocusChange: boolean;
 	private configuredAutoSaveOnWindowChange: boolean;
-
-	private autoSaveContext: IContextKey<string>;
-
 	private configuredHotExit: string;
+	private autoSaveContext: IContextKey<string>;
 
 	constructor(
 		private lifecycleService: ILifecycleService,
@@ -81,13 +80,7 @@ export abstract class TextFileService implements ITextFileService {
 		contextKeyService: IContextKeyService,
 		private modelService: IModelService
 	) {
-		this.toUnbind = [];
-
-		this._onAutoSaveConfigurationChange = new Emitter<IAutoSaveConfiguration>();
-		this.toUnbind.push(this._onAutoSaveConfigurationChange);
-
-		this._onFilesAssociationChange = new Emitter<void>();
-		this.toUnbind.push(this._onFilesAssociationChange);
+		super();
 
 		this._models = this.instantiationService.createInstance(TextFileEditorModelManager);
 		this.autoSaveContext = AutoSaveContext.bindTo(contextKeyService);
@@ -100,7 +93,7 @@ export abstract class TextFileService implements ITextFileService {
 		this.registerListeners();
 	}
 
-	public get models(): ITextFileEditorModelManager {
+	get models(): ITextFileEditorModelManager {
 		return this._models;
 	}
 
@@ -110,14 +103,6 @@ export abstract class TextFileService implements ITextFileService {
 
 	abstract confirmSave(resources?: URI[]): TPromise<ConfirmResult>;
 
-	public get onAutoSaveConfigurationChange(): Event<IAutoSaveConfiguration> {
-		return this._onAutoSaveConfigurationChange.event;
-	}
-
-	public get onFilesAssociationChange(): Event<void> {
-		return this._onFilesAssociationChange.event;
-	}
-
 	private registerListeners(): void {
 
 		// Lifecycle
@@ -125,7 +110,7 @@ export abstract class TextFileService implements ITextFileService {
 		this.lifecycleService.onShutdown(this.dispose, this);
 
 		// Files configuration changes
-		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => {
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('files')) {
 				this.onFilesConfigurationChange(this.configurationService.getValue<IFilesConfiguration>());
 			}
@@ -368,7 +353,7 @@ export abstract class TextFileService implements ITextFileService {
 		}
 	}
 
-	public getDirty(resources?: URI[]): URI[] {
+	getDirty(resources?: URI[]): URI[] {
 
 		// Collect files
 		const dirty = this.getDirtyFileModels(resources).map(m => m.getResource());
@@ -379,7 +364,7 @@ export abstract class TextFileService implements ITextFileService {
 		return dirty;
 	}
 
-	public isDirty(resource?: URI): boolean {
+	isDirty(resource?: URI): boolean {
 
 		// Check for dirty file
 		if (this._models.getAll(resource).some(model => model.isDirty())) {
@@ -390,7 +375,7 @@ export abstract class TextFileService implements ITextFileService {
 		return this.untitledEditorService.getDirty().some(dirty => !resource || dirty.toString() === resource.toString());
 	}
 
-	public save(resource: URI, options?: ISaveOptions): TPromise<boolean> {
+	save(resource: URI, options?: ISaveOptions): TPromise<boolean> {
 
 		// Run a forced save if we detect the file is not dirty so that save participants can still run
 		if (options && options.force && this.fileService.canHandleResource(resource) && !this.isDirty(resource)) {
@@ -403,9 +388,9 @@ export abstract class TextFileService implements ITextFileService {
 		return this.saveAll([resource], options).then(result => result.results.length === 1 && result.results[0].success);
 	}
 
-	public saveAll(includeUntitled?: boolean, options?: ISaveOptions): TPromise<ITextFileOperationResult>;
-	public saveAll(resources: URI[], options?: ISaveOptions): TPromise<ITextFileOperationResult>;
-	public saveAll(arg1?: any, options?: ISaveOptions): TPromise<ITextFileOperationResult> {
+	saveAll(includeUntitled?: boolean, options?: ISaveOptions): TPromise<ITextFileOperationResult>;
+	saveAll(resources: URI[], options?: ISaveOptions): TPromise<ITextFileOperationResult>;
+	saveAll(arg1?: any, options?: ISaveOptions): TPromise<ITextFileOperationResult> {
 
 		// get all dirty
 		let toSave: URI[] = [];
@@ -439,16 +424,16 @@ export abstract class TextFileService implements ITextFileService {
 			for (let i = 0; i < untitledResources.length; i++) {
 				const untitled = untitledResources[i];
 				if (this.untitledEditorService.exists(untitled)) {
-					let targetPath: string;
+					let targetUri: URI;
 
 					// Untitled with associated file path don't need to prompt
 					if (this.untitledEditorService.hasAssociatedFilePath(untitled)) {
-						targetPath = untitled.fsPath;
+						targetUri = untitled.with({ scheme: Schemas.file });
 					}
 
 					// Otherwise ask user
 					else {
-						targetPath = await this.promptForPath(this.suggestFileName(untitled));
+						const targetPath = await this.promptForPath(this.suggestFileName(untitled));
 						if (!targetPath) {
 							return TPromise.as({
 								results: [...fileResources, ...untitledResources].map(r => {
@@ -458,9 +443,11 @@ export abstract class TextFileService implements ITextFileService {
 								})
 							});
 						}
+
+						targetUri = URI.file(targetPath);
 					}
 
-					targetsForUntitled.push(URI.file(targetPath));
+					targetsForUntitled.push(targetUri);
 				}
 			}
 
@@ -535,7 +522,7 @@ export abstract class TextFileService implements ITextFileService {
 		return this.getFileModels(arg1).filter(model => model.isDirty());
 	}
 
-	public saveAs(resource: URI, target?: URI, options?: ISaveOptions): TPromise<URI> {
+	saveAs(resource: URI, target?: URI, options?: ISaveOptions): TPromise<URI> {
 
 		// Get to target resource
 		let targetPromise: TPromise<URI>;
@@ -652,11 +639,11 @@ export abstract class TextFileService implements ITextFileService {
 		return untitledFileName;
 	}
 
-	public revert(resource: URI, options?: IRevertOptions): TPromise<boolean> {
+	revert(resource: URI, options?: IRevertOptions): TPromise<boolean> {
 		return this.revertAll([resource], options).then(result => result.results.length === 1 && result.results[0].success);
 	}
 
-	public revertAll(resources?: URI[], options?: IRevertOptions): TPromise<ITextFileOperationResult> {
+	revertAll(resources?: URI[], options?: IRevertOptions): TPromise<ITextFileOperationResult> {
 
 		// Revert files first
 		return this.doRevertAllFiles(resources, options).then(operation => {
@@ -705,13 +692,30 @@ export abstract class TextFileService implements ITextFileService {
 		});
 	}
 
-	public delete(resource: URI, useTrash?: boolean): TPromise<void> {
-		const dirtyFiles = this.getDirty().filter(dirty => isEqualOrParent(dirty, resource, !platform.isLinux /* ignorecase */));
+	create(resource: URI, contents?: string, options?: { overwrite?: boolean }): TPromise<void> {
+		const existingModel = this.models.get(resource);
 
-		return this.revertAll(dirtyFiles, { soft: true }).then(() => this.fileService.del(resource, useTrash));
+		return this.fileService.createFile(resource, contents, options).then(() => {
+
+			// If we had an existing model for the given resource, load
+			// it again to make sure it is up to date with the contents
+			// we just wrote into the underlying resource by calling
+			// revert()
+			if (existingModel && !existingModel.isDisposed()) {
+				return existingModel.revert();
+			}
+
+			return void 0;
+		});
 	}
 
-	public move(source: URI, target: URI, overwrite?: boolean): TPromise<void> {
+	delete(resource: URI, options?: { useTrash?: boolean, recursive?: boolean }): TPromise<void> {
+		const dirtyFiles = this.getDirty().filter(dirty => isEqualOrParent(dirty, resource, !platform.isLinux /* ignorecase */));
+
+		return this.revertAll(dirtyFiles, { soft: true }).then(() => this.fileService.del(resource, options));
+	}
+
+	move(source: URI, target: URI, overwrite?: boolean): TPromise<void> {
 
 		const waitForPromises: TPromise[] = [];
 		this._onWillMove.fire({
@@ -788,7 +792,7 @@ export abstract class TextFileService implements ITextFileService {
 		});
 	}
 
-	public getAutoSaveMode(): AutoSaveMode {
+	getAutoSaveMode(): AutoSaveMode {
 		if (this.configuredAutoSaveOnFocusChange) {
 			return AutoSaveMode.ON_FOCUS_CHANGE;
 		}
@@ -804,7 +808,7 @@ export abstract class TextFileService implements ITextFileService {
 		return AutoSaveMode.OFF;
 	}
 
-	public getAutoSaveConfiguration(): IAutoSaveConfiguration {
+	getAutoSaveConfiguration(): IAutoSaveConfiguration {
 		return {
 			autoSaveDelay: this.configuredAutoSaveDelay && this.configuredAutoSaveDelay > 0 ? this.configuredAutoSaveDelay : void 0,
 			autoSaveFocusChange: this.configuredAutoSaveOnFocusChange,
@@ -812,14 +816,15 @@ export abstract class TextFileService implements ITextFileService {
 		};
 	}
 
-	public get isHotExitEnabled(): boolean {
+	get isHotExitEnabled(): boolean {
 		return !this.environmentService.isExtensionDevelopment && this.configuredHotExit !== HotExitConfiguration.OFF;
 	}
 
-	public dispose(): void {
-		this.toUnbind = dispose(this.toUnbind);
+	dispose(): void {
 
 		// Clear all caches
 		this._models.clear();
+
+		super.dispose();
 	}
 }
diff --git a/src/vs/workbench/services/textfile/common/textfiles.ts b/src/vs/workbench/services/textfile/common/textfiles.ts
index 724acf9bda7..737fbaed9c4 100644
--- a/src/vs/workbench/services/textfile/common/textfiles.ts
+++ b/src/vs/workbench/services/textfile/common/textfiles.ts
@@ -80,11 +80,11 @@ export class TextFileModelChangeEvent {
 		this._kind = kind;
 	}
 
-	public get resource(): URI {
+	get resource(): URI {
 		return this._resource;
 	}
 
-	public get kind(): StateChange {
+	get kind(): StateChange {
 		return this._kind;
 	}
 }
@@ -147,9 +147,16 @@ export interface IModelLoadOrCreateOptions {
 	encoding?: string;
 
 	/**
-	 * Wether to reload the model if it already exists.
+	 * If the model was already loaded before, allows to trigger
+	 * a reload of it to fetch the latest contents:
+	 * - async: loadOrCreate() will return immediately and trigger
+	 * a reload that will run in the background.
+	 * - sync: loadOrCreate() will only return resolved when the
+	 * model has finished reloading.
 	 */
-	reload?: boolean;
+	reload?: {
+		async: boolean
+	};
 
 	/**
 	 * Allow to load a model even if we think it is a binary file.
@@ -321,10 +328,16 @@ export interface ITextFileService extends IDisposable {
 	 */
 	revertAll(resources?: URI[], options?: IRevertOptions): TPromise<ITextFileOperationResult>;
 
+	/**
+	 * Create a file. If the file exists it will be overwritten with the contents if
+	 * the options enable to overwrite.
+	 */
+	create(resource: URI, contents?: string, options?: { overwrite?: boolean }): TPromise<void>;
+
 	/**
 	 * Delete a file. If the file is dirty, it will get reverted and then deleted from disk.
 	 */
-	delete(resource: URI, useTrash?: boolean): TPromise<void>;
+	delete(resource: URI, options?: { useTrash?: boolean, recursive?: boolean }): TPromise<void>;
 
 	/**
 	 * Move a file. If the file is dirty, its contents will be preserved and restored.
diff --git a/src/vs/workbench/services/textfile/electron-browser/textFileService.ts b/src/vs/workbench/services/textfile/electron-browser/textFileService.ts
index 830c9d74042..b541f828c31 100644
--- a/src/vs/workbench/services/textfile/electron-browser/textFileService.ts
+++ b/src/vs/workbench/services/textfile/electron-browser/textFileService.ts
@@ -54,7 +54,7 @@ export class TextFileService extends AbstractTextFileService {
 		super(lifecycleService, contextService, configurationService, fileService, untitledEditorService, instantiationService, notificationService, environmentService, backupFileService, windowsService, historyService, contextKeyService, modelService);
 	}
 
-	public resolveTextContent(resource: URI, options?: IResolveContentOptions): TPromise<IRawTextContent> {
+	resolveTextContent(resource: URI, options?: IResolveContentOptions): TPromise<IRawTextContent> {
 		return this.fileService.resolveStreamContent(resource, options).then(streamContent => {
 			return createTextBufferFactoryFromStream(streamContent.value).then(res => {
 				const r: IRawTextContent = {
@@ -71,7 +71,7 @@ export class TextFileService extends AbstractTextFileService {
 		});
 	}
 
-	public confirmSave(resources?: URI[]): TPromise<ConfirmResult> {
+	confirmSave(resources?: URI[]): TPromise<ConfirmResult> {
 		if (this.environmentService.isExtensionDevelopment) {
 			return TPromise.wrap(ConfirmResult.DONT_SAVE); // no veto when we are in extension dev mode because we cannot assum we run interactive (e.g. tests)
 		}
@@ -102,7 +102,7 @@ export class TextFileService extends AbstractTextFileService {
 		});
 	}
 
-	public promptForPath(defaultPath: string): TPromise<string> {
+	promptForPath(defaultPath: string): TPromise<string> {
 		return this.windowService.showSaveDialog(this.getSaveDialogOptions(defaultPath));
 	}
 
diff --git a/src/vs/workbench/services/textfile/test/textFileEditorModelManager.test.ts b/src/vs/workbench/services/textfile/test/textFileEditorModelManager.test.ts
index b07a9c25b47..fee25713dd3 100644
--- a/src/vs/workbench/services/textfile/test/textFileEditorModelManager.test.ts
+++ b/src/vs/workbench/services/textfile/test/textFileEditorModelManager.test.ts
@@ -105,7 +105,7 @@ suite('Files - TextFileEditorModelManager', () => {
 		const resource = URI.file('/test.html');
 		const encoding = 'utf8';
 
-		return manager.loadOrCreate(resource, { encoding, reload: true }).then(model => {
+		return manager.loadOrCreate(resource, { encoding }).then(model => {
 			assert.ok(model);
 			assert.equal(model.getEncoding(), encoding);
 			assert.equal(manager.get(resource), model);
diff --git a/src/vs/workbench/services/textfile/test/textFileService.test.ts b/src/vs/workbench/services/textfile/test/textFileService.test.ts
index 216f1742075..310d0a93e44 100644
--- a/src/vs/workbench/services/textfile/test/textFileService.test.ts
+++ b/src/vs/workbench/services/textfile/test/textFileService.test.ts
@@ -5,10 +5,12 @@
 'use strict';
 
 import * as assert from 'assert';
+import * as sinon from 'sinon';
 import * as platform from 'vs/base/common/platform';
+import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ILifecycleService, ShutdownEvent, ShutdownReason } from 'vs/platform/lifecycle/common/lifecycle';
-import { workbenchInstantiationService, TestLifecycleService, TestTextFileService, TestWindowsService, TestContextService } from 'vs/workbench/test/workbenchTestServices';
+import { workbenchInstantiationService, TestLifecycleService, TestTextFileService, TestWindowsService, TestContextService, TestFileService } from 'vs/workbench/test/workbenchTestServices';
 import { toResource } from 'vs/base/test/common/utils';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IWindowsService } from 'vs/platform/windows/common/windows';
@@ -17,9 +19,12 @@ import { ITextFileService } from 'vs/workbench/services/textfile/common/textfile
 import { ConfirmResult } from 'vs/workbench/common/editor';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { UntitledEditorModel } from 'vs/workbench/common/editor/untitledEditorModel';
-import { HotExitConfiguration } from 'vs/platform/files/common/files';
+import { HotExitConfiguration, IFileService } from 'vs/platform/files/common/files';
 import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
 import { IWorkspaceContextService, Workspace } from 'vs/platform/workspace/common/workspace';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
+import { Schemas } from 'vs/base/common/network';
 
 class ServiceAccessor {
 	constructor(
@@ -27,7 +32,9 @@ class ServiceAccessor {
 		@ITextFileService public textFileService: TestTextFileService,
 		@IUntitledEditorService public untitledEditorService: IUntitledEditorService,
 		@IWindowsService public windowsService: TestWindowsService,
-		@IWorkspaceContextService public contextService: TestContextService
+		@IWorkspaceContextService public contextService: TestContextService,
+		@IModelService public modelService: ModelServiceImpl,
+		@IFileService public fileService: TestFileService
 	) {
 	}
 }
@@ -194,6 +201,34 @@ suite('Files - TextFileService', () => {
 		});
 	});
 
+	test('save - UNC path', function () {
+		const untitledUncUri = URI.from({ scheme: 'untitled', authority: 'server', path: '/share/path/file.txt' });
+		model = instantiationService.createInstance(TextFileEditorModel, untitledUncUri, 'utf8');
+		(<TextFileEditorModelManager>accessor.textFileService.models).add(model.getResource(), model);
+
+		const mockedFileUri = untitledUncUri.with({ scheme: Schemas.file });
+		const mockedEditorInput = instantiationService.createInstance(TextFileEditorModel, mockedFileUri, 'utf8');
+		const loadOrCreateStub = sinon.stub(accessor.textFileService.models, 'loadOrCreate', () => TPromise.wrap(mockedEditorInput));
+
+		sinon.stub(accessor.untitledEditorService, 'exists', () => true);
+		sinon.stub(accessor.untitledEditorService, 'hasAssociatedFilePath', () => true);
+		sinon.stub(accessor.modelService, 'updateModel', () => { });
+
+		return model.load().then(() => {
+			model.textEditorModel.setValue('foo');
+
+			return accessor.textFileService.saveAll(true).then(res => {
+				assert.ok(loadOrCreateStub.calledOnce);
+				assert.equal(res.results.length, 1);
+				assert.ok(res.results[0].success);
+
+				assert.equal(res.results[0].target.scheme, Schemas.file);
+				assert.equal(res.results[0].target.authority, untitledUncUri.authority);
+				assert.equal(res.results[0].target.path, untitledUncUri.path);
+			});
+		});
+	});
+
 	test('saveAll - file', function () {
 		model = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/file.txt'), 'utf8');
 		(<TextFileEditorModelManager>accessor.textFileService.models).add(model.getResource(), model);
diff --git a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
index c7617a56e68..792ade9778b 100644
--- a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
+++ b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
@@ -31,15 +31,16 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo
 		super();
 	}
 
-	public createReferencedObject(key: string): TPromise<ITextEditorModel> {
+	createReferencedObject(key: string): TPromise<ITextEditorModel> {
 		const resource = URI.parse(key);
 		if (this.fileService.canHandleResource(resource)) {
 			return this.textFileService.models.loadOrCreate(resource);
 		}
+
 		return this.resolveTextModelContent(key).then(() => this.instantiationService.createInstance(ResourceEditorModel, resource));
 	}
 
-	public destroyReferencedObject(modelPromise: TPromise<ITextEditorModel>): void {
+	destroyReferencedObject(modelPromise: TPromise<ITextEditorModel>): void {
 		modelPromise.done(model => {
 			if (model instanceof TextFileEditorModel) {
 				this.textFileService.models.disposeModel(model);
@@ -51,7 +52,7 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo
 		});
 	}
 
-	public registerTextModelContentProvider(scheme: string, provider: ITextModelContentProvider): IDisposable {
+	registerTextModelContentProvider(scheme: string, provider: ITextModelContentProvider): IDisposable {
 		const registry = this.providers;
 		const providers = registry[scheme] || (registry[scheme] = []);
 
@@ -108,21 +109,19 @@ export class TextModelResolverService implements ITextModelService {
 		this.resourceModelCollection = instantiationService.createInstance(ResourceModelCollection);
 	}
 
-	public createModelReference(resource: URI): TPromise<IReference<ITextEditorModel>> {
+	createModelReference(resource: URI): TPromise<IReference<ITextEditorModel>> {
 		return this._createModelReference(resource);
 	}
 
 	private _createModelReference(resource: URI): TPromise<IReference<ITextEditorModel>> {
 
 		// Untitled Schema: go through cached input
-		// TODO ImmortalReference is a hack
 		if (resource.scheme === network.Schemas.untitled) {
 			return this.untitledEditorService.loadOrCreate({ resource }).then(model => new ImmortalReference(model));
 		}
 
 		// InMemory Schema: go through model service cache
-		// TODO ImmortalReference is a hack
-		if (resource.scheme === 'inmemory') {
+		if (resource.scheme === network.Schemas.inMemory) {
 			const cachedModel = this.modelService.getModel(resource);
 
 			if (!cachedModel) {
@@ -144,7 +143,7 @@ export class TextModelResolverService implements ITextModelService {
 		);
 	}
 
-	public registerTextModelContentProvider(scheme: string, provider: ITextModelContentProvider): IDisposable {
+	registerTextModelContentProvider(scheme: string, provider: ITextModelContentProvider): IDisposable {
 		return this.resourceModelCollection.registerTextModelContentProvider(scheme, provider);
 	}
 }
diff --git a/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts b/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts
index 83b68a82c00..178765bc2cb 100644
--- a/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts
+++ b/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts
@@ -133,12 +133,12 @@ suite('Workbench - TextModelResolverService', () => {
 		let waitForIt = new TPromise(c => resolveModel = c);
 
 		const disposable = accessor.textModelResolverService.registerTextModelContentProvider('test', {
-			provideTextContent: async (resource: URI): TPromise<ITextModel> => {
-				await waitForIt;
-
-				let modelContent = 'Hello Test';
-				let mode = accessor.modeService.getOrCreateMode('json');
-				return accessor.modelService.createModel(modelContent, mode, resource);
+			provideTextContent: (resource: URI): TPromise<ITextModel> => {
+				return waitForIt.then(_ => {
+					let modelContent = 'Hello Test';
+					let mode = accessor.modeService.getOrCreateMode('json');
+					return accessor.modelService.createModel(modelContent, mode, resource);
+				});
 			}
 		});
 
diff --git a/src/vs/workbench/services/untitled/common/untitledEditorService.ts b/src/vs/workbench/services/untitled/common/untitledEditorService.ts
index b667bea963a..ecd539c8e66 100644
--- a/src/vs/workbench/services/untitled/common/untitledEditorService.ts
+++ b/src/vs/workbench/services/untitled/common/untitledEditorService.ts
@@ -15,6 +15,7 @@ import { ResourceMap } from 'vs/base/common/map';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { UntitledEditorModel } from 'vs/workbench/common/editor/untitledEditorModel';
 import { Schemas } from 'vs/base/common/network';
+import { Disposable } from 'vs/base/common/lifecycle';
 
 export const IUntitledEditorService = createDecorator<IUntitledEditorService>('untitledEditorService');
 
@@ -104,42 +105,30 @@ export interface IUntitledEditorService {
 	getEncoding(resource: URI): string;
 }
 
-export class UntitledEditorService implements IUntitledEditorService {
+export class UntitledEditorService extends Disposable implements IUntitledEditorService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private mapResourceToInput = new ResourceMap<UntitledEditorInput>();
 	private mapResourceToAssociatedFilePath = new ResourceMap<boolean>();
 
-	private readonly _onDidChangeContent: Emitter<URI>;
-	private readonly _onDidChangeDirty: Emitter<URI>;
-	private readonly _onDidChangeEncoding: Emitter<URI>;
-	private readonly _onDidDisposeModel: Emitter<URI>;
+	private readonly _onDidChangeContent: Emitter<URI> = this._register(new Emitter<URI>());
+	get onDidChangeContent(): Event<URI> { return this._onDidChangeContent.event; }
+
+	private readonly _onDidChangeDirty: Emitter<URI> = this._register(new Emitter<URI>());
+	get onDidChangeDirty(): Event<URI> { return this._onDidChangeDirty.event; }
+
+	private readonly _onDidChangeEncoding: Emitter<URI> = this._register(new Emitter<URI>());
+	get onDidChangeEncoding(): Event<URI> { return this._onDidChangeEncoding.event; }
+
+	private readonly _onDidDisposeModel: Emitter<URI> = this._register(new Emitter<URI>());
+	get onDidDisposeModel(): Event<URI> { return this._onDidDisposeModel.event; }
 
 	constructor(
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IConfigurationService private configurationService: IConfigurationService
 	) {
-		this._onDidChangeContent = new Emitter<URI>();
-		this._onDidChangeDirty = new Emitter<URI>();
-		this._onDidChangeEncoding = new Emitter<URI>();
-		this._onDidDisposeModel = new Emitter<URI>();
-	}
-
-	public get onDidDisposeModel(): Event<URI> {
-		return this._onDidDisposeModel.event;
-	}
-
-	public get onDidChangeContent(): Event<URI> {
-		return this._onDidChangeContent.event;
-	}
-
-	public get onDidChangeDirty(): Event<URI> {
-		return this._onDidChangeDirty.event;
-	}
-
-	public get onDidChangeEncoding(): Event<URI> {
-		return this._onDidChangeEncoding.event;
+		super();
 	}
 
 	protected get(resource: URI): UntitledEditorInput {
@@ -154,11 +143,11 @@ export class UntitledEditorService implements IUntitledEditorService {
 		return this.mapResourceToInput.values();
 	}
 
-	public exists(resource: URI): boolean {
+	exists(resource: URI): boolean {
 		return this.mapResourceToInput.has(resource);
 	}
 
-	public revertAll(resources?: URI[], force?: boolean): URI[] {
+	revertAll(resources?: URI[], force?: boolean): URI[] {
 		const reverted: URI[] = [];
 
 		const untitledInputs = this.getAll(resources);
@@ -174,13 +163,13 @@ export class UntitledEditorService implements IUntitledEditorService {
 		return reverted;
 	}
 
-	public isDirty(resource: URI): boolean {
+	isDirty(resource: URI): boolean {
 		const input = this.get(resource);
 
 		return input && input.isDirty();
 	}
 
-	public getDirty(resources?: URI[]): URI[] {
+	getDirty(resources?: URI[]): URI[] {
 		let inputs: UntitledEditorInput[];
 		if (resources) {
 			inputs = resources.map(r => this.get(r)).filter(i => !!i);
@@ -193,11 +182,11 @@ export class UntitledEditorService implements IUntitledEditorService {
 			.map(i => i.getResource());
 	}
 
-	public loadOrCreate(options: IModelLoadOrCreateOptions = Object.create(null)): TPromise<UntitledEditorModel> {
+	loadOrCreate(options: IModelLoadOrCreateOptions = Object.create(null)): TPromise<UntitledEditorModel> {
 		return this.createOrGet(options.resource, options.modeId, options.initialValue, options.encoding, options.useResourcePath).resolve();
 	}
 
-	public createOrGet(resource?: URI, modeId?: string, initialValue?: string, encoding?: string, hasAssociatedFilePath: boolean = false): UntitledEditorInput {
+	createOrGet(resource?: URI, modeId?: string, initialValue?: string, encoding?: string, hasAssociatedFilePath: boolean = false): UntitledEditorInput {
 
 		if (resource) {
 			// Massage resource if it comes with a file:// scheme
@@ -274,26 +263,19 @@ export class UntitledEditorService implements IUntitledEditorService {
 		return input;
 	}
 
-	public hasAssociatedFilePath(resource: URI): boolean {
+	hasAssociatedFilePath(resource: URI): boolean {
 		return this.mapResourceToAssociatedFilePath.has(resource);
 	}
 
-	public suggestFileName(resource: URI): string {
+	suggestFileName(resource: URI): string {
 		const input = this.get(resource);
 
 		return input ? input.suggestFileName() : void 0;
 	}
 
-	public getEncoding(resource: URI): string {
+	getEncoding(resource: URI): string {
 		const input = this.get(resource);
 
 		return input ? input.getEncoding() : void 0;
 	}
-
-	public dispose(): void {
-		this._onDidChangeContent.dispose();
-		this._onDidChangeDirty.dispose();
-		this._onDidChangeEncoding.dispose();
-		this._onDidDisposeModel.dispose();
-	}
 }
diff --git a/src/vs/workbench/services/viewlet/browser/viewletService.ts b/src/vs/workbench/services/viewlet/browser/viewletService.ts
index 354410b5820..979b3ca5f19 100644
--- a/src/vs/workbench/services/viewlet/browser/viewletService.ts
+++ b/src/vs/workbench/services/viewlet/browser/viewletService.ts
@@ -13,40 +13,41 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { ViewletDescriptor, ViewletRegistry, Extensions as ViewletExtensions } from 'vs/workbench/browser/viewlet';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { Disposable } from 'vs/base/common/lifecycle';
 
 const ActiveViewletContextId = 'activeViewlet';
 export const ActiveViewletContext = new RawContextKey<string>(ActiveViewletContextId, '');
 
-export class ViewletService implements IViewletService {
+export class ViewletService extends Disposable implements IViewletService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	private sidebarPart: SidebarPart;
 	private viewletRegistry: ViewletRegistry;
 
 	private activeViewletContextKey: IContextKey<string>;
 	private _onDidViewletEnable = new Emitter<{ id: string, enabled: boolean }>();
-	private disposables: IDisposable[] = [];
 
-	public get onDidViewletRegister(): Event<ViewletDescriptor> { return <Event<ViewletDescriptor>>this.viewletRegistry.onDidRegister; }
-	public get onDidViewletOpen(): Event<IViewlet> { return this.sidebarPart.onDidViewletOpen; }
-	public get onDidViewletClose(): Event<IViewlet> { return this.sidebarPart.onDidViewletClose; }
-	public get onDidViewletEnablementChange(): Event<{ id: string, enabled: boolean }> { return this._onDidViewletEnable.event; }
+	get onDidViewletRegister(): Event<ViewletDescriptor> { return <Event<ViewletDescriptor>>this.viewletRegistry.onDidRegister; }
+	get onDidViewletOpen(): Event<IViewlet> { return this.sidebarPart.onDidViewletOpen; }
+	get onDidViewletClose(): Event<IViewlet> { return this.sidebarPart.onDidViewletClose; }
+	get onDidViewletEnablementChange(): Event<{ id: string, enabled: boolean }> { return this._onDidViewletEnable.event; }
 
 	constructor(
 		sidebarPart: SidebarPart,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IExtensionService private extensionService: IExtensionService
 	) {
+		super();
+
 		this.sidebarPart = sidebarPart;
 		this.viewletRegistry = Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets);
 
 		this.activeViewletContextKey = ActiveViewletContext.bindTo(contextKeyService);
 
-		this.onDidViewletOpen(this._onDidViewletOpen, this, this.disposables);
-		this.onDidViewletClose(this._onDidViewletClose, this, this.disposables);
+		this._register(this.onDidViewletOpen(this._onDidViewletOpen, this));
+		this._register(this.onDidViewletClose(this._onDidViewletClose, this));
 	}
 
 	private _onDidViewletOpen(viewlet: IViewlet): void {
@@ -61,7 +62,7 @@ export class ViewletService implements IViewletService {
 		}
 	}
 
-	public setViewletEnablement(id: string, enabled: boolean): void {
+	setViewletEnablement(id: string, enabled: boolean): void {
 		const descriptor = this.getAllViewlets().filter(desc => desc.id === id).pop();
 		if (descriptor && descriptor.enabled !== enabled) {
 			descriptor.enabled = enabled;
@@ -69,7 +70,7 @@ export class ViewletService implements IViewletService {
 		}
 	}
 
-	public openViewlet(id: string, focus?: boolean): TPromise<IViewlet> {
+	openViewlet(id: string, focus?: boolean): TPromise<IViewlet> {
 		if (this.getViewlet(id)) {
 			return this.sidebarPart.openViewlet(id, focus);
 		}
@@ -82,11 +83,11 @@ export class ViewletService implements IViewletService {
 			});
 	}
 
-	public getActiveViewlet(): IViewlet {
+	getActiveViewlet(): IViewlet {
 		return this.sidebarPart.getActiveViewlet();
 	}
 
-	public getViewlets(): ViewletDescriptor[] {
+	getViewlets(): ViewletDescriptor[] {
 		return this.getAllViewlets()
 			.filter(v => v.enabled);
 	}
@@ -96,19 +97,15 @@ export class ViewletService implements IViewletService {
 			.sort((v1, v2) => v1.order - v2.order);
 	}
 
-	public getDefaultViewletId(): string {
+	getDefaultViewletId(): string {
 		return this.viewletRegistry.getDefaultViewletId();
 	}
 
-	public getViewlet(id: string): ViewletDescriptor {
+	getViewlet(id: string): ViewletDescriptor {
 		return this.getViewlets().filter(viewlet => viewlet.id === id)[0];
 	}
 
-	public getProgressIndicator(id: string): IProgressService {
+	getProgressIndicator(id: string): IProgressService {
 		return this.sidebarPart.getProgressIndicator(id);
 	}
-
-	dispose(): void {
-		this.disposables = dispose(this.disposables);
-	}
 }
diff --git a/src/vs/workbench/services/workspace/node/workspaceEditingService.ts b/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
index b9c500f1c5a..a8b690fc006 100644
--- a/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
+++ b/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
@@ -31,7 +31,7 @@ import { INotificationService, Severity } from 'vs/platform/notification/common/
 
 export class WorkspaceEditingService implements IWorkspaceEditingService {
 
-	public _serviceBrand: any;
+	_serviceBrand: any;
 
 	constructor(
 		@IJSONEditingService private jsonEditingService: IJSONEditingService,
@@ -46,7 +46,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 	) {
 	}
 
-	public updateFolders(index: number, deleteCount?: number, foldersToAdd?: IWorkspaceFolderCreationData[], donotNotifyError?: boolean): TPromise<void> {
+	updateFolders(index: number, deleteCount?: number, foldersToAdd?: IWorkspaceFolderCreationData[], donotNotifyError?: boolean): TPromise<void> {
 		const folders = this.contextService.getWorkspace().folders;
 
 		let foldersToDelete: URI[] = [];
@@ -96,7 +96,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 			.then(() => null, error => donotNotifyError ? TPromise.wrapError(error) : this.handleWorkspaceConfigurationEditingError(error));
 	}
 
-	public addFolders(foldersToAdd: IWorkspaceFolderCreationData[], donotNotifyError: boolean = false): TPromise<void> {
+	addFolders(foldersToAdd: IWorkspaceFolderCreationData[], donotNotifyError: boolean = false): TPromise<void> {
 		return this.doAddFolders(foldersToAdd, void 0, donotNotifyError);
 	}
 
@@ -122,7 +122,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 			.then(() => null, error => donotNotifyError ? TPromise.wrapError(error) : this.handleWorkspaceConfigurationEditingError(error));
 	}
 
-	public removeFolders(foldersToRemove: URI[], donotNotifyError: boolean = false): TPromise<void> {
+	removeFolders(foldersToRemove: URI[], donotNotifyError: boolean = false): TPromise<void> {
 
 		// If we are in single-folder state and the opened folder is to be removed,
 		// we create an empty workspace and enter it.
@@ -144,11 +144,11 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 		return false;
 	}
 
-	public createAndEnterWorkspace(folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<void> {
+	createAndEnterWorkspace(folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<void> {
 		return this.doEnterWorkspace(() => this.windowService.createAndEnterWorkspace(folders, path));
 	}
 
-	public saveAndEnterWorkspace(path: string): TPromise<void> {
+	saveAndEnterWorkspace(path: string): TPromise<void> {
 		return this.doEnterWorkspace(() => this.windowService.saveAndEnterWorkspace(path));
 	}
 
@@ -188,9 +188,11 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 
 		// Stop the extension host first to give extensions most time to shutdown
 		this.extensionService.stopExtensionHost();
+		let extensionHostStarted: boolean = false;
 
 		const startExtensionHost = () => {
 			this.extensionService.startExtensionHost();
+			extensionHostStarted = true;
 		};
 
 		return mainSidePromise().then(result => {
@@ -199,8 +201,6 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 			if (result) {
 				return this.migrate(result.workspace).then(() => {
 
-					// TODO@Ben TODO@Sandeep the following requires ugly casts and should probably have a service interface
-
 					// Reinitialize backup service
 					if (this.backupFileService instanceof BackupFileService) {
 						this.backupFileService.initialize(result.backupPath);
@@ -208,14 +208,15 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 
 					// Reinitialize configuration service
 					const workspaceImpl = this.contextService as WorkspaceService;
-					return workspaceImpl.initialize(result.workspace);
+					return workspaceImpl.initialize(result.workspace, startExtensionHost);
 				});
 			}
 
 			return TPromise.as(void 0);
-		}).then(startExtensionHost, error => {
-			startExtensionHost(); // in any case start the extension host again!
-
+		}).then(null, error => {
+			if (!extensionHostStarted) {
+				startExtensionHost(); // start the extension host if not started
+			}
 			return TPromise.wrapError(error);
 		});
 	}
@@ -241,7 +242,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 		storageImpl.setWorkspaceId(newWorkspaceId);
 	}
 
-	public copyWorkspaceSettings(toWorkspace: IWorkspaceIdentifier): TPromise<void> {
+	copyWorkspaceSettings(toWorkspace: IWorkspaceIdentifier): TPromise<void> {
 		const configurationProperties = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).getConfigurationProperties();
 		const targetWorkspaceConfiguration = {};
 		for (const key of this.workspaceConfigurationService.keys().workspace) {
diff --git a/src/vs/workbench/test/browser/parts/editor/baseEditor.test.ts b/src/vs/workbench/test/browser/parts/editor/baseEditor.test.ts
index 7cbde0bb8c9..fcb377a0c43 100644
--- a/src/vs/workbench/test/browser/parts/editor/baseEditor.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/baseEditor.test.ts
@@ -71,7 +71,7 @@ class MyInput extends EditorInput {
 		return '';
 	}
 
-	resolve(refresh?: boolean): any {
+	resolve(): any {
 		return null;
 	}
 }
@@ -81,7 +81,7 @@ class MyOtherInput extends EditorInput {
 		return '';
 	}
 
-	resolve(refresh?: boolean): any {
+	resolve(): any {
 		return null;
 	}
 }
diff --git a/src/vs/workbench/test/common/editor/editor.test.ts b/src/vs/workbench/test/common/editor/editor.test.ts
index 4e169cf7e1d..3fefb60de2d 100644
--- a/src/vs/workbench/test/common/editor/editor.test.ts
+++ b/src/vs/workbench/test/common/editor/editor.test.ts
@@ -35,7 +35,7 @@ class FileEditorInput extends EditorInput {
 		return this.resource;
 	}
 
-	resolve(refresh?: boolean): TPromise<IEditorModel> {
+	resolve(): TPromise<IEditorModel> {
 		return TPromise.as(null);
 	}
 }
diff --git a/src/vs/workbench/test/common/editor/editorDiffModel.test.ts b/src/vs/workbench/test/common/editor/editorDiffModel.test.ts
index b4ce15928a4..b8a7e0f3411 100644
--- a/src/vs/workbench/test/common/editor/editorDiffModel.test.ts
+++ b/src/vs/workbench/test/common/editor/editorDiffModel.test.ts
@@ -55,7 +55,7 @@ suite('Workbench editor model', () => {
 		let otherInput = instantiationService.createInstance(ResourceEditorInput, 'name2', 'description', URI.from({ scheme: 'test', authority: null, path: 'thePath' }));
 		let diffInput = new DiffEditorInput('name', 'description', input, otherInput);
 
-		return diffInput.resolve(true).then((model: any) => {
+		return diffInput.resolve().then((model: any) => {
 			assert(model);
 			assert(model instanceof TextDiffEditorModel);
 
@@ -63,7 +63,7 @@ suite('Workbench editor model', () => {
 			assert(diffEditorModel.original);
 			assert(diffEditorModel.modified);
 
-			return diffInput.resolve(true).then((model: any) => {
+			return diffInput.resolve().then((model: any) => {
 				assert(model.isResolved());
 
 				assert(diffEditorModel !== model.textDiffEditorModel);
diff --git a/src/vs/workbench/test/common/editor/editorInput.test.ts b/src/vs/workbench/test/common/editor/editorInput.test.ts
index b162d802d25..94eea4a8805 100644
--- a/src/vs/workbench/test/common/editor/editorInput.test.ts
+++ b/src/vs/workbench/test/common/editor/editorInput.test.ts
@@ -11,7 +11,7 @@ import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
 
 class MyEditorInput extends EditorInput {
 	getTypeId(): string { return ''; }
-	resolve(refresh?: boolean): any { return null; }
+	resolve(): any { return null; }
 }
 
 suite('Workbench editor input', () => {
diff --git a/src/vs/workbench/test/common/editor/editorModel.test.ts b/src/vs/workbench/test/common/editor/editorModel.test.ts
index b1f991b36fe..b591f56797f 100644
--- a/src/vs/workbench/test/common/editor/editorModel.test.ts
+++ b/src/vs/workbench/test/common/editor/editorModel.test.ts
@@ -24,6 +24,10 @@ class MyTextEditorModel extends BaseTextEditorModel {
 	public createTextEditorModel(value: ITextBufferFactory, resource?: URI, modeId?: string) {
 		return super.createTextEditorModel(value, resource, modeId);
 	}
+
+	isReadonly(): boolean {
+		return false;
+	}
 }
 
 suite('Workbench editor model', () => {
diff --git a/src/vs/workbench/test/common/editor/editorOptions.test.ts b/src/vs/workbench/test/common/editor/editorOptions.test.ts
index f5dd20c857f..345b58f4833 100644
--- a/src/vs/workbench/test/common/editor/editorOptions.test.ts
+++ b/src/vs/workbench/test/common/editor/editorOptions.test.ts
@@ -16,12 +16,12 @@ suite('Workbench editor options', () => {
 		assert(!options.preserveFocus);
 		options.preserveFocus = true;
 		assert(options.preserveFocus);
-		assert(!options.forceOpen);
-		options.forceOpen = true;
-		assert(options.forceOpen);
+		assert(!options.forceReload);
+		options.forceReload = true;
+		assert(options.forceReload);
 
 		options = new EditorOptions();
-		options.forceOpen = true;
+		options.forceReload = true;
 	});
 
 	test('TextEditorOptions', function () {
@@ -35,7 +35,7 @@ suite('Workbench editor options', () => {
 		otherOptions.selection(1, 1, 2, 2);
 
 		options = new TextEditorOptions();
-		options.forceOpen = true;
+		options.forceReload = true;
 		options.selection(1, 1, 2, 2);
 	});
 });
\ No newline at end of file
diff --git a/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts b/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
index 34528d0623d..ba37b81ff7d 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
@@ -332,6 +332,8 @@ suite('ExtHostLanguageFeatureCommands', function () {
 			return commands.executeCommand<vscode.SymbolInformation[]>('vscode.executeDocumentSymbolProvider', model.uri).then(values => {
 				assert.equal(values.length, 2);
 				let [first, second] = values;
+				assert.ok(first instanceof types.SymbolInformation);
+				assert.ok(second instanceof types.SymbolInformation);
 				assert.equal(first.name, 'testing2');
 				assert.equal(second.name, 'testing1');
 			});
diff --git a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
index f5479d67f9e..b9995cf46f8 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
@@ -46,6 +46,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { NullLogService } from 'vs/platform/log/common/log';
 import { ITextModel, EndOfLineSequence } from 'vs/editor/common/model';
 import { getColors } from 'vs/editor/contrib/colorPicker/color';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 const defaultSelector = { scheme: 'far' };
 const model: ITextModel = EditorModel.createFromString(
@@ -203,7 +204,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		return rpcProtocol.sync().then(() => {
-			return getCodeLensData(model).then(value => {
+			return getCodeLensData(model, CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 			});
 		});
@@ -224,7 +225,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return getCodeLensData(model).then(value => {
+			return getCodeLensData(model, CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let data = value[0];
 
@@ -248,7 +249,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return getCodeLensData(model).then(value => {
+			return getCodeLensData(model, CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 
 				let data = value[0];
@@ -490,7 +491,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return getOccurrencesAtPosition(model, new EditorPosition(1, 2)).then(value => {
+			return getOccurrencesAtPosition(model, new EditorPosition(1, 2), CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let [entry] = value;
 				assert.deepEqual(entry.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 5 });
@@ -514,7 +515,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return getOccurrencesAtPosition(model, new EditorPosition(1, 2)).then(value => {
+			return getOccurrencesAtPosition(model, new EditorPosition(1, 2), CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let [entry] = value;
 				assert.deepEqual(entry.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 5 });
@@ -538,7 +539,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return getOccurrencesAtPosition(model, new EditorPosition(1, 2)).then(value => {
+			return getOccurrencesAtPosition(model, new EditorPosition(1, 2), CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let [entry] = value;
 				assert.deepEqual(entry.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 3 });
@@ -563,7 +564,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return getOccurrencesAtPosition(model, new EditorPosition(1, 2)).then(value => {
+			return getOccurrencesAtPosition(model, new EditorPosition(1, 2), CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 			});
 		});
@@ -587,7 +588,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return provideReferences(model, new EditorPosition(1, 2)).then(value => {
+			return provideReferences(model, new EditorPosition(1, 2), CancellationToken.None).then(value => {
 				assert.equal(value.length, 2);
 
 				let [first, second] = value;
@@ -607,7 +608,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return provideReferences(model, new EditorPosition(1, 2)).then(value => {
+			return provideReferences(model, new EditorPosition(1, 2), CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 
 				let [item] = value;
@@ -633,7 +634,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return provideReferences(model, new EditorPosition(1, 2)).then(value => {
+			return provideReferences(model, new EditorPosition(1, 2), CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 			});
 
@@ -871,7 +872,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return provideSignatureHelp(model, new EditorPosition(1, 1)).then(value => {
+			return provideSignatureHelp(model, new EditorPosition(1, 1), CancellationToken.None).then(value => {
 				assert.ok(value);
 			});
 		});
@@ -886,7 +887,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		return rpcProtocol.sync().then(() => {
 
-			return provideSignatureHelp(model, new EditorPosition(1, 1)).then(value => {
+			return provideSignatureHelp(model, new EditorPosition(1, 1), CancellationToken.None).then(value => {
 				assert.equal(value, undefined);
 			});
 		});
@@ -1151,7 +1152,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		return rpcProtocol.sync().then(() => {
-			return getLinks(model).then(value => {
+			return getLinks(model, CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let [first] = value;
 
@@ -1176,7 +1177,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		return rpcProtocol.sync().then(() => {
-			return getLinks(model).then(value => {
+			return getLinks(model, CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let [first] = value;
 
@@ -1198,7 +1199,7 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 
 		return rpcProtocol.sync().then(() => {
-			return getColors(model).then(value => {
+			return getColors(model, CancellationToken.None).then(value => {
 				assert.equal(value.length, 1);
 				let [first] = value;
 
diff --git a/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts b/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
index b1b4ee95411..49d33da63b2 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
@@ -5,7 +5,6 @@
 'use strict';
 
 import * as assert from 'assert';
-import * as path from 'path';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
 import { dispose } from 'vs/base/common/lifecycle';
 import { joinPath } from 'vs/base/common/resources';
@@ -36,12 +35,12 @@ class MockMainThreadSearch implements MainThreadSearchShape {
 	$unregisterProvider(handle: number): void {
 	}
 
-	$handleFindMatch(handle: number, session: number, data: UriComponents | IRawFileMatch2[]): void {
-		if (Array.isArray(data)) {
-			this.results.push(...data);
-		} else {
-			this.results.push(data);
-		}
+	$handleFileMatch(handle: number, session: number, data: UriComponents[]): void {
+		this.results.push(...data);
+	}
+
+	$handleTextMatch(handle: number, session: number, data: IRawFileMatch2[]): void {
+		this.results.push(...data);
 	}
 
 	$handleTelemetry(eventName: string, data: any): void {
@@ -54,12 +53,12 @@ class MockMainThreadSearch implements MainThreadSearchShape {
 let mockExtfs: Partial<typeof extfs>;
 
 suite('ExtHostSearch', () => {
-	async function registerTestSearchProvider(provider: vscode.SearchProvider, scheme = 'file'): TPromise<void> {
+	async function registerTestSearchProvider(provider: vscode.SearchProvider, scheme = 'file'): Promise<void> {
 		disposables.push(extHostSearch.registerSearchProvider(scheme, provider));
 		await rpcProtocol.sync();
 	}
 
-	async function runFileSearch(query: IRawSearchQuery, cancel = false): TPromise<{ results: URI[]; stats: ISearchCompleteStats }> {
+	async function runFileSearch(query: IRawSearchQuery, cancel = false): Promise<{ results: URI[]; stats: ISearchCompleteStats }> {
 		let stats: ISearchCompleteStats;
 		try {
 			const p = extHostSearch.$provideFileSearchResults(mockMainThreadSearch.lastHandle, 0, query);
@@ -83,7 +82,7 @@ suite('ExtHostSearch', () => {
 		};
 	}
 
-	async function runTextSearch(pattern: IPatternInfo, query: IRawSearchQuery, cancel = false): TPromise<{ results: IFileMatch[], stats: ISearchCompleteStats }> {
+	async function runTextSearch(pattern: IPatternInfo, query: IRawSearchQuery, cancel = false): Promise<{ results: IFileMatch[], stats: ISearchCompleteStats }> {
 		let stats: ISearchCompleteStats;
 		try {
 			const p = extHostSearch.$provideTextSearchResults(mockMainThreadSearch.lastHandle, 0, pattern, query);
@@ -155,7 +154,7 @@ suite('ExtHostSearch', () => {
 
 		test('no results', async () => {
 			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
 					return TPromise.wrap(null);
 				}
 			});
@@ -173,8 +172,8 @@ suite('ExtHostSearch', () => {
 			];
 
 			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
-					reportedResults.forEach(r => progress.report(path.basename(r.fsPath)));
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
+					reportedResults.forEach(r => progress.report(r));
 					return TPromise.wrap(null);
 				}
 			});
@@ -188,11 +187,11 @@ suite('ExtHostSearch', () => {
 		test('Search canceled', async () => {
 			let cancelRequested = false;
 			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
 					return new TPromise((resolve, reject) => {
 						token.onCancellationRequested(() => {
 							cancelRequested = true;
-							progress.report('file1.ts');
+							progress.report(joinPath(options.folder, 'file1.ts'));
 
 							resolve(null); // or reject or nothing?
 						});
@@ -213,8 +212,11 @@ suite('ExtHostSearch', () => {
 			];
 
 			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
-					reportedResults.forEach(r => progress.report(r));
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
+					reportedResults
+						.map(relativePath => joinPath(options.folder, relativePath))
+						.forEach(r => progress.report(r));
+
 					throw new Error('I broke');
 				}
 			});
@@ -229,7 +231,7 @@ suite('ExtHostSearch', () => {
 
 		test('provider returns null', async () => {
 			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
 					return null;
 				}
 			});
@@ -244,7 +246,7 @@ suite('ExtHostSearch', () => {
 
 		test('all provider calls get global include/excludes', async () => {
 			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
 					assert(options.excludes.length === 2 && options.includes.length === 2, 'Missing global include/excludes');
 					return TPromise.wrap(null);
 				}
@@ -273,7 +275,7 @@ suite('ExtHostSearch', () => {
 
 		test('global/local include/excludes combined', async () => {
 			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
 					if (options.folder.toString() === rootFolderA.toString()) {
 						assert.deepEqual(options.includes.sort(), ['*.ts', 'foo']);
 						assert.deepEqual(options.excludes.sort(), ['*.js', 'bar']);
@@ -315,7 +317,7 @@ suite('ExtHostSearch', () => {
 
 		test('include/excludes resolved correctly', async () => {
 			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
 					assert.deepEqual(options.includes.sort(), ['*.jsx', '*.ts']);
 					assert.deepEqual(options.excludes.sort(), []);
 
@@ -358,8 +360,10 @@ suite('ExtHostSearch', () => {
 			];
 
 			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
-					reportedResults.forEach(r => progress.report(r));
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
+					reportedResults
+						.map(relativePath => joinPath(options.folder, relativePath))
+						.forEach(r => progress.report(r));
 					return TPromise.wrap(null);
 				}
 			});
@@ -389,20 +393,20 @@ suite('ExtHostSearch', () => {
 		test('multiroot sibling exclude clause', async () => {
 
 			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
-					let reportedResults;
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
+					let reportedResults: URI[];
 					if (options.folder.fsPath === rootFolderA.fsPath) {
 						reportedResults = [
 							'folder/fileA.scss',
 							'folder/fileA.css',
 							'folder/file2.css'
-						];
+						].map(relativePath => joinPath(rootFolderA, relativePath));
 					} else {
 						reportedResults = [
 							'fileB.ts',
 							'fileB.js',
 							'file3.js'
-						];
+						].map(relativePath => joinPath(rootFolderB, relativePath));
 					}
 
 					reportedResults.forEach(r => progress.report(r));
@@ -460,8 +464,9 @@ suite('ExtHostSearch', () => {
 
 			let wasCanceled = false;
 			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
-					reportedResults.forEach(r => progress.report(path.basename(r.fsPath)));
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
+					reportedResults
+						.forEach(r => progress.report(r));
 					token.onCancellationRequested(() => wasCanceled = true);
 
 					return TPromise.wrap(null);
@@ -497,8 +502,8 @@ suite('ExtHostSearch', () => {
 
 			let wasCanceled = false;
 			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
-					reportedResults.forEach(r => progress.report(path.basename(r.fsPath)));
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
+					reportedResults.forEach(r => progress.report(r));
 					token.onCancellationRequested(() => wasCanceled = true);
 
 					return TPromise.wrap(null);
@@ -533,8 +538,8 @@ suite('ExtHostSearch', () => {
 
 			let wasCanceled = false;
 			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
-					reportedResults.forEach(r => progress.report(path.basename(r.fsPath)));
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
+					reportedResults.forEach(r => progress.report(r));
 					token.onCancellationRequested(() => wasCanceled = true);
 
 					return TPromise.wrap(null);
@@ -564,7 +569,7 @@ suite('ExtHostSearch', () => {
 		test('multiroot max results', async () => {
 			let cancels = 0;
 			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
 					token.onCancellationRequested(() => cancels++);
 
 					// Provice results async so it has a chance to invoke every provider
@@ -574,9 +579,8 @@ suite('ExtHostSearch', () => {
 								'file1.ts',
 								'file2.ts',
 								'file3.ts',
-							].forEach(f => {
-								progress.report(f);
-							});
+							].map(relativePath => joinPath(options.folder, relativePath))
+								.forEach(r => progress.report(r));
 						});
 				}
 			});
@@ -610,8 +614,8 @@ suite('ExtHostSearch', () => {
 			];
 
 			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
-					reportedResults.forEach(r => progress.report(path.basename(r.fsPath)));
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
+					reportedResults.forEach(r => progress.report(r));
 					return TPromise.wrap(null);
 				}
 			});
@@ -642,8 +646,8 @@ suite('ExtHostSearch', () => {
 			];
 
 			await registerTestSearchProvider({
-				provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
-					reportedResults.forEach(r => progress.report(path.basename(r.fsPath)));
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
+					reportedResults.forEach(r => progress.report(r));
 					return TPromise.wrap(null);
 				}
 			}, fancyScheme);
@@ -662,27 +666,33 @@ suite('ExtHostSearch', () => {
 			compareURIs(results, reportedResults);
 		});
 
-		// Mock fs?
-		// test('Returns result for absolute path', async () => {
-		// 	const queriedFile = makeFileResult(rootFolderA, 'file2.ts');
-		// 	const reportedResults = [
-		// 		makeFileResult(rootFolderA, 'file1.ts'),
-		// 		queriedFile,
-		// 		makeFileResult(rootFolderA, 'file3.ts'),
-		// 	];
+		test('uses different cache keys for different folders', async () => {
+			const cacheKeys: string[] = [];
+			await registerTestSearchProvider({
+				provideFileSearchResults(query: vscode.FileSearchQuery, options: vscode.FileSearchOptions, progress: vscode.Progress<URI>, token: vscode.CancellationToken): Thenable<void> {
+					cacheKeys.push(query.cacheKey);
+					return TPromise.wrap(null);
+				}
+			});
 
-		// 	await registerTestSearchProvider({
-		// 		provideFileSearchResults(options: vscode.FileSearchOptions, progress: vscode.Progress<string>, token: vscode.CancellationToken): Thenable<void> {
-		// 			reportedResults.forEach(r => progress.report(r));
-		// 			return TPromise.wrap(null);
-		// 		}
-		// 	});
+			const query: ISearchQuery = {
+				type: QueryType.File,
+				filePattern: '',
+				cacheKey: 'cacheKey',
+				folderQueries: [
+					{
+						folder: rootFolderA
+					},
+					{
+						folder: rootFolderB
+					}
+				]
+			};
 
-		// 	const queriedFilePath = queriedFile.fsPath;
-		// 	const { results } = await runFileSearch(getSimpleQuery(queriedFilePath));
-		// 	assert.equal(results.length, 1);
-		// 	compareURIs(results, [queriedFile]);
-		// });
+			await runFileSearch(query);
+			assert.equal(cacheKeys.length, 2);
+			assert.notEqual(cacheKeys[0], cacheKeys[1]);
+		});
 	});
 
 	suite('Text:', () => {
@@ -694,11 +704,11 @@ suite('ExtHostSearch', () => {
 			};
 		}
 
-		function makeTextResult(relativePath: string): vscode.TextSearchResult {
+		function makeTextResult(baseFolder: URI, relativePath: string): vscode.TextSearchResult {
 			return {
 				preview: makePreview('foo'),
 				range: new Range(0, 0, 0, 3),
-				path: relativePath
+				uri: joinPath(baseFolder, relativePath)
 			};
 		}
 
@@ -718,17 +728,16 @@ suite('ExtHostSearch', () => {
 			};
 		}
 
-		function assertResults(actual: IFileMatch[], expected: vscode.TextSearchResult[], folder = rootFolderA) {
+		function assertResults(actual: IFileMatch[], expected: vscode.TextSearchResult[]) {
 			const actualTextSearchResults: vscode.TextSearchResult[] = [];
 			for (let fileMatch of actual) {
 				// Make relative
-				const relativePath = fileMatch.resource.toString().substr(folder.toString().length + 1);
 				for (let lineMatch of fileMatch.lineMatches) {
 					for (let [offset, length] of lineMatch.offsetAndLengths) {
 						actualTextSearchResults.push({
 							preview: { text: lineMatch.preview, match: null },
 							range: new Range(lineMatch.lineNumber, offset, lineMatch.lineNumber, length + offset),
-							path: relativePath
+							uri: fileMatch.resource
 						});
 					}
 				}
@@ -741,7 +750,7 @@ suite('ExtHostSearch', () => {
 				.map(r => ({
 					...r,
 					...{
-						uri: r.path.toString(),
+						uri: r.uri.toString(),
 						range: rangeToString(r.range),
 						preview: {
 							text: r.preview.text,
@@ -769,8 +778,8 @@ suite('ExtHostSearch', () => {
 
 		test('basic results', async () => {
 			const providedResults: vscode.TextSearchResult[] = [
-				makeTextResult('file1.ts'),
-				makeTextResult('file2.ts')
+				makeTextResult(rootFolderA, 'file1.ts'),
+				makeTextResult(rootFolderA, 'file2.ts')
 			];
 
 			await registerTestSearchProvider({
@@ -920,8 +929,8 @@ suite('ExtHostSearch', () => {
 			};
 
 			const providedResults: vscode.TextSearchResult[] = [
-				makeTextResult('file1.js'),
-				makeTextResult('file1.ts')
+				makeTextResult(rootFolderA, 'file1.js'),
+				makeTextResult(rootFolderA, 'file1.ts')
 			];
 
 			await registerTestSearchProvider({
@@ -973,15 +982,15 @@ suite('ExtHostSearch', () => {
 					let reportedResults;
 					if (options.folder.fsPath === rootFolderA.fsPath) {
 						reportedResults = [
-							makeTextResult('folder/fileA.scss'),
-							makeTextResult('folder/fileA.css'),
-							makeTextResult('folder/file2.css')
+							makeTextResult(rootFolderA, 'folder/fileA.scss'),
+							makeTextResult(rootFolderA, 'folder/fileA.css'),
+							makeTextResult(rootFolderA, 'folder/file2.css')
 						];
 					} else {
 						reportedResults = [
-							makeTextResult('fileB.ts'),
-							makeTextResult('fileB.js'),
-							makeTextResult('file3.js')
+							makeTextResult(rootFolderB, 'fileB.ts'),
+							makeTextResult(rootFolderB, 'fileB.js'),
+							makeTextResult(rootFolderB, 'file3.js')
 						];
 					}
 
@@ -1019,17 +1028,17 @@ suite('ExtHostSearch', () => {
 
 			const { results } = await runTextSearch(getPattern('foo'), query);
 			assertResults(results, [
-				makeTextResult('folder/fileA.scss'),
-				makeTextResult('folder/file2.css'),
-				makeTextResult('fileB.ts'),
-				makeTextResult('fileB.js'),
-				makeTextResult('file3.js')]);
+				makeTextResult(rootFolderA, 'folder/fileA.scss'),
+				makeTextResult(rootFolderA, 'folder/file2.css'),
+				makeTextResult(rootFolderB, 'fileB.ts'),
+				makeTextResult(rootFolderB, 'fileB.js'),
+				makeTextResult(rootFolderB, 'file3.js')]);
 		});
 
 		test('include pattern applied', async () => {
 			const providedResults: vscode.TextSearchResult[] = [
-				makeTextResult('file1.js'),
-				makeTextResult('file1.ts')
+				makeTextResult(rootFolderA, 'file1.js'),
+				makeTextResult(rootFolderA, 'file1.ts')
 			];
 
 			await registerTestSearchProvider({
@@ -1057,8 +1066,8 @@ suite('ExtHostSearch', () => {
 
 		test('max results = 1', async () => {
 			const providedResults: vscode.TextSearchResult[] = [
-				makeTextResult('file1.ts'),
-				makeTextResult('file2.ts')
+				makeTextResult(rootFolderA, 'file1.ts'),
+				makeTextResult(rootFolderA, 'file2.ts')
 			];
 
 			let wasCanceled = false;
@@ -1088,9 +1097,9 @@ suite('ExtHostSearch', () => {
 
 		test('max results = 2', async () => {
 			const providedResults: vscode.TextSearchResult[] = [
-				makeTextResult('file1.ts'),
-				makeTextResult('file2.ts'),
-				makeTextResult('file3.ts')
+				makeTextResult(rootFolderA, 'file1.ts'),
+				makeTextResult(rootFolderA, 'file2.ts'),
+				makeTextResult(rootFolderA, 'file3.ts')
 			];
 
 			let wasCanceled = false;
@@ -1120,8 +1129,8 @@ suite('ExtHostSearch', () => {
 
 		test('provider returns maxResults exactly', async () => {
 			const providedResults: vscode.TextSearchResult[] = [
-				makeTextResult('file1.ts'),
-				makeTextResult('file2.ts')
+				makeTextResult(rootFolderA, 'file1.ts'),
+				makeTextResult(rootFolderA, 'file2.ts')
 			];
 
 			let wasCanceled = false;
@@ -1160,7 +1169,7 @@ suite('ExtHostSearch', () => {
 								'file1.ts',
 								'file2.ts',
 								'file3.ts',
-							].forEach(f => progress.report(makeTextResult(f)));
+							].forEach(f => progress.report(makeTextResult(options.folder, f)));
 						});
 				}
 			});
@@ -1183,9 +1192,9 @@ suite('ExtHostSearch', () => {
 
 		test('works with non-file schemes', async () => {
 			const providedResults: vscode.TextSearchResult[] = [
-				makeTextResult('file1.ts'),
-				makeTextResult('file2.ts'),
-				makeTextResult('file3.ts')
+				makeTextResult(fancySchemeFolderA, 'file1.ts'),
+				makeTextResult(fancySchemeFolderA, 'file2.ts'),
+				makeTextResult(fancySchemeFolderA, 'file3.ts')
 			];
 
 			await registerTestSearchProvider({
@@ -1204,7 +1213,7 @@ suite('ExtHostSearch', () => {
 			};
 
 			const { results } = await runTextSearch(getPattern('foo'), query);
-			assertResults(results, providedResults, fancySchemeFolderA);
+			assertResults(results, providedResults);
 		});
 	});
 });
diff --git a/src/vs/workbench/test/electron-browser/api/extHostWorkspace.test.ts b/src/vs/workbench/test/electron-browser/api/extHostWorkspace.test.ts
index 5b03bd47a60..4568ce2703c 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostWorkspace.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostWorkspace.test.ts
@@ -528,9 +528,9 @@ suite('ExtHostWorkspace', function () {
 				assert.throws(() => {
 					(<any>e).added = [];
 				});
-				assert.throws(() => {
-					(<any>e.added)[0] = null;
-				});
+				// assert.throws(() => {
+				// 	(<any>e.added)[0] = null;
+				// });
 			} catch (error) {
 				finish(error);
 			}
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 9e79075d377..0589271ab33 100644
--- a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts
@@ -23,7 +23,6 @@ import { IModelService } from 'vs/editor/common/services/modelService';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { TestFileService, TestEditorService, TestEditorGroupsService, TestEnvironmentService, TestContextService } from 'vs/workbench/test/workbenchTestServices';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IFileStat } from 'vs/platform/files/common/files';
 import { ResourceTextEdit } from 'vs/editor/common/modes';
 import { BulkEditService } from 'vs/workbench/services/bulkEdit/electron-browser/bulkEditService';
 import { NullLogService } from 'vs/platform/log/common/log';
@@ -48,16 +47,14 @@ suite('MainThreadEditors', () => {
 		createdResources.clear();
 		deletedResources.clear();
 
-		const fileService = new class extends TestFileService {
-			async createFile(uri: URI): TPromise<IFileStat> {
-				createdResources.add(uri);
-				return createMockFileStat(uri);
-			}
-		};
-
+		const fileService = new TestFileService();
 
 		const textFileService = new class extends mock<ITextFileService>() {
 			isDirty() { return false; }
+			create(uri: URI, contents?: string, options?: any) {
+				createdResources.add(uri);
+				return TPromise.as(void 0);
+			}
 			delete(resource: URI) {
 				deletedResources.add(resource);
 				return TPromise.as(void 0);
@@ -75,7 +72,7 @@ suite('MainThreadEditors', () => {
 		const workbenchEditorService = new TestEditorService();
 		const editorGroupService = new TestEditorGroupsService();
 
-		const bulkEditService = new BulkEditService(new NullLogService(), modelService, new TestEditorService(), null, fileService, textFileService, TestEnvironmentService, new TestContextService());
+		const bulkEditService = new BulkEditService(new NullLogService(), modelService, new TestEditorService(), null, new TestFileService(), textFileService, TestEnvironmentService, new TestContextService());
 
 		const rpcProtocol = new TestRPCProtocol();
 		rpcProtocol.set(ExtHostContext.ExtHostDocuments, new class extends mock<ExtHostDocumentsShape>() {
@@ -132,7 +129,7 @@ suite('MainThreadEditors', () => {
 		});
 	});
 
-	test(`applyWorkspaceEdit with only resource edit`, () => {
+	test(`pasero applyWorkspaceEdit with only resource edit`, () => {
 		return editors.$tryApplyWorkspaceEdit({
 			edits: [
 				{ oldUri: resource, newUri: resource, options: undefined },
@@ -147,14 +144,3 @@ suite('MainThreadEditors', () => {
 		});
 	});
 });
-
-
-function createMockFileStat(target: URI): IFileStat {
-	return {
-		etag: '',
-		isDirectory: false,
-		name: target.path,
-		mtime: 0,
-		resource: target
-	};
-}
diff --git a/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts b/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts
index fe9c4ac96b0..1785ed41fd7 100644
--- a/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts
+++ b/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts
@@ -12,7 +12,6 @@ import { createSyncDescriptor } from 'vs/platform/instantiation/common/descripto
 import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
 import { ISearchService } from 'vs/platform/search/common/search';
 import { ITelemetryService, ITelemetryInfo } from 'vs/platform/telemetry/common/telemetry';
-import { IExperimentService, IExperiments } from 'vs/platform/telemetry/common/experiments';
 import { IUntitledEditorService, UntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import * as minimist from 'minimist';
@@ -68,11 +67,9 @@ suite.skip('QuickOpen performance (integration)', () => {
 		const testWorkspacePath = testWorkspaceArg ? path.resolve(testWorkspaceArg) : __dirname;
 
 		const telemetryService = new TestTelemetryService();
-		const experimentService = new TestExperimentService();
 		const configurationService = new TestConfigurationService();
 		const instantiationService = new InstantiationService(new ServiceCollection(
 			[ITelemetryService, telemetryService],
-			[IExperimentService, experimentService],
 			[IConfigurationService, configurationService],
 			[IModelService, new ModelServiceImpl(null, configurationService)],
 			[IWorkspaceContextService, new TestContextService(testWorkspace(URI.file(testWorkspacePath)))],
@@ -179,12 +176,3 @@ class TestTelemetryService implements ITelemetryService {
 		});
 	}
 }
-
-class TestExperimentService implements IExperimentService {
-
-	_serviceBrand: any;
-
-	getExperiments(): IExperiments {
-		return {};
-	}
-}
diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts
index 7348c180e15..9c15b408467 100644
--- a/src/vs/workbench/test/workbenchTestServices.ts
+++ b/src/vs/workbench/test/workbenchTestServices.ts
@@ -66,7 +66,7 @@ import { IExtensionService, ProfileSession, IExtensionsStatus, ExtensionPointCon
 import { IExtensionPoint } from 'vs/workbench/services/extensions/common/extensionsRegistry';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IDecorationsService, IResourceDecorationChangeEvent, IDecoration, IDecorationData, IDecorationsProvider } from 'vs/workbench/services/decorations/browser/decorations';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, toDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { IEditorGroupsService, IEditorGroup, GroupsOrder, GroupsArrangement, GroupDirection, IAddGroupOptions, IMergeGroupOptions, IMoveEditorOptions, ICopyEditorOptions, IEditorReplacement, IGroupChangeEvent, EditorsOrder, IFindGroupScope, EditorGroupLayout } from 'vs/workbench/services/group/common/editorGroupsService';
 import { IEditorService, IOpenEditorOverrideHandler } from 'vs/workbench/services/editor/common/editorService';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
@@ -286,7 +286,7 @@ export function workbenchInstantiationService(): IInstantiationService {
 export class TestDecorationsService implements IDecorationsService {
 	_serviceBrand: any;
 	onDidChangeDecorations: Event<IResourceDecorationChangeEvent> = Event.None;
-	registerDecorationsProvider(provider: IDecorationsProvider): IDisposable { return toDisposable(); }
+	registerDecorationsProvider(provider: IDecorationsProvider): IDisposable { return Disposable.None; }
 	getDecoration(uri: URI, includeChildren: boolean, overwrite?: IDecorationData): IDecoration { return void 0; }
 }
 
@@ -850,7 +850,7 @@ export class TestFileService implements IFileService {
 		return resource.scheme === 'file';
 	}
 
-	del(resource: URI, useTrash?: boolean): TPromise<void> {
+	del(resource: URI, options?: { useTrash?: boolean, recursive?: boolean }): TPromise<void> {
 		return TPromise.as(null);
 	}
 
@@ -1123,6 +1123,7 @@ export class TestWindowsService implements IWindowsService {
 	onWindowBlur: Event<number>;
 	onWindowMaximize: Event<number>;
 	onWindowUnmaximize: Event<number>;
+	onRecentlyOpenedChange: Event<void>;
 
 	isFocused(windowId: number): TPromise<boolean> {
 		return TPromise.as(false);
@@ -1316,6 +1317,10 @@ export class TestWindowsService implements IWindowsService {
 		return TPromise.as(void 0);
 	}
 
+	openAccessibilityOptions(): TPromise<void> {
+		return TPromise.as(void 0);
+	}
+
 	openAboutDialog(): TPromise<void> {
 		return TPromise.as(void 0);
 	}
diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts
index 4bb1eda080e..fa632fcf4f3 100644
--- a/src/vs/workbench/workbench.main.ts
+++ b/src/vs/workbench/workbench.main.ts
@@ -138,5 +138,8 @@ import 'vs/workbench/parts/welcome/overlay/browser/welcomeOverlay';
 
 import 'vs/workbench/parts/outline/electron-browser/outline.contribution';
 
+import 'vs/workbench/parts/navigation/common/navigation.contribution';
+
 // services
 import 'vs/workbench/services/bulkEdit/electron-browser/bulkEditService';
+import 'vs/workbench/parts/experiments/electron-browser/experiments.contribution';
\ No newline at end of file
diff --git a/test/smoke/src/areas/debug/debug.ts b/test/smoke/src/areas/debug/debug.ts
index 312d99ce0db..86cd1ec88ab 100644
--- a/test/smoke/src/areas/debug/debug.ts
+++ b/test/smoke/src/areas/debug/debug.ts
@@ -130,7 +130,7 @@ export class Debug extends Viewlet {
 		await this.code.waitForSetValue(REPL_FOCUSED, text);
 
 		// Wait for the keys to be picked up by the editor model such that repl evalutes what just got typed
-		await this.editor.waitForEditorContents('debug:input', s => s.indexOf(text) >= 0);
+		await this.editor.waitForEditorContents('debug:replinput', s => s.indexOf(text) >= 0);
 		await this.code.dispatchKeybinding('enter');
 		await this.code.waitForElement(CONSOLE_INPUT_OUTPUT);
 		await this.waitForOutput(output => accept(output[output.length - 1] || ''));
diff --git a/test/smoke/src/areas/extensions/extensions.ts b/test/smoke/src/areas/extensions/extensions.ts
index 199242f8f50..c904df46862 100644
--- a/test/smoke/src/areas/extensions/extensions.ts
+++ b/test/smoke/src/areas/extensions/extensions.ts
@@ -32,7 +32,8 @@ export class Extensions extends Viewlet {
 
 	async installExtension(name: string): Promise<void> {
 		await this.searchForExtension(name);
-		await this.code.waitAndClick(`div.extensions-viewlet[id="workbench.view.extensions"] .monaco-list-row[aria-label="${name}"] .extension li[class='action-item'] .extension-action.install`);
-		await this.code.waitForElement(`div.extensions-viewlet[id="workbench.view.extensions"] .monaco-list-row[aria-label="${name}"] .extension li[class='action-item'] .extension-action.reload`);
+		const ariaLabel = `${name}. Press enter for extension details.`;
+		await this.code.waitAndClick(`div.extensions-viewlet[id="workbench.view.extensions"] .monaco-list-row[aria-label="${ariaLabel}"] .extension li[class='action-item'] .extension-action.install`);
+		await this.code.waitForElement(`div.extensions-viewlet[id="workbench.view.extensions"] .monaco-list-row[aria-label="${ariaLabel}"] .extension li[class='action-item'] .extension-action.reload`);
 	}
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/workbench/localization.test.ts b/test/smoke/src/areas/workbench/localization.test.ts
index ea7a25bf8cf..dace3cc683e 100644
--- a/test/smoke/src/areas/workbench/localization.test.ts
+++ b/test/smoke/src/areas/workbench/localization.test.ts
@@ -14,6 +14,10 @@ export function setup() {
 				return;
 			}
 
+			const extensionName = 'German Language Pack for Visual Studio Code';
+			await app.workbench.extensions.openExtensionsViewlet();
+			await app.workbench.extensions.installExtension(extensionName);
+
 			await app.restart({ extraArgs: ['--locale=DE'] });
 		});
 
diff --git a/test/smoke/test/index.js b/test/smoke/test/index.js
index 69bb655de6e..71023e7e91f 100644
--- a/test/smoke/test/index.js
+++ b/test/smoke/test/index.js
@@ -5,13 +5,22 @@
 
 const path = require('path');
 const Mocha = require('mocha');
+const minimist = require('minimist');
 
 const suite = 'Smoke Tests';
 
+const [, , ...args] = process.argv;
+const opts = minimist(args, {
+	string: [
+		'f'
+	]
+});
+
 const options = {
 	useColors: true,
 	timeout: 60000,
-	slow: 30000
+	slow: 30000,
+	grep: opts['f']
 };
 
 if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
diff --git a/test/tree/package.json b/test/tree/package.json
new file mode 100644
index 00000000000..6826810e73e
--- /dev/null
+++ b/test/tree/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "tree",
+  "version": "1.0.0",
+  "main": "index.js",
+  "license": "MIT",
+  "dependencies": {
+    "koa": "^2.5.1",
+    "koa-mount": "^3.0.0",
+    "koa-route": "^3.2.0",
+    "koa-static": "^5.0.0",
+    "mz": "^2.7.0"
+  }
+}
diff --git a/test/tree/public/index.html b/test/tree/public/index.html
new file mode 100644
index 00000000000..f676b7a8753
--- /dev/null
+++ b/test/tree/public/index.html
@@ -0,0 +1,62 @@
+<html>
+
+<head>
+	<meta charset="utf-8">
+	<title>Tree</title>
+	<style>
+		#container {
+			width: 400;
+			height: 600;
+			border: 1px solid black;
+		}
+
+		.monaco-scrollable-element>.scrollbar>.slider {
+			background: rgba(100, 100, 100, .4);
+		}
+	</style>
+</head>
+
+<body>
+	<div id="container"></div>
+
+	<script src="/static/vs/loader.js"></script>
+	<script>
+		require.config({ baseUrl: '/static' });
+
+		require(['vs/base/browser/ui/tree/tree', 'vs/base/common/iterator'], ({ Tree }, { iter }) => {
+			const delegate = {
+				getHeight() { return 22; },
+				getTemplateId() { return 'template'; }
+			};
+
+			const renderer = {
+				templateId: 'template',
+				renderTemplate(container) { return container; },
+				renderElement(element, index, container) {
+					container.textContent = element;
+				},
+				disposeTemplate() { }
+			};
+
+			const tree = new Tree(container, delegate, [renderer]);
+
+			const xhr = new XMLHttpRequest();
+			xhr.open('GET', '/api/ls?path=');
+			xhr.send();
+			xhr.onreadystatechange = function () {
+				if (this.readyState == 4 && this.status == 200) {
+					const data = JSON.parse(this.responseText);
+
+					performance.mark('before splice');
+					const start = performance.now();
+					tree.splice([0], 0, [data]);
+					console.log('splice took', performance.now() - start);
+					performance.mark('after splice');
+
+				}
+			};
+		});
+	</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/test/tree/server.js b/test/tree/server.js
new file mode 100644
index 00000000000..2a931b51727
--- /dev/null
+++ b/test/tree/server.js
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const fs = require('mz/fs');
+const path = require('path');
+const Koa = require('koa');
+const _ = require('koa-route');
+const serve = require('koa-static');
+const mount = require('koa-mount');
+
+const app = new Koa();
+const root = path.dirname(path.dirname(__dirname));
+
+async function getTree(fsPath, level) {
+	const element = path.basename(fsPath);
+	const stat = await fs.stat(fsPath);
+
+	if (!stat.isDirectory() || element === '.git' || element === '.build' || level >= 3) {
+		return { element };
+	}
+
+	const childNames = await fs.readdir(fsPath);
+	const children = await Promise.all(childNames.map(async childName => await getTree(path.join(fsPath, childName), level + 1)));
+	return { element, collapsed: false, children };
+}
+
+app.use(serve('public'));
+app.use(mount('/static', serve('../../out')));
+app.use(_.get('/api/ls', async ctx => {
+	const relativePath = ctx.query.path;
+	const absolutePath = path.join(root, relativePath);
+
+	ctx.body = await getTree(absolutePath, 0);
+}))
+
+app.listen(3000);
+console.log('http://localhost:3000');
\ No newline at end of file
diff --git a/test/tree/yarn.lock b/test/tree/yarn.lock
new file mode 100644
index 00000000000..8ed55756e19
--- /dev/null
+++ b/test/tree/yarn.lock
@@ -0,0 +1,290 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+accepts@^1.2.2:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+  dependencies:
+    mime-types "~2.1.18"
+    negotiator "0.6.1"
+
+any-promise@^1.0.0, any-promise@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+
+content-disposition@~0.5.0:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
+
+content-type@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+
+cookies@~0.7.0:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.7.1.tgz#7c8a615f5481c61ab9f16c833731bcb8f663b99b"
+  dependencies:
+    depd "~1.1.1"
+    keygrip "~1.0.2"
+
+debug@*, debug@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
+debug@^2.6.1:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  dependencies:
+    ms "2.0.0"
+
+deep-equal@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+
+depd@^1.1.0, depd@~1.1.1, depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+
+destroy@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+
+error-inject@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/error-inject/-/error-inject-1.0.0.tgz#e2b3d91b54aed672f309d950d154850fa11d4f37"
+
+escape-html@~1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+
+fresh@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+
+http-assert@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.3.0.tgz#a31a5cf88c873ecbb5796907d4d6f132e8c01e4a"
+  dependencies:
+    deep-equal "~1.0.1"
+    http-errors "~1.6.1"
+
+http-errors@^1.2.8, http-errors@^1.6.3, http-errors@~1.6.1, http-errors@~1.6.2:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+is-generator-function@^1.0.3:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.7.tgz#d2132e529bb0000a7f80794d4bdf5cd5e5813522"
+
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+
+keygrip@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.0.2.tgz#ad3297c557069dea8bcfe7a4fa491b75c5ddeb91"
+
+koa-compose@^3.0.0, koa-compose@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-3.2.1.tgz#a85ccb40b7d986d8e5a345b3a1ace8eabcf54de7"
+  dependencies:
+    any-promise "^1.1.0"
+
+koa-compose@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-4.1.0.tgz#507306b9371901db41121c812e923d0d67d3e877"
+
+koa-convert@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/koa-convert/-/koa-convert-1.2.0.tgz#da40875df49de0539098d1700b50820cebcd21d0"
+  dependencies:
+    co "^4.6.0"
+    koa-compose "^3.0.0"
+
+koa-is-json@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/koa-is-json/-/koa-is-json-1.0.0.tgz#273c07edcdcb8df6a2c1ab7d59ee76491451ec14"
+
+koa-mount@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/koa-mount/-/koa-mount-3.0.0.tgz#08cab3b83d31442ed8b7e75c54b1abeb922ec197"
+  dependencies:
+    debug "^2.6.1"
+    koa-compose "^3.2.1"
+
+koa-route@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/koa-route/-/koa-route-3.2.0.tgz#76298b99a6bcfa9e38cab6fe5c79a8733e758bce"
+  dependencies:
+    debug "*"
+    methods "~1.1.0"
+    path-to-regexp "^1.2.0"
+
+koa-send@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/koa-send/-/koa-send-5.0.0.tgz#5e8441e07ef55737734d7ced25b842e50646e7eb"
+  dependencies:
+    debug "^3.1.0"
+    http-errors "^1.6.3"
+    mz "^2.7.0"
+    resolve-path "^1.4.0"
+
+koa-static@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/koa-static/-/koa-static-5.0.0.tgz#5e92fc96b537ad5219f425319c95b64772776943"
+  dependencies:
+    debug "^3.1.0"
+    koa-send "^5.0.0"
+
+koa@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/koa/-/koa-2.5.1.tgz#79f8b95f8d72d04fe9a58a8da5ebd6d341103f9c"
+  dependencies:
+    accepts "^1.2.2"
+    content-disposition "~0.5.0"
+    content-type "^1.0.0"
+    cookies "~0.7.0"
+    debug "*"
+    delegates "^1.0.0"
+    depd "^1.1.0"
+    destroy "^1.0.3"
+    error-inject "~1.0.0"
+    escape-html "~1.0.1"
+    fresh "^0.5.2"
+    http-assert "^1.1.0"
+    http-errors "^1.2.8"
+    is-generator-function "^1.0.3"
+    koa-compose "^4.0.0"
+    koa-convert "^1.2.0"
+    koa-is-json "^1.0.0"
+    mime-types "^2.0.7"
+    on-finished "^2.1.0"
+    only "0.0.2"
+    parseurl "^1.3.0"
+    statuses "^1.2.0"
+    type-is "^1.5.5"
+    vary "^1.0.0"
+
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+
+methods@~1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+
+mime-db@~1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
+
+mime-types@^2.0.7, mime-types@~2.1.18:
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
+  dependencies:
+    mime-db "~1.33.0"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
+mz@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
+  dependencies:
+    any-promise "^1.0.0"
+    object-assign "^4.0.1"
+    thenify-all "^1.0.0"
+
+negotiator@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+
+object-assign@^4.0.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
+on-finished@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  dependencies:
+    ee-first "1.1.1"
+
+only@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4"
+
+parseurl@^1.3.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
+
+path-is-absolute@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+path-to-regexp@^1.2.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
+  dependencies:
+    isarray "0.0.1"
+
+resolve-path@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
+  dependencies:
+    http-errors "~1.6.2"
+    path-is-absolute "1.0.1"
+
+setprototypeof@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+
+"statuses@>= 1.4.0 < 2", statuses@^1.2.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+
+thenify-all@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
+  dependencies:
+    thenify ">= 3.1.0 < 4"
+
+"thenify@>= 3.1.0 < 4":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839"
+  dependencies:
+    any-promise "^1.0.0"
+
+type-is@^1.5.5:
+  version "1.6.16"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.18"
+
+vary@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
diff --git a/yarn.lock b/yarn.lock
index 3c5efb1299a..1ac2e5486b8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3974,9 +3974,9 @@ node-abi@^2.2.0:
   dependencies:
     semver "^5.4.1"
 
-node-pty@0.7.5:
-  version "0.7.5"
-  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.7.5.tgz#dd7fa8df90a5bf7c5f5273ec5aeecabcbfbc921f"
+node-pty@0.7.6:
+  version "0.7.6"
+  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.7.6.tgz#bff6148c9c5836ca7e73c7aaaec067dcbdac2f7b"
   dependencies:
     nan "2.10.0"
 
@@ -5913,9 +5913,9 @@ typescript-formatter@7.1.0:
     commandpost "^1.0.0"
     editorconfig "^0.15.0"
 
-typescript@2.9.1:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
+typescript@2.9.2:
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
 
 typescript@^2.6.2:
   version "2.6.2"
@@ -6210,9 +6210,9 @@ vscode-chokidar@1.6.2:
   optionalDependencies:
     vscode-fsevents "0.3.8"
 
-vscode-debugprotocol@1.28.0:
-  version "1.28.0"
-  resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.28.0.tgz#b9fb97c3fb2dadbec78e5c1619ff12bf741ce406"
+vscode-debugprotocol@1.30.0:
+  version "1.30.0"
+  resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.30.0.tgz#ece6d8559733e87bc7a2147b385899777a92af69"
 
 vscode-fsevents@0.3.8:
   version "0.3.8"
@@ -6256,9 +6256,9 @@ vscode-textmate@^4.0.1:
   dependencies:
     oniguruma "^7.0.0"
 
-vscode-xterm@3.5.0-beta17:
-  version "3.5.0-beta17"
-  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.5.0-beta17.tgz#9a7dd13cdd9a45257aacb815501f71ed788c2e48"
+vscode-xterm@3.6.0-beta1:
+  version "3.6.0-beta1"
+  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.6.0-beta1.tgz#6ce8b79d33f7506ac3571d92c15f9d65e8b856ca"
 
 vso-node-api@^6.1.2-preview:
   version "6.1.2-preview"