diff --git a/build/builtInExtensions.json b/build/builtInExtensions.json
index f717be5d28d..e927280e32f 100644
--- a/build/builtInExtensions.json
+++ b/build/builtInExtensions.json
@@ -6,7 +6,7 @@
 	},
 	{
 		"name": "ms-vscode.node-debug2",
-		"version": "1.26.7",
+		"version": "1.26.8",
 		"repo": "https://github.com/Microsoft/vscode-node-debug2"
 	}
 ]
diff --git a/build/win32/code.iss b/build/win32/code.iss
index cad2e27d65e..baca2f28cbd 100644
--- a/build/win32/code.iss
+++ b/build/win32/code.iss
@@ -975,7 +975,7 @@ 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
+        if MsgBox('{#NameShort} is already installed on this system for all users. Note that both versions will be installed simultaneously; you might want to first uninstall the system-wide installation. Are you sure you want to continue?', mbConfirmation, MB_YESNO) = IDNO then begin
           Result := false;
         end;
       end;
diff --git a/extensions/debug-auto-launch/src/autoAttach.ts b/extensions/debug-auto-launch/src/autoAttach.ts
deleted file mode 100644
index a6bb925ef4f..00000000000
--- a/extensions/debug-auto-launch/src/autoAttach.ts
+++ /dev/null
@@ -1,24 +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 * as vscode from 'vscode';
-import * as nls from 'vscode-nls';
-import { basename } from 'path';
-import { pollProcesses, attachToProcess } from './nodeProcessTree';
-
-const localize = nls.loadMessageBundle();
-
-export function startAutoAttach(rootPid: number): vscode.Disposable {
-
-	return pollProcesses(rootPid, true, (pid, cmdPath, args) => {
-		const cmdName = basename(cmdPath, '.exe');
-		if (cmdName === 'node') {
-			const name = localize('process.with.pid.label', "Process {0}", pid);
-			attachToProcess(undefined, name, pid, args);
-		}
-	});
-}
diff --git a/extensions/debug-auto-launch/src/nodeProcessTree.ts b/extensions/debug-auto-launch/src/nodeProcessTree.ts
index d803ddd1bcd..1a62971bc30 100644
--- a/extensions/debug-auto-launch/src/nodeProcessTree.ts
+++ b/extensions/debug-auto-launch/src/nodeProcessTree.ts
@@ -95,10 +95,10 @@ export function attachToProcess(folder: vscode.WorkspaceFolder | undefined, name
 
 function findChildProcesses(rootPid: number, inTerminal: boolean, cb: (pid: number, cmd: string, args: string) => void): Promise<void> {
 
-	function walker(node: ProcessTreeNode, terminal: boolean, renderer: number) {
+	function walker(node: ProcessTreeNode, terminal: boolean, terminalPids: number[]) {
 
-		if ((node.args.indexOf('--type=terminal') >= 0 || node.command.indexOf('\\winpty-agent.exe') >= 0) && (renderer === 0 || node.ppid === renderer)) {
-			terminal = true;
+		if (terminalPids.indexOf(node.pid) >= 0) {
+			terminal = true;	// found the terminal shell
 		}
 
 		let { protocol } = analyseArguments(node.args);
@@ -107,32 +107,17 @@ function findChildProcesses(rootPid: number, inTerminal: boolean, cb: (pid: numb
 		}
 
 		for (const child of node.children || []) {
-			walker(child, terminal, renderer);
+			walker(child, terminal, terminalPids);
 		}
 	}
 
-	function finder(node: ProcessTreeNode, pid: number): ProcessTreeNode | undefined {
-		if (node.pid === pid) {
-			return node;
-		}
-		for (const child of node.children || []) {
-			const p = finder(child, pid);
-			if (p) {
-				return p;
-			}
-		}
-		return undefined;
-	}
-
 	return getProcessTree(rootPid).then(tree => {
 		if (tree) {
-
-			// find the pid of the renderer process
-			const extensionHost = finder(tree, process.pid);
-			let rendererPid = extensionHost ? extensionHost.ppid : 0;
-
-			for (const child of tree.children || []) {
-				walker(child, !inTerminal, rendererPid);
+			const terminals = vscode.window.terminals;
+			if (terminals.length > 0) {
+				Promise.all(terminals.map(terminal => terminal.processId)).then(terminalPids => {
+					walker(tree, !inTerminal, terminalPids);
+				});
 			}
 		}
 	});
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
index dc335771b90..2224d3a718c 100644
--- a/extensions/git/package.nls.json
+++ b/extensions/git/package.nls.json
@@ -51,8 +51,8 @@
 	"command.stashPop": "Pop Stash...",
 	"command.stashPopLatest": "Pop Latest Stash",
 	"config.enabled": "Whether git is enabled.",
-	"config.path": "Path to the git executable.",
-	"config.autoRepositoryDetection": "Configures when repositories should be automatically detected.",
+	"config.path": "Path and filename of the git executable, e.g. `C:\\Program Files\\Git\\bin\\git.exe` (Windows).",
+	"config.autoRepositoryDetection": "Configures when repositories should be automatically detected. `subFolders` will scan for subfolders of the currently opened folder. `openEditors` will scan for parent folders of open files. `true` will scan in all cases. `false` will disable scanning.",
 	"config.autorefresh": "Whether auto refreshing is enabled.",
 	"config.autofetch": "Whether auto fetching is enabled.",
 	"config.enableLongCommitWarning": "Whether long commit messages should be warned about.",
diff --git a/package.json b/package.json
index 6a66667a271..f13936cd4e8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.27.0",
-  "distro": "3962f36fb9f758cc0c608d0c585d50a1f204de3a",
+  "distro": "73cb7173636931afba8d741be343ceafb11a177e",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -50,7 +50,8 @@
     "vscode-nsfw": "1.0.17",
     "vscode-ripgrep": "^1.0.1",
     "vscode-textmate": "^4.0.1",
-    "vscode-xterm": "3.6.0-beta13",
+    "vscode-xterm": "3.7.0-beta2",
+    "winreg": "^1.2.4",
     "yauzl": "^2.9.1"
   },
   "devDependencies": {
diff --git a/src/typings/vscode-xterm.d.ts b/src/typings/vscode-xterm.d.ts
index b3a6c367c60..5f1e27de082 100644
--- a/src/typings/vscode-xterm.d.ts
+++ b/src/typings/vscode-xterm.d.ts
@@ -692,7 +692,7 @@ declare module 'vscode-xterm' {
 			translateBufferLineToString(lineIndex: number, trimRight: boolean): string;
 		};
 
-		send(text: string): void;
+		handler(text: string): void;
 
 		/**
 		 * Emit an event on the terminal.
diff --git a/src/typings/winreg.d.ts b/src/typings/winreg.d.ts
new file mode 100644
index 00000000000..70047d8b50f
--- /dev/null
+++ b/src/typings/winreg.d.ts
@@ -0,0 +1,338 @@
+// Type definitions for Winreg v1.2.0
+// Project: http://fresc81.github.io/node-winreg/
+// Definitions by: RX14 <https://github.com/RX14>, BobBuehler <https://github.com/BobBuehler>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var Winreg: WinregStatic;
+
+interface WinregStatic {
+    /**
+     * Creates a registry object, which provides access to a single registry key.
+     * Note: This class is returned by a call to ```require('winreg')```.
+     *
+     * @public
+     * @class
+     *
+     * @param {@link Options} options - the options
+     *
+     * @example
+     * var Registry = require('winreg')
+     * ,   autoStartCurrentUser = new Registry({
+     *       hive: Registry.HKCU,
+     *       key:  '\\Software\\Microsoft\\Windows\\CurrentVersion\\Run'
+     *     });
+     */
+    new (options: Winreg.Options): Winreg.Registry;
+
+    /**
+     * Registry hive key HKEY_LOCAL_MACHINE.
+     * Note: For writing to this hive your program has to run with admin privileges.
+     */
+    HKLM: string;
+
+    /**
+     * Registry hive key HKEY_CURRENT_USER.
+     */
+    HKCU: string;
+
+    /**
+     * Registry hive key HKEY_CLASSES_ROOT.
+     * Note: For writing to this hive your program has to run with admin privileges.
+     */
+    HKCR: string;
+
+    /**
+     * Registry hive key HKEY_USERS.
+     * Note: For writing to this hive your program has to run with admin privileges.
+     */
+    HKU: string;
+
+    /**
+     * Registry hive key HKEY_CURRENT_CONFIG.
+     * Note: For writing to this hive your program has to run with admin privileges.
+     */
+    HKCC: string;
+
+    /**
+     * Collection of available registry hive keys.
+     */
+    HIVES: Array<string>;
+
+    /**
+     * Registry value type STRING.
+     *
+     * Values of this type contain a string.
+     */
+    REG_SZ: string;
+
+    /**
+     * Registry value type MULTILINE_STRING.
+     *
+     * Values of this type contain a multiline string.
+     */
+    REG_MULTI_SZ: string;
+
+    /**
+     * Registry value type EXPANDABLE_STRING.
+     *
+     * Values of this type contain an expandable string.
+     */
+    REG_EXPAND_SZ: string;
+
+    /**
+     * Registry value type DOUBLE_WORD.
+     *
+     * Values of this type contain a double word (32 bit integer).
+     */
+    REG_DWORD: string;
+
+    /**
+     * Registry value type QUAD_WORD.
+     *
+     * Values of this type contain a quad word (64 bit integer).
+     */
+    REG_QWORD: string;
+
+    /**
+     * Registry value type BINARY.
+     *
+     * Values of this type contain a binary value.
+     */
+    REG_BINARY: string;
+
+    /**
+     * Registry value type UNKNOWN.
+     *
+     * Values of this type contain a value of an unknown type.
+     */
+    REG_NONE: string;
+
+    /**
+     * Collection of available registry value types.
+     */
+    REG_TYPES: Array<string>;
+
+    /**
+     * The name of the default value. May be used instead of the empty string literal for better readability.
+     */
+    DEFAULT_VALUE: string;
+}
+
+declare namespace Winreg {
+    export interface Options {
+        /**
+         * Optional hostname, must start with '\\' sequence.
+         */
+        host?: string;
+
+        /**
+         * Optional hive ID, default is HKLM.
+         */
+        hive?: string;
+
+        /**
+         * Optional key, default is the root key.
+         */
+        key?: string;
+
+        /**
+         * Optional registry hive architecture ('x86' or 'x64'; only valid on Windows 64 Bit Operating Systems).
+         */
+        arch?: string;
+    }
+
+    /**
+     * A registry object, which provides access to a single registry key.
+     */
+    export interface Registry {
+        /**
+         * The hostname.
+         * @readonly
+         */
+        host: string;
+
+        /**
+         * The hive id.
+         * @readonly
+         */
+        hive: string;
+
+        /**
+         * The registry key name.
+         * @readonly
+         */
+        key: string;
+
+        /**
+         * The full path to the registry key.
+         * @readonly
+         */
+        path: string;
+
+        /**
+         * The registry hive architecture ('x86' or 'x64').
+         * @readonly
+         */
+        arch: string;
+
+        /**
+         * Creates a new {@link Registry} instance that points to the parent registry key.
+         * @readonly
+         */
+        parent: Registry;
+
+        /**
+         * Retrieve all values from this registry key.
+         * @param {valuesCallback} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @param {array=} cb.items - an array of {@link RegistryItem} objects
+         * @returns {Registry} this registry key object
+         */
+        values(cb: (err: Error, result: Array<Winreg.RegistryItem>) => void): Registry;
+
+        /**
+         * Retrieve all subkeys from this registry key.
+         * @param {function (err, items)} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @param {array=} cb.items - an array of {@link Registry} objects
+         * @returns {Registry} this registry key object
+         */
+        keys(cb: (err: Error, result: Array<Registry>) => void): Registry;
+
+        /**
+         * Gets a named value from this registry key.
+         * @param {string} name - the value name, use {@link Registry.DEFAULT_VALUE} or an empty string for the default value
+         * @param {function (err, item)} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @param {RegistryItem=} cb.item - the retrieved registry item
+         * @returns {Registry} this registry key object
+         */
+        get(name: string, cb: (err: Error, result: Winreg.RegistryItem) => void): Registry;
+
+        /**
+         * Sets a named value in this registry key, overwriting an already existing value.
+         * @param {string} name - the value name, use {@link Registry.DEFAULT_VALUE} or an empty string for the default value
+         * @param {string} type - the value type
+         * @param {string} value - the value
+         * @param {function (err)} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @returns {Registry} this registry key object
+         */
+        set(name: string, type: string, value: string, cb: (err: Error) => void): Registry;
+
+        /**
+         * Remove a named value from this registry key. If name is empty, sets the default value of this key.
+         * Note: This key must be already existing.
+         * @param {string} name - the value name, use {@link Registry.DEFAULT_VALUE} or an empty string for the default value
+         * @param {function (err)} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @returns {Registry} this registry key object
+         */
+        remove(name: string, cb: (err: Error) => void): Registry;
+
+        /**
+         * Remove all subkeys and values (including the default value) from this registry key.
+         * @param {function (err)} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @returns {Registry} this registry key object
+         */
+        clear(cb: (err: Error) => void): Registry;
+
+        /**
+         * Alias for the clear method to keep it backward compatible.
+         * @method
+         * @deprecated Use {@link Registry#clear} or {@link Registry#destroy} in favour of this method.
+         * @param {function (err)} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @returns {Registry} this registry key object
+         */
+        erase(cb: (err: Error) => void): Registry;
+
+        /**
+         * Delete this key and all subkeys from the registry.
+         * @param {function (err)} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @returns {Registry} this registry key object
+         */
+        destroy(cb: (err: Error) => void): Registry;
+
+        /**
+         * Create this registry key. Note that this is a no-op if the key already exists.
+         * @param {function (err)} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @returns {Registry} this registry key object
+         */
+        create(cb: (err: Error) => void): Registry;
+
+        /**
+         * Checks if this key already exists.
+         * @param {function (err, exists)} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @param {boolean=} cb.exists - true if a registry key with this name already exists
+         * @returns {Registry} this registry key object
+         */
+        keyExists(cb: (err: Error, exists: boolean) => void): Registry;
+
+        /**
+         * Checks if a value with the given name already exists within this key.
+         * @param {string} name - the value name, use {@link Registry.DEFAULT_VALUE} or an empty string for the default value
+         * @param {function (err, exists)} cb - callback function
+         * @param {error=} cb.err - error object or null if successful
+         * @param {boolean=} cb.exists - true if a value with the given name was found in this key
+         * @returns {Registry} this registry key object
+         */
+        valueExists(name: string, cb: (err: Error, exists: boolean) => void): Registry;
+    }
+
+    /**
+     * A single registry value record.
+     * Objects of this type are created internally and returned by methods of {@link Registry} objects.
+     */
+    export interface RegistryItem {
+        /**
+         * The hostname.
+         * @readonly
+         */
+        host: string;
+
+        /**
+         * The hive id.
+         * @readonly
+         */
+        hive: string;
+
+        /**
+         * The registry key.
+         * @readonly
+         */
+        key: string;
+
+        /**
+         * The value name.
+         * @readonly
+         */
+        name: string;
+
+        /**
+         * The value type.
+         * @readonly
+         */
+        type: string;
+
+        /**
+         * The value.
+         * @readonly
+         */
+        value: string;
+
+        /**
+         * The hive architecture.
+         * @readonly
+         */
+        arch: string;
+    }
+}
+
+declare module "winreg" {
+    export = Winreg;
+}
\ No newline at end of file
diff --git a/src/vs/base/common/amd.ts b/src/vs/base/common/amd.ts
new file mode 100644
index 00000000000..45e45a7bbe2
--- /dev/null
+++ b/src/vs/base/common/amd.ts
@@ -0,0 +1,12 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 URI from 'vs/base/common/uri';
+
+export function getPathFromAmdModule(requirefn: typeof require, relativePath: string): string {
+	return URI.parse(requirefn.toUrl(relativePath)).fsPath;
+}
diff --git a/src/vs/base/common/resources.ts b/src/vs/base/common/resources.ts
index c09f6334b7f..4afd24287ba 100644
--- a/src/vs/base/common/resources.ts
+++ b/src/vs/base/common/resources.ts
@@ -5,26 +5,26 @@
 'use strict';
 
 import * as paths from 'vs/base/common/paths';
-import uri from 'vs/base/common/uri';
+import URI from 'vs/base/common/uri';
 import { equalsIgnoreCase } from 'vs/base/common/strings';
 import { Schemas } from 'vs/base/common/network';
 import { isLinux } from 'vs/base/common/platform';
 
-export function getComparisonKey(resource: uri): string {
+export function getComparisonKey(resource: URI): string {
 	return hasToIgnoreCase(resource) ? resource.toString().toLowerCase() : resource.toString();
 }
 
-export function hasToIgnoreCase(resource: uri): boolean {
+export function hasToIgnoreCase(resource: URI): boolean {
 	// A file scheme resource is in the same platform as code, so ignore case for non linux platforms
 	// Resource can be from another platform. Lowering the case as an hack. Should come from File system provider
 	return resource.scheme === Schemas.file ? !isLinux : true;
 }
 
-export function basenameOrAuthority(resource: uri): string {
+export function basenameOrAuthority(resource: URI): string {
 	return paths.basename(resource.path) || resource.authority;
 }
 
-export function isEqualOrParent(resource: uri, candidate: uri, ignoreCase?: boolean): boolean {
+export function isEqualOrParent(resource: URI, candidate: URI, ignoreCase?: boolean): boolean {
 	if (resource.scheme === candidate.scheme && resource.authority === candidate.authority) {
 		if (resource.scheme === 'file') {
 			return paths.isEqualOrParent(resource.fsPath, candidate.fsPath, ignoreCase);
@@ -36,7 +36,7 @@ export function isEqualOrParent(resource: uri, candidate: uri, ignoreCase?: bool
 	return false;
 }
 
-export function isEqual(first: uri, second: uri, ignoreCase?: boolean): boolean {
+export function isEqual(first: URI, second: URI, ignoreCase?: boolean): boolean {
 	const identityEquals = (first === second);
 	if (identityEquals) {
 		return true;
@@ -53,7 +53,7 @@ export function isEqual(first: uri, second: uri, ignoreCase?: boolean): boolean
 	return first.toString() === second.toString();
 }
 
-export function dirname(resource: uri): uri {
+export function dirname(resource: URI): URI {
 	const dirname = paths.dirname(resource.path);
 	if (resource.authority && dirname && !paths.isAbsolute(dirname)) {
 		return null; // If a URI contains an authority component, then the path component must either be empty or begin with a slash ("/") character
@@ -64,14 +64,14 @@ export function dirname(resource: uri): uri {
 	});
 }
 
-export function joinPath(resource: uri, pathFragment: string): uri {
+export function joinPath(resource: URI, pathFragment: string): URI {
 	const joinedPath = paths.join(resource.path || '/', pathFragment);
 	return resource.with({
 		path: joinedPath
 	});
 }
 
-export function distinctParents<T>(items: T[], resourceAccessor: (item: T) => uri): T[] {
+export function distinctParents<T>(items: T[], resourceAccessor: (item: T) => URI): T[] {
 	const distinctParents: T[] = [];
 	for (let i = 0; i < items.length; i++) {
 		const candidateResource = resourceAccessor(items[i]);
diff --git a/src/vs/base/common/uri.ts b/src/vs/base/common/uri.ts
index 412efc17388..7ead50439d3 100644
--- a/src/vs/base/common/uri.ts
+++ b/src/vs/base/common/uri.ts
@@ -12,6 +12,12 @@ const _singleSlashStart = /^\//;
 const _doubleSlashStart = /^\/\//;
 
 function _validateUri(ret: URI): void {
+
+	// // scheme, must be set
+	// if (!ret.scheme) {
+	// 	throw new Error('[UriError]: Scheme is missing.');
+	// }
+
 	// scheme, https://tools.ietf.org/html/rfc3986#section-3.1
 	// ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
 	if (ret.scheme && !_schemePattern.test(ret.scheme)) {
diff --git a/src/vs/base/node/paths.ts b/src/vs/base/node/paths.ts
index dfdc28def8a..66930cdaf4b 100644
--- a/src/vs/base/node/paths.ts
+++ b/src/vs/base/node/paths.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import uri from 'vs/base/common/uri';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 interface IPaths {
 	getAppDataPath(platform: string): string;
 	getDefaultUserDataPath(platform: string): string;
 }
 
-const pathsPath = uri.parse(require.toUrl('paths')).fsPath;
+const pathsPath = getPathFromAmdModule(require, 'paths');
 const paths = require.__$__nodeRequire<IPaths>(pathsPath);
 export const getAppDataPath = paths.getAppDataPath;
-export const getDefaultUserDataPath = paths.getDefaultUserDataPath;
\ No newline at end of file
+export const getDefaultUserDataPath = paths.getDefaultUserDataPath;
diff --git a/src/vs/base/node/processes.ts b/src/vs/base/node/processes.ts
index ebe0dff4cc4..c08d79aaf2d 100644
--- a/src/vs/base/node/processes.ts
+++ b/src/vs/base/node/processes.ts
@@ -11,12 +11,12 @@ import * as nls from 'vs/nls';
 import { TPromise, TValueCallback, ErrorCallback } from 'vs/base/common/winjs.base';
 import * as Types from 'vs/base/common/types';
 import { IStringDictionary } from 'vs/base/common/collections';
-import URI from 'vs/base/common/uri';
 import * as Objects from 'vs/base/common/objects';
 import * as TPath from 'vs/base/common/paths';
 import * as Platform from 'vs/base/common/platform';
 import { LineDecoder } from 'vs/base/node/decoder';
 import { CommandOptions, ForkOptions, SuccessData, Source, TerminateResponse, TerminateResponseCode, Executable } from 'vs/base/common/processes';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 export { CommandOptions, ForkOptions, SuccessData, Source, TerminateResponse, TerminateResponseCode };
 
 export type TProgressCallback<T> = (progress: T) => void;
@@ -54,7 +54,7 @@ export function terminateProcess(process: cp.ChildProcess, cwd?: string): Termin
 		}
 	} else if (Platform.isLinux || Platform.isMacintosh) {
 		try {
-			let cmd = URI.parse(require.toUrl('vs/base/node/terminateProcess.sh')).fsPath;
+			let cmd = getPathFromAmdModule(require, 'vs/base/node/terminateProcess.sh');
 			let result = cp.spawnSync(cmd, [process.pid.toString()]);
 			if (result.error) {
 				return { success: false, error: result.error };
diff --git a/src/vs/base/node/ps.ts b/src/vs/base/node/ps.ts
index a7d2d36d0ca..fc8c25a1153 100644
--- a/src/vs/base/node/ps.ts
+++ b/src/vs/base/node/ps.ts
@@ -6,7 +6,8 @@
 'use strict';
 
 import { exec } from 'child_process';
-import URI from 'vs/base/common/uri';
+
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export interface ProcessItem {
 	name: string;
@@ -207,7 +208,7 @@ 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
 						// 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);
+						let cmd = JSON.stringify(getPathFromAmdModule(require, 'vs/base/node/cpuUsage.sh'));
 						cmd += ' ' + pids.join(' ');
 
 						exec(cmd, {}, (err, stdout, stderr) => {
diff --git a/src/vs/base/node/stdFork.ts b/src/vs/base/node/stdFork.ts
index c7c36559465..17782445328 100644
--- a/src/vs/base/node/stdFork.ts
+++ b/src/vs/base/node/stdFork.ts
@@ -9,7 +9,7 @@ import * as path from 'path';
 import * as os from 'os';
 import * as net from 'net';
 import * as cp from 'child_process';
-import uri from 'vs/base/common/uri';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export interface IForkOpts {
 	cwd?: string;
@@ -117,7 +117,7 @@ export function fork(modulePath: string, args: string[], options: IForkOpts, cal
 	};
 
 	// Create the process
-	let bootstrapperPath = (uri.parse(require.toUrl('./stdForkStart.js')).fsPath);
+	let bootstrapperPath = (getPathFromAmdModule(require, './stdForkStart.js'));
 	childProcess = cp.fork(bootstrapperPath, [modulePath].concat(args), {
 		silent: true,
 		cwd: options.cwd,
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 3091fce1d7f..01deb13302b 100644
--- a/src/vs/base/parts/ipc/test/node/ipc.test.ts
+++ b/src/vs/base/parts/ipc/test/node/ipc.test.ts
@@ -8,13 +8,13 @@
 import * as assert from 'assert';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Client } from 'vs/base/parts/ipc/node/ipc.cp';
-import uri from 'vs/base/common/uri';
 import { always } from 'vs/base/common/async';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
 import { ITestChannel, TestServiceClient } from './testService';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 function createClient(): Client {
-	return new Client(uri.parse(require.toUrl('bootstrap')).fsPath, {
+	return new Client(getPathFromAmdModule(require, 'bootstrap'), {
 		serverName: 'TestServer',
 		env: { AMD_ENTRYPOINT: 'vs/base/parts/ipc/test/node/testApp', verbose: true }
 	});
@@ -101,4 +101,4 @@ suite('IPC', () => {
 			return always(result, () => client.dispose());
 		});
 	});
-});
\ No newline at end of file
+});
diff --git a/src/vs/base/test/common/network.test.ts b/src/vs/base/test/common/network.test.ts
deleted file mode 100644
index 7aba51f153b..00000000000
--- a/src/vs/base/test/common/network.test.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 * as assert from 'assert';
-import URI from 'vs/base/common/uri';
-
-function assertUrl(raw: string, scheme: string, domain: string, port: string, path: string, queryString: string, fragmentId: string): void {
-	// check for equivalent behaviour
-	const uri = URI.parse(raw);
-	assert.equal(uri.scheme, scheme);
-	assert.equal(uri.authority, port ? domain + ':' + port : domain);
-	assert.equal(uri.path, path);
-	assert.equal(uri.query, queryString);
-	assert.equal(uri.fragment, fragmentId);
-}
-
-suite('Network', () => {
-	test('urls', () => {
-		assertUrl('http://www.test.com:8000/this/that/theother.html?query=foo#hash',
-			'http', 'www.test.com', '8000', '/this/that/theother.html', 'query=foo', 'hash'
-		);
-
-		assertUrl('http://www.test.com:8000/this/that/theother.html?query=foo',
-			'http', 'www.test.com', '8000', '/this/that/theother.html', 'query=foo', ''
-		);
-
-		assertUrl('http://www.test.com:8000/this/that/theother.html#hash',
-			'http', 'www.test.com', '8000', '/this/that/theother.html', '', 'hash'
-		);
-
-		assertUrl('http://www.test.com:8000/#hash',
-			'http', 'www.test.com', '8000', '/', '', 'hash'
-		);
-
-		assertUrl('http://www.test.com:8000#hash',
-			'http', 'www.test.com', '8000', '/', '', 'hash'
-		);
-
-		assertUrl('http://www.test.com/#hash',
-			'http', 'www.test.com', '', '/', '', 'hash'
-		);
-
-		assertUrl('http://www.test.com#hash',
-			'http', 'www.test.com', '', '/', '', 'hash'
-		);
-
-		assertUrl('http://www.test.com:8000/this/that/theother.html',
-			'http', 'www.test.com', '8000', '/this/that/theother.html', '', ''
-		);
-
-		assertUrl('http://www.test.com:8000/',
-			'http', 'www.test.com', '8000', '/', '', ''
-		);
-
-		assertUrl('http://www.test.com:8000',
-			'http', 'www.test.com', '8000', '/', '', ''
-		);
-
-		assertUrl('http://www.test.com/',
-			'http', 'www.test.com', '', '/', '', ''
-		);
-
-		assertUrl('//www.test.com/',
-			'', 'www.test.com', '', '/', '', ''
-		);
-
-		assertUrl('//www.test.com:8000/this/that/theother.html?query=foo#hash',
-			'', 'www.test.com', '8000', '/this/that/theother.html', 'query=foo', 'hash'
-		);
-
-		assertUrl('//www.test.com/this/that/theother.html?query=foo#hash',
-			'', 'www.test.com', '', '/this/that/theother.html', 'query=foo', 'hash'
-		);
-
-		assertUrl('https://www.test.com:8000/this/that/theother.html?query=foo#hash',
-			'https', 'www.test.com', '8000', '/this/that/theother.html', 'query=foo', 'hash'
-		);
-
-		assertUrl('f12://www.test.com:8000/this/that/theother.html?query=foo#hash',
-			'f12', 'www.test.com', '8000', '/this/that/theother.html', 'query=foo', 'hash'
-		);
-
-		assertUrl('inmemory://model/0',
-			'inmemory', 'model', '', '/0', '', ''
-		);
-
-		assertUrl('file:///c/far/boo/file.cs', 'file', '', '', '/c/far/boo/file.cs', '', '');
-	});
-});
diff --git a/src/vs/base/test/common/uri.test.ts b/src/vs/base/test/common/uri.test.ts
index 618a56a1493..e74f82046d0 100644
--- a/src/vs/base/test/common/uri.test.ts
+++ b/src/vs/base/test/common/uri.test.ts
@@ -65,8 +65,6 @@ suite('URI', () => {
 		assert.equal(URI.from({ scheme: 'http', authority: 'www.MSFT.com', path: '/my/path' }).toString(), 'http://www.msft.com/my/path');
 		assert.equal(URI.from({ scheme: 'http', authority: '', path: 'my/path' }).toString(), 'http:/my/path');
 		assert.equal(URI.from({ scheme: 'http', authority: '', path: '/my/path' }).toString(), 'http:/my/path');
-		assert.equal(URI.from({ scheme: '', authority: '', path: 'my/path' }).toString(), 'my/path');
-		assert.equal(URI.from({ scheme: '', authority: '', path: '/my/path' }).toString(), '/my/path');
 		//http://a-test-site.com/#test=true
 		assert.equal(URI.from({ scheme: 'http', authority: 'a-test-site.com', path: '/', query: 'test=true' }).toString(), 'http://a-test-site.com/?test%3Dtrue');
 		assert.equal(URI.from({ scheme: 'http', authority: 'a-test-site.com', path: '/', query: '', fragment: 'test=true' }).toString(), 'http://a-test-site.com/#test%3Dtrue');
@@ -75,7 +73,7 @@ suite('URI', () => {
 	test('http#toString, encode=FALSE', () => {
 		assert.equal(URI.from({ scheme: 'http', authority: 'a-test-site.com', path: '/', query: 'test=true' }).toString(true), 'http://a-test-site.com/?test=true');
 		assert.equal(URI.from({ scheme: 'http', authority: 'a-test-site.com', path: '/', query: '', fragment: 'test=true' }).toString(true), 'http://a-test-site.com/#test=true');
-		assert.equal(URI.from({}).with({ scheme: 'http', path: '/api/files/test.me', query: 't=1234' }).toString(true), 'http:/api/files/test.me?t=1234');
+		assert.equal(URI.from({ scheme: 'http', path: '/api/files/test.me', query: 't=1234' }).toString(true), 'http:/api/files/test.me?t=1234');
 
 		var value = URI.parse('file://shares/pröjects/c%23/#l12');
 		assert.equal(value.authority, 'shares');
@@ -107,12 +105,12 @@ suite('URI', () => {
 
 	test('with, changes', () => {
 		assert.equal(URI.parse('before:some/file/path').with({ scheme: 'after' }).toString(), 'after:some/file/path');
-		assert.equal(URI.from({}).with({ scheme: 'http', path: '/api/files/test.me', query: 't=1234' }).toString(), 'http:/api/files/test.me?t%3D1234');
-		assert.equal(URI.from({}).with({ scheme: 'http', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'http:/api/files/test.me?t%3D1234');
-		assert.equal(URI.from({}).with({ scheme: 'https', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'https:/api/files/test.me?t%3D1234');
-		assert.equal(URI.from({}).with({ scheme: 'HTTP', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'HTTP:/api/files/test.me?t%3D1234');
-		assert.equal(URI.from({}).with({ scheme: 'HTTPS', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'HTTPS:/api/files/test.me?t%3D1234');
-		assert.equal(URI.from({}).with({ scheme: 'boo', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'boo:/api/files/test.me?t%3D1234');
+		assert.equal(URI.from({ scheme: 's' }).with({ scheme: 'http', path: '/api/files/test.me', query: 't=1234' }).toString(), 'http:/api/files/test.me?t%3D1234');
+		assert.equal(URI.from({ scheme: 's' }).with({ scheme: 'http', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'http:/api/files/test.me?t%3D1234');
+		assert.equal(URI.from({ scheme: 's' }).with({ scheme: 'https', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'https:/api/files/test.me?t%3D1234');
+		assert.equal(URI.from({ scheme: 's' }).with({ scheme: 'HTTP', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'HTTP:/api/files/test.me?t%3D1234');
+		assert.equal(URI.from({ scheme: 's' }).with({ scheme: 'HTTPS', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'HTTPS:/api/files/test.me?t%3D1234');
+		assert.equal(URI.from({ scheme: 's' }).with({ scheme: 'boo', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'boo:/api/files/test.me?t%3D1234');
 	});
 
 	test('with, remove components #8465', () => {
@@ -186,34 +184,13 @@ suite('URI', () => {
 		assert.equal(value.query, '');
 		assert.equal(value.fragment, '');
 
-		value = URI.parse('api/files/test');
-		assert.equal(value.scheme, '');
+		value = URI.parse('foo:api/files/test');
+		assert.equal(value.scheme, 'foo');
 		assert.equal(value.authority, '');
 		assert.equal(value.path, 'api/files/test');
 		assert.equal(value.query, '');
 		assert.equal(value.fragment, '');
 
-		value = URI.parse('api');
-		assert.equal(value.scheme, '');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, 'api');
-		assert.equal(value.query, '');
-		assert.equal(value.fragment, '');
-
-		value = URI.parse('/api/files/test');
-		assert.equal(value.scheme, '');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, '/api/files/test');
-		assert.equal(value.query, '');
-		assert.equal(value.fragment, '');
-
-		value = URI.parse('?test');
-		assert.equal(value.scheme, '');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, '');
-		assert.equal(value.query, 'test');
-		assert.equal(value.fragment, '');
-
 		value = URI.parse('file:?q');
 		assert.equal(value.scheme, 'file');
 		assert.equal(value.authority, '');
@@ -221,13 +198,6 @@ suite('URI', () => {
 		assert.equal(value.query, 'q');
 		assert.equal(value.fragment, '');
 
-		value = URI.parse('#test');
-		assert.equal(value.scheme, '');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, '');
-		assert.equal(value.query, '');
-		assert.equal(value.fragment, 'test');
-
 		value = URI.parse('file:#d');
 		assert.equal(value.scheme, 'file');
 		assert.equal(value.authority, '');
diff --git a/src/vs/base/test/node/encoding/encoding.test.ts b/src/vs/base/test/node/encoding/encoding.test.ts
index 252ee281e37..99d05d437a0 100644
--- a/src/vs/base/test/node/encoding/encoding.test.ts
+++ b/src/vs/base/test/node/encoding/encoding.test.ts
@@ -10,10 +10,11 @@ import * as fs from 'fs';
 import * as encoding from 'vs/base/node/encoding';
 import { readExactlyByFile } from 'vs/base/node/stream';
 import { Readable } from 'stream';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 suite('Encoding', () => {
 	test('detectBOM UTF-8', () => {
-		const file = require.toUrl('./fixtures/some_utf8.css');
+		const file = getPathFromAmdModule(require, './fixtures/some_utf8.css');
 
 		return encoding.detectEncodingByBOM(file).then((encoding: string) => {
 			assert.equal(encoding, 'utf8');
@@ -21,7 +22,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectBOM UTF-16 LE', () => {
-		const file = require.toUrl('./fixtures/some_utf16le.css');
+		const file = getPathFromAmdModule(require, './fixtures/some_utf16le.css');
 
 		return encoding.detectEncodingByBOM(file).then((encoding: string) => {
 			assert.equal(encoding, 'utf16le');
@@ -29,7 +30,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectBOM UTF-16 BE', () => {
-		const file = require.toUrl('./fixtures/some_utf16be.css');
+		const file = getPathFromAmdModule(require, './fixtures/some_utf16be.css');
 
 		return encoding.detectEncodingByBOM(file).then((encoding: string) => {
 			assert.equal(encoding, 'utf16be');
@@ -37,7 +38,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectBOM ANSI', function () {
-		const file = require.toUrl('./fixtures/some_ansi.css');
+		const file = getPathFromAmdModule(require, './fixtures/some_ansi.css');
 
 		return encoding.detectEncodingByBOM(file).then((encoding: string) => {
 			assert.equal(encoding, null);
@@ -45,7 +46,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectBOM ANSI', function () {
-		const file = require.toUrl('./fixtures/empty.txt');
+		const file = getPathFromAmdModule(require, './fixtures/empty.txt');
 
 		return encoding.detectEncodingByBOM(file).then((encoding: string) => {
 			assert.equal(encoding, null);
@@ -68,7 +69,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectEncodingFromBuffer (JSON saved as PNG)', function () {
-		const file = require.toUrl('./fixtures/some.json.png');
+		const file = getPathFromAmdModule(require, './fixtures/some.json.png');
 
 		return readExactlyByFile(file, 512).then(buffer => {
 			const mimes = encoding.detectEncodingFromBuffer(buffer);
@@ -77,7 +78,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectEncodingFromBuffer (PNG saved as TXT)', function () {
-		const file = require.toUrl('./fixtures/some.png.txt');
+		const file = getPathFromAmdModule(require, './fixtures/some.png.txt');
 		return readExactlyByFile(file, 512).then(buffer => {
 			const mimes = encoding.detectEncodingFromBuffer(buffer);
 			assert.equal(mimes.seemsBinary, true);
@@ -85,7 +86,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectEncodingFromBuffer (XML saved as PNG)', function () {
-		const file = require.toUrl('./fixtures/some.xml.png');
+		const file = getPathFromAmdModule(require, './fixtures/some.xml.png');
 		return readExactlyByFile(file, 512).then(buffer => {
 			const mimes = encoding.detectEncodingFromBuffer(buffer);
 			assert.equal(mimes.seemsBinary, false);
@@ -93,7 +94,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectEncodingFromBuffer (QWOFF saved as TXT)', function () {
-		const file = require.toUrl('./fixtures/some.qwoff.txt');
+		const file = getPathFromAmdModule(require, './fixtures/some.qwoff.txt');
 		return readExactlyByFile(file, 512).then(buffer => {
 			const mimes = encoding.detectEncodingFromBuffer(buffer);
 			assert.equal(mimes.seemsBinary, true);
@@ -101,7 +102,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectEncodingFromBuffer (CSS saved as QWOFF)', function () {
-		const file = require.toUrl('./fixtures/some.css.qwoff');
+		const file = getPathFromAmdModule(require, './fixtures/some.css.qwoff');
 		return readExactlyByFile(file, 512).then(buffer => {
 			const mimes = encoding.detectEncodingFromBuffer(buffer);
 			assert.equal(mimes.seemsBinary, false);
@@ -109,7 +110,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectEncodingFromBuffer (PDF)', function () {
-		const file = require.toUrl('./fixtures/some.pdf');
+		const file = getPathFromAmdModule(require, './fixtures/some.pdf');
 		return readExactlyByFile(file, 512).then(buffer => {
 			const mimes = encoding.detectEncodingFromBuffer(buffer);
 			assert.equal(mimes.seemsBinary, true);
@@ -117,7 +118,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectEncodingFromBuffer (guess UTF-16 LE from content without BOM)', function () {
-		const file = require.toUrl('./fixtures/utf16_le_nobom.txt');
+		const file = getPathFromAmdModule(require, './fixtures/utf16_le_nobom.txt');
 		return readExactlyByFile(file, 512).then(buffer => {
 			const mimes = encoding.detectEncodingFromBuffer(buffer);
 			assert.equal(mimes.encoding, encoding.UTF16le);
@@ -126,7 +127,7 @@ suite('Encoding', () => {
 	});
 
 	test('detectEncodingFromBuffer (guess UTF-16 BE from content without BOM)', function () {
-		const file = require.toUrl('./fixtures/utf16_be_nobom.txt');
+		const file = getPathFromAmdModule(require, './fixtures/utf16_be_nobom.txt');
 		return readExactlyByFile(file, 512).then(buffer => {
 			const mimes = encoding.detectEncodingFromBuffer(buffer);
 			assert.equal(mimes.encoding, encoding.UTF16be);
@@ -135,7 +136,7 @@ suite('Encoding', () => {
 	});
 
 	test('autoGuessEncoding (ShiftJIS)', function () {
-		const file = require.toUrl('./fixtures/some.shiftjis.txt');
+		const file = getPathFromAmdModule(require, './fixtures/some.shiftjis.txt');
 		return readExactlyByFile(file, 512 * 8).then(buffer => {
 			return encoding.detectEncodingFromBuffer(buffer, true).then(mimes => {
 				assert.equal(mimes.encoding, 'shiftjis');
@@ -144,7 +145,7 @@ suite('Encoding', () => {
 	});
 
 	test('autoGuessEncoding (CP1252)', function () {
-		const file = require.toUrl('./fixtures/some.cp1252.txt');
+		const file = getPathFromAmdModule(require, './fixtures/some.cp1252.txt');
 		return readExactlyByFile(file, 512 * 8).then(buffer => {
 			return encoding.detectEncodingFromBuffer(buffer, true).then(mimes => {
 				assert.equal(mimes.encoding, 'windows1252');
@@ -238,7 +239,7 @@ suite('Encoding', () => {
 
 	test('toDecodeStream - encoding, utf16be', async function () {
 
-		let path = require.toUrl('./fixtures/some_utf16be.css');
+		let path = getPathFromAmdModule(require, './fixtures/some_utf16be.css');
 		let source = fs.createReadStream(path);
 
 		let { detected, stream } = await encoding.toDecodeStream(source, { minBytesRequiredForDetection: 64 });
@@ -254,7 +255,7 @@ suite('Encoding', () => {
 
 	test('toDecodeStream - empty file', async function () {
 
-		let path = require.toUrl('./fixtures/empty.txt');
+		let path = getPathFromAmdModule(require, './fixtures/empty.txt');
 		let source = fs.createReadStream(path);
 		let { detected, stream } = await encoding.toDecodeStream(source, {});
 
diff --git a/src/vs/base/test/node/extfs/extfs.test.ts b/src/vs/base/test/node/extfs/extfs.test.ts
index d5a363f2b5c..d1740085fd0 100644
--- a/src/vs/base/test/node/extfs/extfs.test.ts
+++ b/src/vs/base/test/node/extfs/extfs.test.ts
@@ -14,6 +14,7 @@ import { canNormalize } from 'vs/base/common/normalization';
 import { isLinux, isWindows } from 'vs/base/common/platform';
 import * as uuid from 'vs/base/common/uuid';
 import * as extfs from 'vs/base/node/extfs';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 
 
@@ -169,7 +170,7 @@ suite('Extfs', () => {
 	test('copy, move and delete', function (done) {
 		const id = uuid.generateUuid();
 		const id2 = uuid.generateUuid();
-		const sourceDir = require.toUrl('./fixtures');
+		const sourceDir = getPathFromAmdModule(require, './fixtures');
 		const parentDir = path.join(os.tmpdir(), 'vsctests', 'extfs');
 		const targetDir = path.join(parentDir, id);
 		const targetDir2 = path.join(parentDir, id2);
@@ -320,7 +321,7 @@ suite('Extfs', () => {
 	test('writeFileAndFlush (file stream)', function (done) {
 		const id = uuid.generateUuid();
 		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const sourceFile = require.toUrl('./fixtures/index.html');
+		const sourceFile = getPathFromAmdModule(require, './fixtures/index.html');
 		const newDir = path.join(parentDir, 'extfs', id);
 		const testFile = path.join(newDir, 'flushed.txt');
 
@@ -453,7 +454,7 @@ suite('Extfs', () => {
 	test('writeFileAndFlush (file stream, error handling)', function (done) {
 		const id = uuid.generateUuid();
 		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const sourceFile = require.toUrl('./fixtures/index.html');
+		const sourceFile = getPathFromAmdModule(require, './fixtures/index.html');
 		const newDir = path.join(parentDir, 'extfs', id);
 		const testFile = path.join(newDir, 'flushed.txt');
 
diff --git a/src/vs/base/test/node/processes/processes.test.ts b/src/vs/base/test/node/processes/processes.test.ts
index 332bdcdbff7..ae4f062bd1c 100644
--- a/src/vs/base/test/node/processes/processes.test.ts
+++ b/src/vs/base/test/node/processes/processes.test.ts
@@ -9,8 +9,8 @@ import * as assert from 'assert';
 import * as cp from 'child_process';
 import * as objects from 'vs/base/common/objects';
 import * as platform from 'vs/base/common/platform';
-import URI from 'vs/base/common/uri';
 import * as processes from 'vs/base/node/processes';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 function fork(id: string): cp.ChildProcess {
 	const opts: any = {
@@ -21,7 +21,7 @@ function fork(id: string): cp.ChildProcess {
 		})
 	};
 
-	return cp.fork(URI.parse(require.toUrl('bootstrap')).fsPath, ['--type=processTests'], opts);
+	return cp.fork(getPathFromAmdModule(require, 'bootstrap'), ['--type=processTests'], opts);
 }
 
 suite('Processes', () => {
diff --git a/src/vs/base/test/node/stream/stream.test.ts b/src/vs/base/test/node/stream/stream.test.ts
index c2c5f1b2f9a..d52ed4c43b1 100644
--- a/src/vs/base/test/node/stream/stream.test.ts
+++ b/src/vs/base/test/node/stream/stream.test.ts
@@ -8,10 +8,11 @@
 import * as assert from 'assert';
 
 import * as stream from 'vs/base/node/stream';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 suite('Stream', () => {
 	test('readExactlyByFile - ANSI', function () {
-		const file = require.toUrl('./fixtures/file.css');
+		const file = getPathFromAmdModule(require, './fixtures/file.css');
 
 		return stream.readExactlyByFile(file, 10).then(({ buffer, bytesRead }) => {
 			assert.equal(bytesRead, 10);
@@ -20,7 +21,7 @@ suite('Stream', () => {
 	});
 
 	test('readExactlyByFile - empty', function () {
-		const file = require.toUrl('./fixtures/empty.txt');
+		const file = getPathFromAmdModule(require, './fixtures/empty.txt');
 
 		return stream.readExactlyByFile(file, 10).then(({ bytesRead }) => {
 			assert.equal(bytesRead, 0);
@@ -28,7 +29,7 @@ suite('Stream', () => {
 	});
 
 	test('readToMatchingString - ANSI', function () {
-		const file = require.toUrl('./fixtures/file.css');
+		const file = getPathFromAmdModule(require, './fixtures/file.css');
 
 		return stream.readToMatchingString(file, '\n', 10, 100).then((result: string) => {
 			// \r may be present on Windows
@@ -37,10 +38,10 @@ suite('Stream', () => {
 	});
 
 	test('readToMatchingString - empty', function () {
-		const file = require.toUrl('./fixtures/empty.txt');
+		const file = getPathFromAmdModule(require, './fixtures/empty.txt');
 
 		return stream.readToMatchingString(file, '\n', 10, 100).then((result: string) => {
 			assert.equal(result, null);
 		});
 	});
-});
\ No newline at end of file
+});
diff --git a/src/vs/base/test/node/uri.test.perf.ts b/src/vs/base/test/node/uri.test.perf.ts
index 3689d197b4d..492a676322a 100644
--- a/src/vs/base/test/node/uri.test.perf.ts
+++ b/src/vs/base/test/node/uri.test.perf.ts
@@ -7,13 +7,14 @@
 import * as assert from 'assert';
 import URI from 'vs/base/common/uri';
 import { readFileSync } from 'fs';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 suite('URI - perf', function () {
 
 	let manyFileUris: URI[];
 	setup(function () {
 		manyFileUris = [];
-		let data = readFileSync(URI.parse(require.toUrl('./uri.test.data.txt')).fsPath).toString();
+		let data = readFileSync(getPathFromAmdModule(require, './uri.test.data.txt')).toString();
 		let lines = data.split('\n');
 		for (let line of lines) {
 			manyFileUris.push(URI.file(line));
diff --git a/src/vs/base/test/node/zip/zip.test.ts b/src/vs/base/test/node/zip/zip.test.ts
index f53894f5ebb..21adac26149 100644
--- a/src/vs/base/test/node/zip/zip.test.ts
+++ b/src/vs/base/test/node/zip/zip.test.ts
@@ -8,13 +8,13 @@
 import * as assert from 'assert';
 import * as path from 'path';
 import * as os from 'os';
-import URI from 'vs/base/common/uri';
 import { extract } from 'vs/base/node/zip';
 import { generateUuid } from 'vs/base/common/uuid';
 import { rimraf, exists } from 'vs/base/node/pfs';
 import { NullLogService } from 'vs/platform/log/common/log';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
-const fixtures = URI.parse(require.toUrl('./fixtures')).fsPath;
+const fixtures = getPathFromAmdModule(require, './fixtures');
 
 suite('Zip', () => {
 
@@ -27,4 +27,4 @@ suite('Zip', () => {
 			.then(exists => assert(exists))
 			.then(() => rimraf(target));
 	});
-});
\ No newline at end of file
+});
diff --git a/src/vs/code/test/node/windowsFinder.test.ts b/src/vs/code/test/node/windowsFinder.test.ts
index b9b70a3503d..d9d9a683643 100644
--- a/src/vs/code/test/node/windowsFinder.test.ts
+++ b/src/vs/code/test/node/windowsFinder.test.ts
@@ -11,8 +11,9 @@ import { OpenContext } from 'vs/platform/windows/common/windows';
 import { IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
 import URI from 'vs/base/common/uri';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
-const fixturesFolder = require.toUrl('./fixtures');
+const fixturesFolder = getPathFromAmdModule(require, './fixtures');
 
 const testWorkspace: IWorkspaceIdentifier = {
 	id: Date.now().toString(),
diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts
index f0668375eef..08cc4613dfc 100644
--- a/src/vs/editor/common/config/commonEditorConfig.ts
+++ b/src/vs/editor/common/config/commonEditorConfig.ts
@@ -83,6 +83,7 @@ export abstract class CommonEditorConfiguration extends Disposable implements ed
 		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._rawOptions.parameterHints = objects.mixin({}, this._rawOptions.parameterHints || {});
 
 		this._validatedOptions = editorOptions.EditorOptionsValidator.validate(this._rawOptions, EDITOR_DEFAULTS);
 		this.editor = null;
@@ -488,10 +489,15 @@ const editorConfiguration: IConfigurationNode = {
 			'minimum': 0,
 			'description': nls.localize('quickSuggestionsDelay', "Controls the delay in milliseconds after which quick suggestions will show up.")
 		},
-		'editor.parameterHints': {
+		'editor.parameterHints.enabled': {
 			'type': 'boolean',
-			'default': EDITOR_DEFAULTS.contribInfo.parameterHints,
-			'description': nls.localize('parameterHints', "Enables a pop-up that shows parameter documentation and type information as you type.")
+			'default': EDITOR_DEFAULTS.contribInfo.parameterHints.enabled,
+			'description': nls.localize('parameterHints.enabled', "Enables a pop-up that shows parameter documentation and type information as you type.")
+		},
+		'editor.parameterHints.cycle': {
+			'type': 'boolean',
+			'default': EDITOR_DEFAULTS.contribInfo.parameterHints.cycle,
+			'description': nls.localize('parameterHints.cycle', "Controls whether the parameter hints menu cycles or closes when reaching the end of the list.")
 		},
 		'editor.autoClosingBrackets': {
 			'type': 'boolean',
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 75fd5559db8..3a510380338 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -158,6 +158,22 @@ export interface IEditorHoverOptions {
 	sticky?: boolean;
 }
 
+/**
+ * Configuration options for parameter hints
+ */
+export interface IEditorParameterHintOptions {
+	/**
+	 * Enable parameter hints.
+	 * Defaults to true.
+	 */
+	enabled?: boolean;
+	/**
+	 * Enable cycling of parameter hints.
+	 * Defaults to false.
+	 */
+	cycle?: boolean;
+}
+
 export interface ISuggestOptions {
 	/**
 	 * Enable graceful matching. Defaults to true.
@@ -451,9 +467,9 @@ export interface IEditorOptions {
 	 */
 	quickSuggestionsDelay?: number;
 	/**
-	 * Enables parameter hints
+	 * Parameter hint options.
 	 */
-	parameterHints?: boolean;
+	parameterHints?: IEditorParameterHintOptions;
 	/**
 	 * Render icons in suggestions box.
 	 * Defaults to true.
@@ -851,6 +867,11 @@ export interface InternalSuggestOptions {
 	readonly snippetsPreventQuickSuggestions: boolean;
 }
 
+export interface InternalParameterHintOptions {
+	readonly enabled: boolean;
+	readonly cycle: boolean;
+}
+
 export interface EditorWrappingInfo {
 	readonly inDiffEditor: boolean;
 	readonly isDominatedByLongLines: boolean;
@@ -911,7 +932,7 @@ export interface EditorContribOptions {
 	readonly contextmenu: boolean;
 	readonly quickSuggestions: boolean | { other: boolean, comments: boolean, strings: boolean };
 	readonly quickSuggestionsDelay: number;
-	readonly parameterHints: boolean;
+	readonly parameterHints: InternalParameterHintOptions;
 	readonly iconsInSuggestions: boolean;
 	readonly formatOnType: boolean;
 	readonly formatOnPaste: boolean;
@@ -1237,6 +1258,16 @@ export class InternalEditorOptions {
 		);
 	}
 
+	/**
+	 * @internal
+	 */
+	private static _equalsParameterHintOptions(a: InternalParameterHintOptions, b: InternalParameterHintOptions): boolean {
+		return (
+			a.enabled === b.enabled
+			&& a.cycle === b.cycle
+		);
+	}
+
 	/**
 	 * @internal
 	 */
@@ -1291,7 +1322,7 @@ export class InternalEditorOptions {
 			&& a.contextmenu === b.contextmenu
 			&& InternalEditorOptions._equalsQuickSuggestions(a.quickSuggestions, b.quickSuggestions)
 			&& a.quickSuggestionsDelay === b.quickSuggestionsDelay
-			&& a.parameterHints === b.parameterHints
+			&& this._equalsParameterHintOptions(a.parameterHints, b.parameterHints)
 			&& a.iconsInSuggestions === b.iconsInSuggestions
 			&& a.formatOnType === b.formatOnType
 			&& a.formatOnPaste === b.formatOnPaste
@@ -1732,6 +1763,17 @@ export class EditorOptionsValidator {
 		};
 	}
 
+	private static _sanitizeParameterHintOpts(opts: IEditorParameterHintOptions, defaults: InternalParameterHintOptions): InternalParameterHintOptions {
+		if (typeof opts !== 'object') {
+			return defaults;
+		}
+
+		return {
+			enabled: _boolean(opts.enabled, defaults.enabled),
+			cycle: _boolean(opts.cycle, defaults.cycle)
+		};
+	}
+
 	private static _santizeHoverOpts(_opts: boolean | IEditorHoverOptions, defaults: InternalEditorHoverOptions): InternalEditorHoverOptions {
 		let opts: IEditorHoverOptions;
 		if (typeof _opts === 'boolean') {
@@ -1884,7 +1926,7 @@ export class EditorOptionsValidator {
 			contextmenu: _boolean(opts.contextmenu, defaults.contextmenu),
 			quickSuggestions: quickSuggestions,
 			quickSuggestionsDelay: _clampedInt(opts.quickSuggestionsDelay, defaults.quickSuggestionsDelay, Constants.MIN_SAFE_SMALL_INTEGER, Constants.MAX_SAFE_SMALL_INTEGER),
-			parameterHints: _boolean(opts.parameterHints, defaults.parameterHints),
+			parameterHints: this._sanitizeParameterHintOpts(opts.parameterHints, defaults.parameterHints),
 			iconsInSuggestions: _boolean(opts.iconsInSuggestions, defaults.iconsInSuggestions),
 			formatOnType: _boolean(opts.formatOnType, defaults.formatOnType),
 			formatOnPaste: _boolean(opts.formatOnPaste, defaults.formatOnPaste),
@@ -2463,7 +2505,10 @@ export const EDITOR_DEFAULTS: IValidatedEditorOptions = {
 		contextmenu: true,
 		quickSuggestions: { other: true, comments: false, strings: false },
 		quickSuggestionsDelay: 10,
-		parameterHints: true,
+		parameterHints: {
+			enabled: true,
+			cycle: false
+		},
 		iconsInSuggestions: true,
 		formatOnType: false,
 		formatOnPaste: false,
diff --git a/src/vs/editor/common/services/modelServiceImpl.ts b/src/vs/editor/common/services/modelServiceImpl.ts
index 56a282da585..560ed428507 100644
--- a/src/vs/editor/common/services/modelServiceImpl.ts
+++ b/src/vs/editor/common/services/modelServiceImpl.ts
@@ -85,9 +85,12 @@ class ModelMarkerHandler {
 
 		let ret = Range.lift(rawMarker);
 
-		if (rawMarker.severity === MarkerSeverity.Hint && Range.spansMultipleLines(ret)) {
-			// never render hints on multiple lines
-			ret = ret.setEndPosition(ret.startLineNumber, ret.startColumn);
+		if (rawMarker.severity === MarkerSeverity.Hint) {
+			// * never render hints on multiple lines
+			// * make enough space for three dots
+			if (Range.spansMultipleLines(ret) || ret.endColumn - ret.startColumn < 2) {
+				ret = ret.setEndPosition(ret.startLineNumber, ret.startColumn + 2);
+			}
 		}
 
 		ret = model.validateRange(ret);
diff --git a/src/vs/editor/contrib/indentation/indentation.ts b/src/vs/editor/contrib/indentation/indentation.ts
index ab6c491ed74..7437bf9a56c 100644
--- a/src/vs/editor/contrib/indentation/indentation.ts
+++ b/src/vs/editor/contrib/indentation/indentation.ts
@@ -11,7 +11,6 @@ import { IEditorContribution, ICommand, ICursorStateComputerData, IEditOperation
 import { IIdentifiedSingleEditOperation, ITextModel } from 'vs/editor/common/model';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { registerEditorAction, ServicesAccessor, IActionOptions, EditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
@@ -23,6 +22,7 @@ import { TextEdit, StandardTokenType } from 'vs/editor/common/modes';
 import * as IndentUtil from './indentUtils';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IndentConsts } from 'vs/editor/common/modes/supports/indentRules';
+import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 
 export function shiftIndent(tabSize: number, indentation: string, count?: number): string {
 	count = count || 1;
@@ -217,7 +217,7 @@ export class ChangeIndentationSizeAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): TPromise<void> {
-		const quickOpenService = accessor.get(IQuickOpenService);
+		const quickInputService = accessor.get(IQuickInputService);
 		const modelService = accessor.get(IModelService);
 
 		let model = editor.getModel();
@@ -237,7 +237,7 @@ export class ChangeIndentationSizeAction extends EditorAction {
 		const autoFocusIndex = Math.min(model.getOptions().tabSize - 1, 7);
 
 		return TPromise.timeout(50 /* quick open is sensitive to being opened so soon after another */).then(() =>
-			quickOpenService.pick(picks, { placeHolder: nls.localize({ key: 'selectTabWidth', comment: ['Tab corresponds to the tab key'] }, "Select Tab Size for Current File"), autoFocus: { autoFocusIndex } }).then(pick => {
+			quickInputService.pick(picks, { placeHolder: nls.localize({ key: 'selectTabWidth', comment: ['Tab corresponds to the tab key'] }, "Select Tab Size for Current File"), activeItem: picks[autoFocusIndex] }).then(pick => {
 				if (pick) {
 					model.updateOptions({
 						tabSize: parseInt(pick.label, 10),
diff --git a/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts b/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts
index 9a5cfbdb383..80c27ea30e5 100644
--- a/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts
+++ b/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts
@@ -169,7 +169,7 @@ export class ParameterHintsModel extends Disposable {
 	}
 
 	private onEditorConfigurationChange(): void {
-		this.enabled = this.editor.getConfiguration().contribInfo.parameterHints;
+		this.enabled = this.editor.getConfiguration().contribInfo.parameterHints.enabled;
 
 		if (!this.enabled) {
 			this.cancel();
@@ -476,14 +476,20 @@ export class ParameterHintsWidget implements IContentWidget, IDisposable {
 	next(): boolean {
 		const length = this.hints.signatures.length;
 		const last = (this.currentSignature % length) === (length - 1);
+		const cycle = this.editor.getConfiguration().contribInfo.parameterHints.cycle;
 
 		// If there is only one signature, or we're on last signature of list
-		if (length < 2 || last) {
+		if ((length < 2 || last) && !cycle) {
 			this.cancel();
 			return false;
 		}
 
-		this.currentSignature++;
+		if (last && cycle) {
+			this.currentSignature = 0;
+		} else {
+			this.currentSignature++;
+		}
+
 		this.render();
 		return true;
 	}
@@ -491,13 +497,20 @@ export class ParameterHintsWidget implements IContentWidget, IDisposable {
 	previous(): boolean {
 		const length = this.hints.signatures.length;
 		const first = this.currentSignature === 0;
+		const cycle = this.editor.getConfiguration().contribInfo.parameterHints.cycle;
 
-		if (length < 2 || first) {
+		// If there is only one signature, or we're on first signature of list
+		if ((length < 2 || first) && !cycle) {
 			this.cancel();
 			return false;
 		}
 
-		this.currentSignature--;
+		if (first && cycle) {
+			this.currentSignature = length - 1;
+		} else {
+			this.currentSignature--;
+		}
+
 		this.render();
 		return true;
 	}
diff --git a/src/vs/editor/contrib/suggest/suggestModel.ts b/src/vs/editor/contrib/suggest/suggestModel.ts
index 4a427b85dfe..d3b11c702fb 100644
--- a/src/vs/editor/contrib/suggest/suggestModel.ts
+++ b/src/vs/editor/contrib/suggest/suggestModel.ts
@@ -123,6 +123,9 @@ export class SuggestModel implements IDisposable {
 			this._updateTriggerCharacters();
 			this.cancel();
 		}));
+		this._toDispose.push(this._editor.onDidBlurEditorText(() => {
+			this.cancel();
+		}));
 		this._toDispose.push(this._editor.onDidChangeConfiguration(() => {
 			this._updateTriggerCharacters();
 			this._updateQuickSuggest();
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index 68757d47ced..cb169b9e99f 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -2503,6 +2503,22 @@ declare namespace monaco.editor {
 		sticky?: boolean;
 	}
 
+	/**
+	 * Configuration options for parameter hints
+	 */
+	export interface IEditorParameterHintOptions {
+		/**
+		 * Enable parameter hints.
+		 * Defaults to true.
+		 */
+		enabled?: boolean;
+		/**
+		 * Enable cycling of parameter hints.
+		 * Defaults to false.
+		 */
+		cycle?: boolean;
+	}
+
 	export interface ISuggestOptions {
 		/**
 		 * Enable graceful matching. Defaults to true.
@@ -2788,9 +2804,9 @@ declare namespace monaco.editor {
 		 */
 		quickSuggestionsDelay?: number;
 		/**
-		 * Enables parameter hints
+		 * Parameter hint options.
 		 */
-		parameterHints?: boolean;
+		parameterHints?: IEditorParameterHintOptions;
 		/**
 		 * Render icons in suggestions box.
 		 * Defaults to true.
@@ -3125,6 +3141,11 @@ declare namespace monaco.editor {
 		readonly snippetsPreventQuickSuggestions: boolean;
 	}
 
+	export interface InternalParameterHintOptions {
+		readonly enabled: boolean;
+		readonly cycle: boolean;
+	}
+
 	export interface EditorWrappingInfo {
 		readonly inDiffEditor: boolean;
 		readonly isDominatedByLongLines: boolean;
@@ -3189,7 +3210,7 @@ declare namespace monaco.editor {
 			strings: boolean;
 		};
 		readonly quickSuggestionsDelay: number;
-		readonly parameterHints: boolean;
+		readonly parameterHints: InternalParameterHintOptions;
 		readonly iconsInSuggestions: boolean;
 		readonly formatOnType: boolean;
 		readonly formatOnPaste: boolean;
diff --git a/src/vs/platform/driver/electron-browser/driver.ts b/src/vs/platform/driver/electron-browser/driver.ts
index 4dbaaff6c95..6b4d876f49d 100644
--- a/src/vs/platform/driver/electron-browser/driver.ts
+++ b/src/vs/platform/driver/electron-browser/driver.ts
@@ -207,7 +207,7 @@ class WindowDriver implements IWindowDriver {
 			return TPromise.wrapError(new Error('Xterm not found'));
 		}
 
-		xterm._core.send(text);
+		xterm._core.handler(text);
 
 		return TPromise.as(null);
 	}
diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts
index 5625ae2ca2d..2224b6afd17 100644
--- a/src/vs/platform/environment/node/environmentService.ts
+++ b/src/vs/platform/environment/node/environmentService.ts
@@ -8,12 +8,12 @@ import * as crypto from 'crypto';
 import * as paths from 'vs/base/node/paths';
 import * as os from 'os';
 import * as path from 'path';
-import URI from 'vs/base/common/uri';
 import { memoize } from 'vs/base/common/decorators';
 import pkg from 'vs/platform/node/package';
 import product from 'vs/platform/node/product';
 import { toLocalISOString } from 'vs/base/common/date';
 import { isWindows, isLinux } from 'vs/base/common/platform';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 // Read this before there's any chance it is overwritten
 // Related to https://github.com/Microsoft/vscode/issues/30624
@@ -77,7 +77,7 @@ export class EnvironmentService implements IEnvironmentService {
 	get args(): ParsedArgs { return this._args; }
 
 	@memoize
-	get appRoot(): string { return path.dirname(URI.parse(require.toUrl('')).fsPath); }
+	get appRoot(): string { return path.dirname(getPathFromAmdModule(require, '')); }
 
 	get execPath(): string { return this._execPath; }
 
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 2ff1e3bb3f2..fca1b8fcc1e 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -40,8 +40,9 @@ import { ExtensionsLifecycle } from 'vs/platform/extensionManagement/node/extens
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { isEngineValid } from 'vs/platform/extensions/node/extensionValidator';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
-const SystemExtensionsRoot = path.normalize(path.join(URI.parse(require.toUrl('')).fsPath, '..', 'extensions'));
+const SystemExtensionsRoot = path.normalize(path.join(getPathFromAmdModule(require, ''), '..', 'extensions'));
 const ERROR_SCANNING_SYS_EXTENSIONS = 'scanningSystem';
 const ERROR_SCANNING_USER_EXTENSIONS = 'scanningUser';
 const INSTALL_ERROR_UNSET_UNINSTALLED = 'unsetUninstalled';
diff --git a/src/vs/platform/markers/test/common/markerService.test.ts b/src/vs/platform/markers/test/common/markerService.test.ts
index 06495c239e4..25cb2e933a2 100644
--- a/src/vs/platform/markers/test/common/markerService.test.ts
+++ b/src/vs/platform/markers/test/common/markerService.test.ts
@@ -58,16 +58,16 @@ suite('Marker Service', () => {
 	test('changeOne override', () => {
 
 		let service = new markerService.MarkerService();
-		service.changeOne('far', URI.parse('/path/only.cs'), [randomMarkerData()]);
+		service.changeOne('far', URI.parse('file:///path/only.cs'), [randomMarkerData()]);
 		assert.equal(service.read().length, 1);
 		assert.equal(service.read({ owner: 'far' }).length, 1);
 
-		service.changeOne('boo', URI.parse('/path/only.cs'), [randomMarkerData()]);
+		service.changeOne('boo', URI.parse('file:///path/only.cs'), [randomMarkerData()]);
 		assert.equal(service.read().length, 2);
 		assert.equal(service.read({ owner: 'far' }).length, 1);
 		assert.equal(service.read({ owner: 'boo' }).length, 1);
 
-		service.changeOne('far', URI.parse('/path/only.cs'), [randomMarkerData(), randomMarkerData()]);
+		service.changeOne('far', URI.parse('file:///path/only.cs'), [randomMarkerData(), randomMarkerData()]);
 		assert.equal(service.read({ owner: 'far' }).length, 2);
 		assert.equal(service.read({ owner: 'boo' }).length, 1);
 
@@ -76,13 +76,13 @@ suite('Marker Service', () => {
 	test('changeOne/All clears', () => {
 
 		let service = new markerService.MarkerService();
-		service.changeOne('far', URI.parse('/path/only.cs'), [randomMarkerData()]);
-		service.changeOne('boo', URI.parse('/path/only.cs'), [randomMarkerData()]);
+		service.changeOne('far', URI.parse('file:///path/only.cs'), [randomMarkerData()]);
+		service.changeOne('boo', URI.parse('file:///path/only.cs'), [randomMarkerData()]);
 		assert.equal(service.read({ owner: 'far' }).length, 1);
 		assert.equal(service.read({ owner: 'boo' }).length, 1);
 		assert.equal(service.read().length, 2);
 
-		service.changeOne('far', URI.parse('/path/only.cs'), []);
+		service.changeOne('far', URI.parse('file:///path/only.cs'), []);
 		assert.equal(service.read({ owner: 'far' }).length, 0);
 		assert.equal(service.read({ owner: 'boo' }).length, 1);
 		assert.equal(service.read().length, 1);
diff --git a/src/vs/platform/node/package.ts b/src/vs/platform/node/package.ts
index fff85d911f2..93c32bc7117 100644
--- a/src/vs/platform/node/package.ts
+++ b/src/vs/platform/node/package.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as path from 'path';
-import uri from 'vs/base/common/uri';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export interface IPackageConfiguration {
 	name: string;
 	version: string;
 }
 
-const rootPath = path.dirname(uri.parse(require.toUrl('')).fsPath);
+const rootPath = path.dirname(getPathFromAmdModule(require, ''));
 const packageJsonPath = path.join(rootPath, 'package.json');
-export default require.__$__nodeRequire(packageJsonPath) as IPackageConfiguration;
\ No newline at end of file
+export default require.__$__nodeRequire(packageJsonPath) as IPackageConfiguration;
diff --git a/src/vs/platform/node/product.ts b/src/vs/platform/node/product.ts
index b4ed6f55eab..dbb84fd473f 100644
--- a/src/vs/platform/node/product.ts
+++ b/src/vs/platform/node/product.ts
@@ -4,12 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as path from 'path';
-import uri from 'vs/base/common/uri';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export interface IProductConfiguration {
 	nameShort: string;
 	nameLong: string;
 	applicationName: string;
+	win32AppId: string;
+	win32x64AppId: string;
+	win32UserAppId: string;
+	win32x64UserAppId: string;
 	win32AppUserModelId: string;
 	win32MutexName: string;
 	darwinBundleIdentifier: string;
@@ -86,7 +90,7 @@ export interface ISurveyData {
 	userProbability: number;
 }
 
-const rootPath = path.dirname(uri.parse(require.toUrl('')).fsPath);
+const rootPath = path.dirname(getPathFromAmdModule(require, ''));
 const productJsonPath = path.join(rootPath, 'product.json');
 const product = require.__$__nodeRequire(productJsonPath) as IProductConfiguration;
 
diff --git a/src/vs/platform/quickinput/common/quickInput.ts b/src/vs/platform/quickinput/common/quickInput.ts
index 0ec12af97a1..24d730db9b4 100644
--- a/src/vs/platform/quickinput/common/quickInput.ts
+++ b/src/vs/platform/quickinput/common/quickInput.ts
@@ -10,6 +10,7 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
 import URI from 'vs/base/common/uri';
 import { Event } from 'vs/base/common/event';
+import { FileKind } from 'vs/platform/files/common/files';
 
 export interface IQuickPickItem {
 	id?: string;
@@ -19,6 +20,11 @@ export interface IQuickPickItem {
 	picked?: boolean;
 }
 
+export interface IFilePickItem extends IQuickPickItem {
+	resource: URI;
+	fileKind?: FileKind;
+}
+
 export interface IQuickNavigateConfiguration {
 	keybindings: ResolvedKeybinding[];
 }
@@ -50,6 +56,11 @@ export interface IPickOptions<T extends IQuickPickItem> {
 	 */
 	canPickMany?: boolean;
 
+	/**
+	 * an optional property for the item to focus initially.
+	 */
+	activeItem?: TPromise<T> | T;
+
 	onDidFocus?: (entry: T) => void;
 }
 
@@ -172,6 +183,8 @@ export interface IQuickInputButton {
 
 export const IQuickInputService = createDecorator<IQuickInputService>('quickInputService');
 
+export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
+
 export interface IQuickInputService {
 
 	_serviceBrand: any;
@@ -179,7 +192,9 @@ 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<T>>(picks: TPromise<T[]>, options?: O, token?: CancellationToken): TPromise<O extends { canPickMany: true } ? T[] : T>;
+	pick<T extends IQuickPickItem>(picks: TPromise<T[]> | T[], options?: IPickOptions<T> & { canPickMany: true }, token?: CancellationToken): TPromise<T[]>;
+	pick<T extends IQuickPickItem>(picks: TPromise<T[]> | T[], options?: IPickOptions<T> & { canPickMany: false }, token?: CancellationToken): TPromise<T>;
+	pick<T extends IQuickPickItem>(picks: TPromise<T[]> | T[], options?: Omit<IPickOptions<T>, 'canPickMany'>, token?: CancellationToken): TPromise<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/telemetry/common/telemetryUtils.ts b/src/vs/platform/telemetry/common/telemetryUtils.ts
index a68ff28367b..83a4326ca5e 100644
--- a/src/vs/platform/telemetry/common/telemetryUtils.ts
+++ b/src/vs/platform/telemetry/common/telemetryUtils.ts
@@ -113,7 +113,8 @@ const configurationValueWhitelist = [
 	'editor.multiCursorModifier',
 	'editor.quickSuggestions',
 	'editor.quickSuggestionsDelay',
-	'editor.parameterHints',
+	'editor.parameterHints.enabled',
+	'editor.parameterHints.cycle',
 	'editor.autoClosingBrackets',
 	'editor.autoIndent',
 	'editor.formatOnType',
diff --git a/src/vs/platform/theme/test/electron-browser/colorRegistry.releaseTest.ts b/src/vs/platform/theme/test/electron-browser/colorRegistry.releaseTest.ts
index 39858929cb5..e5658bcaf38 100644
--- a/src/vs/platform/theme/test/electron-browser/colorRegistry.releaseTest.ts
+++ b/src/vs/platform/theme/test/electron-browser/colorRegistry.releaseTest.ts
@@ -18,6 +18,7 @@ import { request, asText } from 'vs/base/node/request';
 import * as pfs from 'vs/base/node/pfs';
 import * as path from 'path';
 import * as assert from 'assert';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 
 interface ColorInfo {
@@ -103,7 +104,7 @@ function getDescription(color: ColorContribution) {
 }
 
 async function getColorsFromExtension(): Promise<{ [id: string]: string }> {
-	let extPath = require.toUrl('../../../../../../extensions');
+	let extPath = getPathFromAmdModule(require, '../../../../../../extensions');
 	let extFolders = await pfs.readDirsInDir(extPath);
 	let result: { [id: string]: string } = Object.create(null);
 	for (let folder of extFolders) {
@@ -127,4 +128,4 @@ async function getColorsFromExtension(): Promise<{ [id: string]: string }> {
 
 	}
 	return result;
-}
\ No newline at end of file
+}
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
index b3ed4943e3e..64859f24589 100644
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -362,9 +362,9 @@ declare module 'vscode' {
 		priority?: number;
 		title?: string;
 		bubble?: boolean;
-		abbreviation?: string;
+		abbreviation?: string; // letter, not optional
 		color?: ThemeColor;
-		source?: string;
+		source?: string; // hacky... we should remove it and use equality under the hood
 	}
 
 	export interface SourceControlResourceDecorations {
diff --git a/src/vs/workbench/api/node/extHostSearch.fileIndex.ts b/src/vs/workbench/api/node/extHostSearch.fileIndex.ts
index 4e2079d1df5..90b8a578f1c 100644
--- a/src/vs/workbench/api/node/extHostSearch.fileIndex.ts
+++ b/src/vs/workbench/api/node/extHostSearch.fileIndex.ts
@@ -416,7 +416,7 @@ export class FileIndexSearchManager {
 				sortedSearch.then(complete => {
 					this.sendAsBatches(complete.results, onBatch, FileIndexSearchManager.BATCH_SIZE);
 					c(complete);
-				}, e, onBatch);
+				}, e);
 			}, () => {
 				sortedSearch.cancel();
 			});
diff --git a/src/vs/workbench/browser/actions/workspaceCommands.ts b/src/vs/workbench/browser/actions/workspaceCommands.ts
index 9ead6f9f1fb..268890850d4 100644
--- a/src/vs/workbench/browser/actions/workspaceCommands.ts
+++ b/src/vs/workbench/browser/actions/workspaceCommands.ts
@@ -14,7 +14,6 @@ import URI from 'vs/base/common/uri';
 import * as resources from 'vs/base/common/resources';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { dirname } from 'vs/base/common/paths';
-import { IQuickOpenService, IFilePickOpenEntry, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { mnemonicButtonLabel } from 'vs/base/common/labels';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
@@ -24,6 +23,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { isLinux } from 'vs/base/common/platform';
 import { IUriDisplayService } from 'vs/platform/uriDisplay/common/uriDisplay';
+import { IQuickInputService, IPickOptions, IFilePickItem } from 'vs/platform/quickinput/common/quickInput';
 
 export const ADD_ROOT_FOLDER_COMMAND_ID = 'addRootFolder';
 export const ADD_ROOT_FOLDER_LABEL = nls.localize('addFolderToWorkspace', "Add Folder to Workspace...");
@@ -158,8 +158,8 @@ CommandsRegistry.registerCommand({
 	}
 });
 
-CommandsRegistry.registerCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, function (accessor, args?: [IPickOptions, CancellationToken]) {
-	const quickOpenService = accessor.get(IQuickOpenService);
+CommandsRegistry.registerCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, function (accessor, args?: [IPickOptions<IFilePickItem>, CancellationToken]) {
+	const quickInputService = accessor.get(IQuickInputService);
 	const uriDisplayService = accessor.get(IUriDisplayService);
 	const contextService = accessor.get(IWorkspaceContextService);
 
@@ -175,10 +175,10 @@ CommandsRegistry.registerCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, function (acc
 			folder,
 			resource: folder.uri,
 			fileKind: FileKind.ROOT_FOLDER
-		} as IFilePickOpenEntry;
+		} as IFilePickItem;
 	});
 
-	let options: IPickOptions;
+	let options: IPickOptions<IFilePickItem>;
 	if (args) {
 		options = args[0];
 	}
@@ -187,8 +187,8 @@ CommandsRegistry.registerCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, function (acc
 		options = Object.create(null);
 	}
 
-	if (!options.autoFocus) {
-		options.autoFocus = { autoFocusFirstEntry: true };
+	if (!options.activeItem) {
+		options.activeItem = folderPicks[0];
 	}
 
 	if (!options.placeHolder) {
@@ -208,7 +208,7 @@ CommandsRegistry.registerCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, function (acc
 		token = CancellationToken.None;
 	}
 
-	return quickOpenService.pick(folderPicks, options, token).then(pick => {
+	return quickInputService.pick(folderPicks, options, token).then(pick => {
 		if (!pick) {
 			return void 0;
 		}
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
index 3ee60065b1c..e6eef49b484 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
@@ -123,12 +123,20 @@ export abstract class BreadcrumbsPicker {
 	}
 
 	layout(height: number, width: number, arrowSize: number, arrowOffset: number) {
-		this._domNode.style.height = `${height}px`;
+
+		let treeHeight = height - 2 * arrowSize;
+		let elementHeight = 22;
+		let elementCount = treeHeight / elementHeight;
+		if (elementCount % 2 !== 1) {
+			treeHeight = elementHeight * (elementCount + 1);
+		}
+		let totalHeight = treeHeight + 2 + arrowSize;
+
+		this._domNode.style.height = `${totalHeight}px`;
 		this._domNode.style.width = `${width}px`;
 		this._arrow.style.borderWidth = `${arrowSize}px`;
 		this._arrow.style.marginLeft = `${arrowOffset}px`;
-
-		this._treeContainer.style.height = `${height - 2 * arrowSize}px`;
+		this._treeContainer.style.height = `${treeHeight}px`;
 		this._treeContainer.style.width = `${width}px`;
 		this._tree.layout();
 	}
@@ -231,7 +239,8 @@ export class FileRenderer implements IRenderer, IHighlightingRenderer {
 			fileKind,
 			hidePath: true,
 			fileDecorations: fileDecorations,
-			matches: createMatches((this._scores.get(resource.toString()) || [, []])[1])
+			matches: createMatches((this._scores.get(resource.toString()) || [, []])[1]),
+			extraClasses: ['picker-item']
 		});
 	}
 
diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts
index 600ece0164f..b6545f0bdc6 100644
--- a/src/vs/workbench/browser/parts/editor/editorCommands.ts
+++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts
@@ -23,6 +23,7 @@ import { IEditorGroupsService, IEditorGroup, GroupDirection, GroupLocation, Grou
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 
 export const CLOSE_SAVED_EDITORS_COMMAND_ID = 'workbench.action.closeUnmodifiedEditors';
 export const CLOSE_EDITORS_IN_GROUP_COMMAND_ID = 'workbench.action.closeEditorsInGroup';
@@ -263,6 +264,14 @@ function registerDiffEditorCommands(): void {
 			}
 		}
 	});
+
+	MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+		command: {
+			id: TOGGLE_DIFF_INLINE_MODE,
+			title: nls.localize('toggleInlineView', "Compare: Toggle Inline View")
+		},
+		when: ContextKeyExpr.has('textCompareEditorActive')
+	});
 }
 
 function registerOpenEditorAtIndexCommands(): void {
diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index 7b24eca3f73..20a1bc2d68d 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -58,6 +58,7 @@ import { Schemas } from 'vs/base/common/network';
 import { IAnchor } from 'vs/base/browser/ui/contextview/contextview';
 import { Themable } from 'vs/workbench/common/theme';
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
 
 class SideBySideEditorEncodingSupport implements IEncodingSupport {
 	constructor(private master: IEncodingSupport, private details: IEncodingSupport) { }
@@ -834,6 +835,7 @@ export class ChangeModeAction extends Action {
 		@IEditorService private editorService: IEditorService,
 		@IWorkspaceConfigurationService private configurationService: IWorkspaceConfigurationService,
 		@IQuickOpenService private quickOpenService: IQuickOpenService,
+		@IQuickInputService private quickInputService: IQuickInputService,
 		@IPreferencesService private preferencesService: IPreferencesService,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IUntitledEditorService private untitledEditorService: IUntitledEditorService
@@ -844,7 +846,7 @@ export class ChangeModeAction extends Action {
 	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") }]);
+			return this.quickInputService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
 		}
 
 		const textModel = activeTextEditorWidget.getModel();
@@ -987,10 +989,10 @@ export class ChangeModeAction extends Action {
 		const currentAssociation = this.modeService.getModeIdByFilenameOrFirstLine(basename);
 
 		const languages = this.modeService.getRegisteredLanguageNames();
-		const picks: IPickOpenEntry[] = languages.sort().map((lang, index) => {
+		const picks: IQuickPickItem[] = languages.sort().map((lang, index) => {
 			const id = this.modeService.getModeIdForLanguageName(lang.toLowerCase());
 
-			return <IPickOpenEntry>{
+			return <IQuickPickItem>{
 				id,
 				label: lang,
 				description: (id === currentAssociation) ? nls.localize('currentAssociation', "Current Association") : void 0
@@ -998,7 +1000,7 @@ export class ChangeModeAction extends Action {
 		});
 
 		TPromise.timeout(50 /* quick open is sensitive to being opened so soon after another */).done(() => {
-			this.quickOpenService.pick(picks, { placeHolder: nls.localize('pickLanguageToConfigure', "Select Language Mode to Associate with '{0}'", extension || basename) }).done(language => {
+			this.quickInputService.pick(picks, { placeHolder: nls.localize('pickLanguageToConfigure', "Select Language Mode to Associate with '{0}'", extension || basename) }).done(language => {
 				if (language) {
 					const fileAssociationsConfig = this.configurationService.inspect(FILES_ASSOCIATIONS_CONFIG);
 
@@ -1030,7 +1032,7 @@ export class ChangeModeAction extends Action {
 	}
 }
 
-export interface IChangeEOLEntry extends IPickOpenEntry {
+export interface IChangeEOLEntry extends IQuickPickItem {
 	eol: EndOfLineSequence;
 }
 
@@ -1043,7 +1045,8 @@ class ChangeIndentationAction extends Action {
 		actionId: string,
 		actionLabel: string,
 		@IEditorService private editorService: IEditorService,
-		@IQuickOpenService private quickOpenService: IQuickOpenService
+		@IQuickOpenService private quickOpenService: IQuickOpenService,
+		@IQuickInputService private quickInputService: IQuickInputService
 	) {
 		super(actionId, actionLabel);
 	}
@@ -1051,11 +1054,11 @@ class ChangeIndentationAction extends Action {
 	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") }]);
+			return this.quickInputService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
 		}
 
 		if (!isWritableCodeEditor(activeTextEditorWidget)) {
-			return this.quickOpenService.pick([{ label: nls.localize('noWritableCodeEditor', "The active code editor is read-only.") }]);
+			return this.quickInputService.pick([{ label: nls.localize('noWritableCodeEditor', "The active code editor is read-only.") }]);
 		}
 
 		const picks = [
@@ -1093,7 +1096,7 @@ export class ChangeEOLAction extends Action {
 		actionId: string,
 		actionLabel: string,
 		@IEditorService private editorService: IEditorService,
-		@IQuickOpenService private quickOpenService: IQuickOpenService
+		@IQuickInputService private quickInputService: IQuickInputService
 	) {
 		super(actionId, actionLabel);
 	}
@@ -1101,11 +1104,11 @@ export class ChangeEOLAction extends Action {
 	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") }]);
+			return this.quickInputService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
 		}
 
 		if (!isWritableCodeEditor(activeTextEditorWidget)) {
-			return this.quickOpenService.pick([{ label: nls.localize('noWritableCodeEditor', "The active code editor is read-only.") }]);
+			return this.quickInputService.pick([{ label: nls.localize('noWritableCodeEditor', "The active code editor is read-only.") }]);
 		}
 
 		const textModel = activeTextEditorWidget.getModel();
@@ -1117,7 +1120,7 @@ export class ChangeEOLAction extends Action {
 
 		const selectedIndex = (textModel && textModel.getEOL() === '\n') ? 0 : 1;
 
-		return this.quickOpenService.pick(EOLOptions, { placeHolder: nls.localize('pickEndOfLine', "Select End of Line Sequence"), autoFocus: { autoFocusIndex: selectedIndex } }).then(eol => {
+		return this.quickInputService.pick(EOLOptions, { placeHolder: nls.localize('pickEndOfLine', "Select End of Line Sequence"), activeItem: EOLOptions[selectedIndex] }).then(eol => {
 			if (eol) {
 				const activeCodeEditor = getCodeEditor(this.editorService.activeTextEditorWidget);
 				if (activeCodeEditor && isWritableCodeEditor(activeCodeEditor)) {
@@ -1139,6 +1142,7 @@ export class ChangeEncodingAction extends Action {
 		actionLabel: string,
 		@IEditorService private editorService: IEditorService,
 		@IQuickOpenService private quickOpenService: IQuickOpenService,
+		@IQuickInputService private quickInputService: IQuickInputService,
 		@ITextResourceConfigurationService private textResourceConfigurationService: ITextResourceConfigurationService,
 		@IFileService private fileService: IFileService
 	) {
@@ -1147,19 +1151,19 @@ export class ChangeEncodingAction extends Action {
 
 	run(): TPromise<any> {
 		if (!getCodeEditor(this.editorService.activeTextEditorWidget)) {
-			return this.quickOpenService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
+			return this.quickInputService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
 		}
 
 		let activeControl = this.editorService.activeControl;
 		let encodingSupport: IEncodingSupport = toEditorWithEncodingSupport(activeControl.input);
 		if (!encodingSupport) {
-			return this.quickOpenService.pick([{ label: nls.localize('noFileEditor', "No file active at this time") }]);
+			return this.quickInputService.pick([{ label: nls.localize('noFileEditor', "No file active at this time") }]);
 		}
 
-		let pickActionPromise: TPromise<IPickOpenEntry>;
+		let pickActionPromise: TPromise<IQuickPickItem>;
 
-		let saveWithEncodingPick: IPickOpenEntry;
-		let reopenWithEncodingPick: IPickOpenEntry;
+		let saveWithEncodingPick: IQuickPickItem;
+		let reopenWithEncodingPick: IQuickPickItem;
 		if (language === LANGUAGE_DEFAULT) {
 			saveWithEncodingPick = { label: nls.localize('saveWithEncoding', "Save with Encoding") };
 			reopenWithEncodingPick = { label: nls.localize('reopenWithEncoding', "Reopen with Encoding") };
@@ -1173,7 +1177,7 @@ export class ChangeEncodingAction extends Action {
 		} else if (!isWritableBaseEditor(activeControl)) {
 			pickActionPromise = TPromise.as(reopenWithEncodingPick);
 		} else {
-			pickActionPromise = this.quickOpenService.pick([reopenWithEncodingPick, saveWithEncodingPick], { placeHolder: nls.localize('pickAction', "Select Action"), matchOnDetail: true });
+			pickActionPromise = this.quickInputService.pick([reopenWithEncodingPick, saveWithEncodingPick], { placeHolder: nls.localize('pickAction', "Select Action"), matchOnDetail: true });
 		}
 
 		return pickActionPromise.then(action => {
diff --git a/src/vs/workbench/browser/parts/editor/media/breadcrumbscontrol.css b/src/vs/workbench/browser/parts/editor/media/breadcrumbscontrol.css
index 2aa84dbc6ec..e03eee35663 100644
--- a/src/vs/workbench/browser/parts/editor/media/breadcrumbscontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/breadcrumbscontrol.css
@@ -23,6 +23,10 @@
 
 /* todo@joh move somewhere else */
 
+.monaco-workbench .monaco-breadcrumbs-picker .picker-item {
+	line-height: 22px;
+}
+
 .monaco-workbench .monaco-breadcrumbs-picker .highlighting-tree {
 	height: 100%;
 	overflow: hidden;
diff --git a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
index e4cd8fb91df..a5a99f0c2bd 100644
--- a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
@@ -147,6 +147,10 @@ export class NoTabsTitleControl extends TitleControl {
 		this.redraw();
 	}
 
+	protected handleBreadcrumbsEnablementChange(): void {
+		this.redraw();
+	}
+
 	private ifActiveEditorChanged(fn: () => void): void {
 		if (
 			!this.lastRenderedActiveEditor && this.group.activeEditor || 	// active editor changed from null => editor
diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
index 605ac959776..2cf73b3bf5a 100644
--- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
@@ -145,6 +145,11 @@ export class TabsTitleControl extends TitleControl {
 		}
 	}
 
+	protected handleBreadcrumbsEnablementChange(): void {
+		// relayout when breadcrumbs are enable/disabled
+		this.group.relayout();
+	}
+
 	private registerContainerListeners(): void {
 
 		// Group dragging
diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts
index 3a123c9c218..91d2e0b3e83 100644
--- a/src/vs/workbench/browser/parts/editor/titleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/titleControl.ts
@@ -101,11 +101,11 @@ export abstract class TitleControl extends Themable {
 			if (!value && this.breadcrumbsControl) {
 				this.breadcrumbsControl.dispose();
 				this.breadcrumbsControl = undefined;
-				this.group.relayout();
+				this.handleBreadcrumbsEnablementChange();
 			} else if (value && !this.breadcrumbsControl) {
 				this.breadcrumbsControl = this.instantiationService.createInstance(BreadcrumbsControl, container, options, this.group);
 				this.breadcrumbsControl.update();
-				this.group.relayout();
+				this.handleBreadcrumbsEnablementChange();
 			}
 		});
 		if (config.value) {
@@ -113,6 +113,8 @@ export abstract class TitleControl extends Themable {
 		}
 	}
 
+	protected abstract handleBreadcrumbsEnablementChange(): void;
+
 	protected createEditorActionsToolBar(container: HTMLElement): void {
 		const context = { groupId: this.group.id } as IEditorCommandsContext;
 
diff --git a/src/vs/workbench/browser/parts/menubar/menubarPart.ts b/src/vs/workbench/browser/parts/menubar/menubarPart.ts
index b0cbfbf570f..00f43d61a10 100644
--- a/src/vs/workbench/browser/parts/menubar/menubarPart.ts
+++ b/src/vs/workbench/browser/parts/menubar/menubarPart.ts
@@ -111,7 +111,7 @@ export class MenubarPart extends Part {
 
 	private _onVisibilityChange: Emitter<boolean>;
 
-	private static MAX_MENU_RECENT_ENTRIES = 5;
+	private static MAX_MENU_RECENT_ENTRIES = 10;
 
 	constructor(
 		id: string,
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 83145223bde..7e6021ce4a4 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -927,7 +927,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 		this.updateStyles();
 	}
 
-	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> {
+	pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: TPromise<T[]> | 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);
@@ -977,15 +977,19 @@ export class QuickInputService extends Component implements IQuickInputService {
 			input.matchOnDescription = options.matchOnDescription;
 			input.matchOnDetail = options.matchOnDetail;
 			input.busy = true;
-			picks.then(items => {
-				input.busy = false;
-				input.items = items;
-				if (input.canSelectMany) {
-					input.selectedItems = items.filter(item => item.picked);
-				}
-			});
+			TPromise.join([picks, options.activeItem])
+				.then(([items, activeItem]) => {
+					input.busy = false;
+					input.items = items;
+					if (input.canSelectMany) {
+						input.selectedItems = items.filter(item => item.picked);
+					}
+					if (activeItem) {
+						input.activeItems = [activeItem];
+					}
+				});
 			input.show();
-			picks.then(null, err => {
+			TPromise.wrap(picks).then(null, err => {
 				reject(err);
 				input.hide();
 			});
diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
index e49e2d26fc5..8162f48a02e 100644
--- a/src/vs/workbench/common/editor.ts
+++ b/src/vs/workbench/common/editor.ts
@@ -25,6 +25,7 @@ export const EditorsVisibleContext = new RawContextKey<boolean>('editorIsOpen',
 export const EditorGroupActiveEditorDirtyContext = new RawContextKey<boolean>('groupActiveEditorDirty', false);
 export const NoEditorsVisibleContext: ContextKeyExpr = EditorsVisibleContext.toNegated();
 export const TextCompareEditorVisibleContext = new RawContextKey<boolean>('textCompareEditorVisible', false);
+export const TextCompareEditorActiveContext = new RawContextKey<boolean>('textCompareEditorActive', false);
 export const ActiveEditorGroupEmptyContext = new RawContextKey<boolean>('activeEditorGroupEmpty', false);
 export const MultipleEditorGroupsContext = new RawContextKey<boolean>('multipleEditorGroups', false);
 export const SingleEditorGroupsContext = MultipleEditorGroupsContext.toNegated();
diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts
index 79b40283093..161acfd709d 100644
--- a/src/vs/workbench/electron-browser/actions.ts
+++ b/src/vs/workbench/electron-browser/actions.ts
@@ -616,9 +616,11 @@ export abstract class BaseSwitchWindow extends Action {
 				action: (!this.isQuickNavigate() && currentWindowId !== win.id) ? this.closeWindowAction : void 0
 			} as IFilePickOpenEntry));
 
+			const autoFocusIndex = (picks.indexOf(picks.filter(pick => pick.payload === currentWindowId)[0]) + 1) % picks.length;
+
 			this.quickOpenService.pick(picks, {
 				contextKey: 'inWindowsPicker',
-				autoFocus: { autoFocusFirstEntry: true },
+				autoFocus: { autoFocusIndex },
 				placeHolder,
 				quickNavigateConfiguration: this.isQuickNavigate() ? { keybindings: this.keybindingService.lookupKeybindings(this.id) } : void 0
 			});
diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts
index defea5dd0cc..ed8d5ba2f2b 100644
--- a/src/vs/workbench/electron-browser/workbench.ts
+++ b/src/vs/workbench/electron-browser/workbench.ts
@@ -23,7 +23,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform';
 import { IResourceInput } from 'vs/platform/editor/common/editor';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { IEditorInputFactoryRegistry, Extensions as EditorExtensions, TextCompareEditorVisibleContext, TEXT_DIFF_EDITOR_ID, EditorsVisibleContext, InEditorZenModeContext, ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, IUntitledResourceInput, IResourceDiffInput, SplitEditorsVertically } from 'vs/workbench/common/editor';
+import { IEditorInputFactoryRegistry, Extensions as EditorExtensions, TextCompareEditorVisibleContext, TEXT_DIFF_EDITOR_ID, EditorsVisibleContext, InEditorZenModeContext, ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, IUntitledResourceInput, IResourceDiffInput, SplitEditorsVertically, TextCompareEditorActiveContext } from 'vs/workbench/common/editor';
 import { HistoryService } from 'vs/workbench/services/history/electron-browser/history';
 import { ActivitybarPart } from 'vs/workbench/browser/parts/activitybar/activitybarPart';
 import { SidebarPart } from 'vs/workbench/browser/parts/sidebar/sidebarPart';
@@ -597,17 +597,24 @@ export class Workbench extends Disposable implements IPartService {
 	private handleContextKeys(): void {
 		this.inZenMode = InEditorZenModeContext.bindTo(this.contextKeyService);
 
+		(new RawContextKey<boolean>('isMac', isMacintosh)).bindTo(this.contextKeyService);
+		(new RawContextKey<boolean>('isLinux', isLinux)).bindTo(this.contextKeyService);
+		(new RawContextKey<boolean>('isWindows', isWindows)).bindTo(this.contextKeyService);
+
 		const sidebarVisibleContextRaw = new RawContextKey<boolean>('sidebarVisible', false);
 		this.sideBarVisibleContext = sidebarVisibleContextRaw.bindTo(this.contextKeyService);
 
 		const editorsVisibleContext = EditorsVisibleContext.bindTo(this.contextKeyService);
 		const textCompareEditorVisible = TextCompareEditorVisibleContext.bindTo(this.contextKeyService);
+		const textCompareEditorActive = TextCompareEditorActiveContext.bindTo(this.contextKeyService);
 		const activeEditorGroupEmpty = ActiveEditorGroupEmptyContext.bindTo(this.contextKeyService);
 		const multipleEditorGroups = MultipleEditorGroupsContext.bindTo(this.contextKeyService);
 
 		const updateEditorContextKeys = () => {
+			const activeControl = this.editorService.activeControl;
 			const visibleEditors = this.editorService.visibleControls;
 
+			textCompareEditorActive.set(activeControl && activeControl.getId() === TEXT_DIFF_EDITOR_ID);
 			textCompareEditorVisible.set(visibleEditors.some(control => control.getId() === TEXT_DIFF_EDITOR_ID));
 
 			if (visibleEditors.length > 0) {
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 54006b5ff83..513c3d605ce 100644
--- a/src/vs/workbench/parts/cli/electron-browser/cli.contribution.ts
+++ b/src/vs/workbench/parts/cli/electron-browser/cli.contribution.ts
@@ -10,7 +10,6 @@ import * as pfs from 'vs/base/node/pfs';
 import * as platform from 'vs/base/common/platform';
 import { nfcall } from 'vs/base/common/async';
 import { TPromise } from 'vs/base/common/winjs.base';
-import URI from 'vs/base/common/uri';
 import { Action } from 'vs/base/common/actions';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -20,6 +19,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import Severity from 'vs/base/common/severity';
 import { ILogService } from 'vs/platform/log/common/log';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 function ignore<T>(code: string, value: T = null): (err: any) => TPromise<T> {
 	return err => err.code === code ? TPromise.as<T>(value) : TPromise.wrapError<T>(err);
@@ -28,7 +28,7 @@ function ignore<T>(code: string, value: T = null): (err: any) => TPromise<T> {
 let _source: string = null;
 function getSource(): string {
 	if (!_source) {
-		const root = URI.parse(require.toUrl('')).fsPath;
+		const root = getPathFromAmdModule(require, '');
 		_source = path.resolve(root, '..', 'bin', 'code');
 	}
 	return _source;
diff --git a/src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts b/src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts
index 41fd94bf268..de324d7d2f0 100644
--- a/src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts
+++ b/src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts
@@ -25,7 +25,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { SimpleCommentEditor } from './simpleCommentEditor';
 import URI from 'vs/base/common/uri';
-import { transparent, editorForeground, inputValidationErrorBorder, textLinkActiveForeground, textLinkForeground, focusBorder, textBlockQuoteBackground, textBlockQuoteBorder, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
+import { transparent, editorForeground, textLinkActiveForeground, textLinkForeground, focusBorder, textBlockQuoteBackground, textBlockQuoteBorder, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';
@@ -354,9 +354,14 @@ export class ReviewZoneWidget extends ZoneWidget {
 
 		this._localToDispose.push(this._commentEditor.onKeyDown((ev: IKeyboardEvent) => {
 			const hasExistingComments = this._commentThread.comments.length > 0;
-			if (this._commentEditor.getModel().getValueLength() === 0 && ev.keyCode === KeyCode.Escape && hasExistingComments) {
-				if (dom.hasClass(this._commentForm, 'expand')) {
-					dom.removeClass(this._commentForm, 'expand');
+
+			if (this._commentEditor.getModel().getValueLength() === 0 && ev.keyCode === KeyCode.Escape) {
+				if (hasExistingComments) {
+					if (dom.hasClass(this._commentForm, 'expand')) {
+						dom.removeClass(this._commentForm, 'expand');
+					}
+				} else {
+					this.dispose();
 				}
 			}
 		}));
@@ -366,23 +371,17 @@ export class ReviewZoneWidget extends ZoneWidget {
 		const button = new Button(formActions);
 		attachButtonStyler(button, this.themeService);
 		button.label = 'Add comment';
-		button.onDidClick(async () => {
-			if (!this._commentEditor.getValue()) {
-				this._commentEditor.focus();
-				this._commentEditor.getDomNode().style.outline = `1px solid ${this.themeService.getTheme().getColor(inputValidationErrorBorder)}`;
 
-
-				this._disposables.push(this._commentEditor.onDidChangeModelContent(_ => {
-					if (!this._commentEditor.getValue()) {
-						this._commentEditor.getDomNode().style.outline = `1px solid ${this.themeService.getTheme().getColor(inputValidationErrorBorder)}`;
-					} else {
-						this._commentEditor.getDomNode().style.outline = '';
-					}
-				}));
-
-				return;
+		button.enabled = false;
+		this._localToDispose.push(this._commentEditor.onDidChangeModelContent(_ => {
+			if (this._commentEditor.getValue()) {
+				button.enabled = true;
+			} else {
+				button.enabled = false;
 			}
+		}));
 
+		button.onDidClick(async () => {
 			let newCommentThread;
 			if (this._commentThread.threadId) {
 				// reply
diff --git a/src/vs/workbench/parts/debug/node/debugger.ts b/src/vs/workbench/parts/debug/node/debugger.ts
index cde530adaef..a341ff73572 100644
--- a/src/vs/workbench/parts/debug/node/debugger.ts
+++ b/src/vs/workbench/parts/debug/node/debugger.ts
@@ -19,10 +19,10 @@ import { IOutputService } from 'vs/workbench/parts/output/common/output';
 import { DebugAdapter, SocketDebugAdapter } from 'vs/workbench/parts/debug/node/debugAdapter';
 import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
 import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
-import uri from 'vs/base/common/uri';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { memoize } from 'vs/base/common/decorators';
 import { TaskDefinitionRegistry } from 'vs/workbench/parts/tasks/common/taskDefinitionRegistry';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export class Debugger {
 
@@ -173,7 +173,7 @@ export class Debugger {
 			return telemetryInfo;
 		}).then(data => {
 			const client = new TelemetryClient(
-				uri.parse(require.toUrl('bootstrap')).fsPath,
+				getPathFromAmdModule(require, 'bootstrap'),
 				{
 					serverName: 'Debug Telemetry',
 					timeout: 1000 * 60 * 5,
diff --git a/src/vs/workbench/parts/debug/node/terminals.ts b/src/vs/workbench/parts/debug/node/terminals.ts
index a46ea642248..00ff6960cb4 100644
--- a/src/vs/workbench/parts/debug/node/terminals.ts
+++ b/src/vs/workbench/parts/debug/node/terminals.ts
@@ -11,8 +11,8 @@ import * as env from 'vs/base/common/platform';
 import * as pfs from 'vs/base/node/pfs';
 import { assign } from 'vs/base/common/objects';
 import { TPromise } from 'vs/base/common/winjs.base';
-import uri from 'vs/base/common/uri';
 import { ITerminalLauncher, ITerminalSettings } from 'vs/workbench/parts/debug/common/debug';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 const TERMINAL_TITLE = nls.localize('console.title', "VS Code Console");
 
@@ -132,7 +132,7 @@ class MacTerminalService extends TerminalLauncher {
 				// and then launches the program inside that window.
 
 				const script = terminalApp === MacTerminalService.DEFAULT_TERMINAL_OSX ? 'TerminalHelper' : 'iTermHelper';
-				const scriptpath = uri.parse(require.toUrl(`vs/workbench/parts/execution/electron-browser/${script}.scpt`)).fsPath;
+				const scriptpath = getPathFromAmdModule(require, `vs/workbench/parts/execution/electron-browser/${script}.scpt`);
 
 				const osaArgs = [
 					scriptpath,
@@ -415,4 +415,4 @@ export function prepareCommand(args: DebugProtocol.RunInTerminalRequestArguments
 	}
 
 	return command;
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/execution/electron-browser/terminalService.ts b/src/vs/workbench/parts/execution/electron-browser/terminalService.ts
index 275f11a662e..b1835830812 100644
--- a/src/vs/workbench/parts/execution/electron-browser/terminalService.ts
+++ b/src/vs/workbench/parts/execution/electron-browser/terminalService.ts
@@ -15,8 +15,8 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { ITerminalService } from 'vs/workbench/parts/execution/common/execution';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ITerminalConfiguration, getDefaultTerminalWindows, getDefaultTerminalLinuxReady, DEFAULT_TERMINAL_OSX } from 'vs/workbench/parts/execution/electron-browser/terminal';
-import uri from 'vs/base/common/uri';
 import { IProcessEnvironment } from 'vs/base/common/platform';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 const TERMINAL_TITLE = nls.localize('console.title', "VS Code Console");
 
@@ -143,7 +143,7 @@ export class MacTerminalService implements ITerminalService {
 				// and then launches the program inside that window.
 
 				const script = terminalApp === DEFAULT_TERMINAL_OSX ? 'TerminalHelper' : 'iTermHelper';
-				const scriptpath = uri.parse(require.toUrl(`vs/workbench/parts/execution/electron-browser/${script}.scpt`)).fsPath;
+				const scriptpath = getPathFromAmdModule(require, `vs/workbench/parts/execution/electron-browser/${script}.scpt`);
 
 				const osaArgs = [
 					scriptpath,
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
index 8fc5ed3bca1..70edc1d5fab 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
@@ -801,7 +801,8 @@ export class WorkspaceRecommendedExtensionsView extends ExtensionsListView {
 	}
 
 	async show(query: string): Promise<IPagedModel<IExtension>> {
-		let model = await ((query && query.trim() !== '@recommended') ? this.showEmptyModel() : super.show(this.recommendedExtensionsQuery));
+		let shouldShowEmptyView = query && query.trim() !== '@recommended' && query.trim() !== '@recommended:workspace';
+		let model = await (shouldShowEmptyView ? this.showEmptyModel() : super.show(this.recommendedExtensionsQuery));
 		this.setExpanded(model.length > 0);
 		return model;
 	}
diff --git a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
index 411ed8b209f..7da387ac880 100644
--- a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
+++ b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
@@ -218,7 +218,7 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 		assert.equal('1.2.0', actual.version);
 		assert.equal('1.2.0', actual.latestVersion);
 		assert.equal('localDescription2', actual.description);
-		assert.ok(fs.existsSync(actual.iconUrl));
+		assert.ok(fs.existsSync(URI.parse(actual.iconUrl).fsPath));
 		assert.equal(null, actual.licenseUrl);
 		assert.equal(ExtensionState.Installed, actual.state);
 		assert.equal(null, actual.installCount);
@@ -311,7 +311,7 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 			assert.equal('1.2.0', actual.version);
 			assert.equal('1.2.0', actual.latestVersion);
 			assert.equal('localDescription2', actual.description);
-			assert.ok(fs.existsSync(actual.iconUrl));
+			assert.ok(fs.existsSync(URI.parse(actual.iconUrl).fsPath));
 			assert.equal(null, actual.licenseUrl);
 			assert.equal(ExtensionState.Installed, actual.state);
 			assert.equal(null, actual.installCount);
@@ -1282,4 +1282,4 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 			});
 		});
 	}
-});
\ No newline at end of file
+});
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 7656b2f3b24..f6b90bd8536 100644
--- a/src/vs/workbench/parts/files/electron-browser/files.contribution.ts
+++ b/src/vs/workbench/parts/files/electron-browser/files.contribution.ts
@@ -293,8 +293,8 @@ configurationRegistry.registerConfiguration({
 			'default': HotExitConfiguration.ON_EXIT,
 			'enumDescriptions': [
 				nls.localize('hotExit.off', 'Disable hot exit.'),
-				nls.localize('hotExit.onExit', 'Hot exit will be triggered when the last window is closed on Windows/Linux or when the `workbench.action.quit command` is triggered (command palette, keybinding, menu). All windows with backups will be restored upon next launch.'),
-				nls.localize('hotExit.onExitAndWindowClose', 'Hot exit will be triggered when the last window is closed on Windows/Linux or when the `workbench.action.quit command` is triggered (command palette, keybinding, menu), and also for any window with a folder opened regardless of whether it\'s the last window. All windows without folders opened will be restored upon next launch. To restore folder windows as they were before shutdown set `#window.restoreWindows#` to `all`.')
+				nls.localize('hotExit.onExit', 'Hot exit will be triggered when the last window is closed on Windows/Linux or when the `workbench.action.quit` command is triggered (command palette, keybinding, menu). All windows with backups will be restored upon next launch.'),
+				nls.localize('hotExit.onExitAndWindowClose', 'Hot exit will be triggered when the last window is closed on Windows/Linux or when the `workbench.action.quit` command is triggered (command palette, keybinding, menu), and also for any window with a folder opened regardless of whether it\'s the last window. All windows without folders opened will be restored upon next launch. To restore folder windows as they were before shutdown set `#window.restoreWindows#` to `all`.')
 			],
 			'description': nls.localize('hotExit', "Controls whether unsaved files are remembered between sessions, allowing the save prompt when exiting the editor to be skipped.", HotExitConfiguration.ON_EXIT, HotExitConfiguration.ON_EXIT_AND_WINDOW_CLOSE)
 		},
diff --git a/src/vs/workbench/parts/preferences/browser/settingsTree.ts b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
index 9c4f5528e00..0afa7baa54c 100644
--- a/src/vs/workbench/parts/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
@@ -1250,7 +1250,9 @@ function getDisplayEnumOptions(setting: ISetting): string[] {
 			});
 	}
 
-	return setting.enum.map(escapeInvisibleChars);
+	return setting.enum
+		.map(String)
+		.map(escapeInvisibleChars);
 }
 
 function escapeInvisibleChars(enumValue: string): string {
diff --git a/src/vs/workbench/parts/terminal/common/terminal.ts b/src/vs/workbench/parts/terminal/common/terminal.ts
index 245a8ac3a6e..b7a2c8e5915 100644
--- a/src/vs/workbench/parts/terminal/common/terminal.ts
+++ b/src/vs/workbench/parts/terminal/common/terminal.ts
@@ -97,8 +97,6 @@ export interface ITerminalConfiguration {
 		windows: { [key: string]: string };
 	};
 	showExitAlert: boolean;
-	experimentalRestore: boolean;
-	experimentalTextureCachingStrategy: 'static' | 'dynamic';
 }
 
 export interface ITerminalConfigHelper {
diff --git a/src/vs/workbench/parts/terminal/common/terminalService.ts b/src/vs/workbench/parts/terminal/common/terminalService.ts
index 2c28f173a59..c1650928b9d 100644
--- a/src/vs/workbench/parts/terminal/common/terminalService.ts
+++ b/src/vs/workbench/parts/terminal/common/terminalService.ts
@@ -6,14 +6,12 @@
 import * as errors from 'vs/base/common/errors';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { ITerminalService, ITerminalInstance, IShellLaunchConfig, ITerminalConfigHelper, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE, TERMINAL_PANEL_ID, ITerminalTab, ITerminalProcessExtHostProxy, ITerminalProcessExtHostRequest, KEYBINDING_CONTEXT_TERMINAL_IS_OPEN } from 'vs/workbench/parts/terminal/common/terminal';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-
-const TERMINAL_STATE_STORAGE_KEY = 'terminal.state';
+import { IStorageService } from 'vs/platform/storage/common/storage';
 
 export abstract class TerminalService implements ITerminalService {
 	public _serviceBrand: any;
@@ -70,8 +68,6 @@ export abstract class TerminalService implements ITerminalService {
 		this._findWidgetVisible = KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE.bindTo(this._contextKeyService);
 		this.onTabDisposed(tab => this._removeTab(tab));
 
-		lifecycleService.when(LifecyclePhase.Restoring).then(() => this._restoreTabs());
-
 		this._handleContextKeys();
 	}
 
@@ -94,29 +90,6 @@ export abstract class TerminalService implements ITerminalService {
 	public abstract setContainers(panelContainer: HTMLElement, terminalContainer: HTMLElement): void;
 	public abstract requestExtHostProcess(proxy: ITerminalProcessExtHostProxy, shellLaunchConfig: IShellLaunchConfig, cols: number, rows: number): void;
 
-	private _restoreTabs(): void {
-		if (!this.configHelper.config.experimentalRestore) {
-			return;
-		}
-
-		const tabConfigsJson = this._storageService.get(TERMINAL_STATE_STORAGE_KEY, StorageScope.WORKSPACE);
-		if (!tabConfigsJson) {
-			return;
-		}
-
-		const tabConfigs = <{ instances: IShellLaunchConfig[] }[]>JSON.parse(tabConfigsJson);
-		if (!Array.isArray(tabConfigs)) {
-			return;
-		}
-
-		tabConfigs.forEach(tabConfig => {
-			const instance = this.createTerminal(tabConfig.instances[0]);
-			for (let i = 1; i < tabConfig.instances.length; i++) {
-				this.splitInstance(instance, tabConfig.instances[i]);
-			}
-		});
-	}
-
 	private _onWillShutdown(): boolean | TPromise<boolean> {
 		if (this.terminalInstances.length === 0) {
 			// No terminal instances, don't veto
@@ -139,16 +112,6 @@ export abstract class TerminalService implements ITerminalService {
 	}
 
 	private _onShutdown(): void {
-		// Store terminal tab layout
-		if (this.configHelper.config.experimentalRestore) {
-			const configs = this.terminalTabs.map(tab => {
-				return {
-					instances: tab.terminalInstances.map(instance => instance.shellLaunchConfig)
-				};
-			});
-			this._storageService.store(TERMINAL_STATE_STORAGE_KEY, JSON.stringify(configs), StorageScope.WORKSPACE);
-		}
-
 		// Dispose of all instances
 		this.terminalInstances.forEach(instance => instance.dispose());
 	}
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 4e288255067..fa2894cbcae 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
@@ -356,19 +356,7 @@ configurationRegistry.registerConfiguration({
 			description: nls.localize('terminal.integrated.showExitAlert', "Controls whether to show the alert \"The terminal process terminated with exit code\" when exit code is non-zero."),
 			type: 'boolean',
 			default: true
-		},
-		'terminal.integrated.experimentalRestore': {
-			description: nls.localize('terminal.integrated.experimentalRestore', "Controls whether to restore terminal sessions for the workspace automatically when launching VS Code. This is an experimental setting; it may be buggy and could change or be removed in the future."),
-			type: 'boolean',
-			default: false
-		},
-		// TODO: Default to dynamic and remove setting in 1.27
-		'terminal.integrated.experimentalTextureCachingStrategy': {
-			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: 'dynamic'
-		},
+		}
 	}
 });
 
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
index 42174a7c0ac..0b7ed17b6dc 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
@@ -293,7 +293,8 @@ export class TerminalInstance implements ITerminalInstance {
 			rightClickSelectsWord: config.rightClickBehavior === 'selectWord',
 			// TODO: Guess whether to use canvas or dom better
 			rendererType: config.rendererType === 'auto' ? 'canvas' : config.rendererType,
-			experimentalCharAtlas: config.experimentalTextureCachingStrategy
+			// TODO: Remove this once the setting is removed upstream
+			experimentalCharAtlas: 'dynamic'
 		});
 		if (this._shellLaunchConfig.initialText) {
 			this._xterm.writeln(this._shellLaunchConfig.initialText);
diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
index c81582ead3b..c3c0cf180a6 100644
--- a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
+++ b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
@@ -158,6 +158,13 @@ export class ReleaseNotesManager {
 		if (!this._releaseNotesCache[version]) {
 			this._releaseNotesCache[version] = this._requestService.request({ url })
 				.then(asText)
+				.then(text => {
+					if (!/^#\s/.test(text)) { // release notes always starts with `#` followed by whitespace
+						return TPromise.wrapError<string>(new Error('Invalid release notes'));
+					}
+
+					return TPromise.wrap(text);
+				})
 				.then(text => patchKeybindings(text));
 		}
 
diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
index 2ce9bd83b96..9aa410943f5 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.ts
@@ -30,6 +30,7 @@ import { IWindowService } from 'vs/platform/windows/common/windows';
 import { ReleaseNotesManager } from './releaseNotesEditor';
 import { isWindows } from 'vs/base/common/platform';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import * as Registry from 'winreg';
 
 let releaseNotesManager: ReleaseNotesManager | undefined = undefined;
 
@@ -209,9 +210,27 @@ export class Win3264BitContribution implements IWorkbenchContribution {
 	}
 }
 
+async function isUserSetupInstalled(): Promise<boolean> {
+	const rawUserAppId = process.arch === 'x64' ? product.win32x64UserAppId : product.win32UserAppId;
+	const userAppId = rawUserAppId.replace(/^\{\{/, '{');
+	const key = new Registry({
+		hive: Registry.HKCU,
+		key: `\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${userAppId}_is1`
+	});
+
+	try {
+		await new Promise((c, e) => key.get('', (err, result) => err ? e(err) : c(result)));
+	} catch (err) {
+		return false;
+	}
+
+	return true;
+}
+
 export class WinUserSetupContribution implements IWorkbenchContribution {
 
 	private static readonly KEY = 'update/win32-usersetup';
+	private static readonly KEY_BOTH = 'update/win32-usersetup-both';
 
 	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';
@@ -247,35 +266,63 @@ export class WinUserSetupContribution implements IWorkbenchContribution {
 			return;
 		}
 
-		const neverShowAgain = new NeverShowAgain(WinUserSetupContribution.KEY, this.storageService);
+		isUserSetupInstalled().then(userSetupIsInstalled => {
+			if (userSetupIsInstalled) {
+				const neverShowAgain = new NeverShowAgain(WinUserSetupContribution.KEY_BOTH, this.storageService);
 
-		if (!neverShowAgain.shouldShow()) {
-			return;
-		}
+				if (!neverShowAgain.shouldShow()) {
+					return;
+				}
 
-		const handle = this.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);
+				const handle = this.notificationService.prompt(
+					severity.Warning,
+					nls.localize('usersetupsystem', "You are running the system-wide installation of {0}, while having the user-wide distribution installed as well. Make sure you're running the {0} version you expect.", product.nameShort),
+					[
+						{
+							label: nls.localize('ok', "OK"),
+							run: () => null
+						},
+						{
+							label: nls.localize('neveragain', "Don't Show Again"),
+							isSecondary: true,
+							run: () => {
+								neverShowAgain.action.run(handle);
+								neverShowAgain.action.dispose();
+							}
+						}]
+				);
+			} else {
+				const neverShowAgain = new NeverShowAgain(WinUserSetupContribution.KEY, this.storageService);
 
-						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();
-					}
-				}]
-		);
+				if (!neverShowAgain.shouldShow()) {
+					return;
+				}
+
+				const handle = this.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();
+							}
+						}]
+				);
+			}
+		});
 	}
 
 	dispose(): void {
diff --git a/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts b/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts
index 257d791463e..3c76c9bedb4 100644
--- a/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts
+++ b/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts
@@ -49,17 +49,28 @@ export class TelemetryOptOut implements IWorkbenchContribution {
 			const privacyUrl = product.privacyStatementUrl || product.telemetryOptOutUrl;
 
 			if (experimentState && experimentState.state === ExperimentState.Run && telemetryService.isOptedIn) {
+				const logTelemetry = (optout: boolean) => {
+					/* __GDPR__
+						"experiments:optout" : {
+							"optOut": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
+						}
+					*/
+					telemetryService.publicLog('experiments:optout', { optout });
+				};
 				notificationService.prompt(
 					Severity.Info,
 					localize('telemetryOptOut.optOutOption', "Please help Microsoft improve Visual Studio Code by allowing the collection of usage data. Read our [privacy statement]({0}) for more details.", privacyUrl),
 					[
 						{
 							label: localize('telemetryOptOut.OptIn', "Yes, glad to help"),
-							run: () => { }
+							run: () => {
+								logTelemetry(false);
+							}
 						},
 						{
 							label: localize('telemetryOptOut.OptOut', "No, thanks"),
 							run: () => {
+								logTelemetry(true);
 								configurationService.updateValue('telemetry.enableTelemetry', false);
 								configurationService.updateValue('telemetry.enableCrashReporter', false);
 							}
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
index 84a39c92a4b..16a25f5dbea 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
@@ -8,7 +8,6 @@
 import * as nls from 'vs/nls';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import * as objects from 'vs/base/common/objects';
-import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { isWindows, isLinux } from 'vs/base/common/platform';
 import { findFreePort } from 'vs/base/node/ports';
@@ -36,6 +35,7 @@ import { IRemoteConsoleLog, log, parse } from 'vs/base/node/console';
 import { getScopes } from 'vs/platform/configuration/common/configurationRegistry';
 import { ILogService } from 'vs/platform/log/common/log';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export class ExtensionHostProcessWorker {
 
@@ -171,7 +171,7 @@ export class ExtensionHostProcessWorker {
 				}
 
 				// Run Extension Host as fork of current process
-				this._extensionHostProcess = fork(URI.parse(require.toUrl('bootstrap')).fsPath, ['--type=extensionHost'], opts);
+				this._extensionHostProcess = fork(getPathFromAmdModule(require, 'bootstrap'), ['--type=extensionHost'], opts);
 
 				// Catch all output coming from the extension host process
 				type Output = { data: string, format: string[] };
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
index 35e8c870c9b..a46a116e22e 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
@@ -43,18 +43,19 @@ import { RPCProtocol } from 'vs/workbench/services/extensions/node/rpcProtocol';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 import { Schemas } from 'vs/base/common/network';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 let _SystemExtensionsRoot: string = null;
 function getSystemExtensionsRoot(): string {
 	if (!_SystemExtensionsRoot) {
-		_SystemExtensionsRoot = path.normalize(path.join(URI.parse(require.toUrl('')).fsPath, '..', 'extensions'));
+		_SystemExtensionsRoot = path.normalize(path.join(getPathFromAmdModule(require, ''), '..', 'extensions'));
 	}
 	return _SystemExtensionsRoot;
 }
 let _ExtraDevSystemExtensionsRoot: string = null;
 function getExtraDevSystemExtensionsRoot(): string {
 	if (!_ExtraDevSystemExtensionsRoot) {
-		_ExtraDevSystemExtensionsRoot = path.normalize(path.join(URI.parse(require.toUrl('')).fsPath, '..', '.build', 'builtInExtensions'));
+		_ExtraDevSystemExtensionsRoot = path.normalize(path.join(getPathFromAmdModule(require, ''), '..', '.build', 'builtInExtensions'));
 	}
 	return _ExtraDevSystemExtensionsRoot;
 }
@@ -796,7 +797,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 			let finalBuiltinExtensions: TPromise<IExtensionDescription[]> = TPromise.wrap(builtinExtensions);
 
 			if (devMode) {
-				const builtInExtensionsFilePath = path.normalize(path.join(URI.parse(require.toUrl('')).fsPath, '..', 'build', 'builtInExtensions.json'));
+				const builtInExtensionsFilePath = path.normalize(path.join(getPathFromAmdModule(require, ''), '..', 'build', 'builtInExtensions.json'));
 				const builtInExtensions = pfs.readFile(builtInExtensionsFilePath, 'utf8')
 					.then<IBuiltInExtension[]>(raw => JSON.parse(raw));
 
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 d2791142347..f522fba51c8 100644
--- a/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts
@@ -7,7 +7,6 @@
 
 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';
 import { toFileChangesEvent, IRawFileChange } from 'vs/workbench/services/files/node/watcher/common';
 import { IWatcherChannel, WatcherChannelClient } from 'vs/workbench/services/files/node/watcher/nsfw/watcherIpc';
 import { FileChangesEvent, IFilesConfiguration } from 'vs/platform/files/common/files';
@@ -17,6 +16,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Schemas } from 'vs/base/common/network';
 import { filterEvent } from 'vs/base/common/event';
 import { IWatchError } from 'vs/workbench/services/files/node/watcher/nsfw/watcher';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export class FileWatcher {
 	private static readonly MAX_RESTARTS = 5;
@@ -39,7 +39,7 @@ export class FileWatcher {
 
 	public startWatching(): () => void {
 		const client = new Client(
-			uri.parse(require.toUrl('bootstrap')).fsPath,
+			getPathFromAmdModule(require, 'bootstrap'),
 			{
 				serverName: 'Watcher',
 				args: ['--type=watcherService'],
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 45ca79e02f5..2dc1effa571 100644
--- a/src/vs/workbench/services/files/node/watcher/unix/watcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/unix/watcherService.ts
@@ -7,7 +7,6 @@
 
 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';
 import { toFileChangesEvent, IRawFileChange } from 'vs/workbench/services/files/node/watcher/common';
 import { IWatcherChannel, WatcherChannelClient } from 'vs/workbench/services/files/node/watcher/unix/watcherIpc';
 import { FileChangesEvent, IFilesConfiguration } from 'vs/platform/files/common/files';
@@ -17,6 +16,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 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';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export class FileWatcher {
 	private static readonly MAX_RESTARTS = 5;
@@ -42,7 +42,7 @@ export class FileWatcher {
 		const args = ['--type=watcherService'];
 
 		const client = new Client(
-			uri.parse(require.toUrl('bootstrap')).fsPath,
+			getPathFromAmdModule(require, 'bootstrap'),
 			{
 				serverName: 'Watcher',
 				args,
@@ -122,4 +122,4 @@ export class FileWatcher {
 		this.isDisposed = true;
 		this.toDispose = dispose(this.toDispose);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts b/src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts
index 949c3d1b36f..8c18ce5b640 100644
--- a/src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts
@@ -10,9 +10,9 @@ import * as cp from 'child_process';
 import { FileChangeType } from 'vs/platform/files/common/files';
 import * as decoder from 'vs/base/node/decoder';
 import * as glob from 'vs/base/common/glob';
-import uri from 'vs/base/common/uri';
 
 import { IRawFileChange } from 'vs/workbench/services/files/node/watcher/common';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export class OutOfProcessWin32FolderWatcher {
 
@@ -41,7 +41,7 @@ export class OutOfProcessWin32FolderWatcher {
 			args.push('-verbose');
 		}
 
-		this.handle = cp.spawn(uri.parse(require.toUrl('vs/workbench/services/files/node/watcher/win32/CodeHelper.exe')).fsPath, args);
+		this.handle = cp.spawn(getPathFromAmdModule(require, 'vs/workbench/services/files/node/watcher/win32/CodeHelper.exe'), args);
 
 		const stdoutLineDecoder = new decoder.LineDecoder();
 
@@ -116,4 +116,4 @@ export class OutOfProcessWin32FolderWatcher {
 			this.handle = null;
 		}
 	}
-}
\ No newline at end of file
+}
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 e57b8041f6b..6d834e52b6a 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
@@ -24,6 +24,7 @@ import { Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/work
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { TextModel } from 'vs/editor/common/model/textModel';
 import { IEncodingOverride } from 'vs/workbench/services/files/electron-browser/encoding';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 suite('FileService', () => {
 	let service: FileService;
@@ -33,7 +34,7 @@ suite('FileService', () => {
 	setup(function () {
 		const id = uuid.generateUuid();
 		testDir = path.join(parentDir, id);
-		const sourceDir = require.toUrl('./fixtures/service');
+		const sourceDir = getPathFromAmdModule(require, './fixtures/service');
 
 		return pfs.copy(sourceDir, testDir).then(() => {
 			service = new FileService(new TestContextService(new Workspace(testDir, testDir, toWorkspaceFolders([{ path: testDir }]))), TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), new TestStorageService(), new TestNotificationService(), { disableWatcher: true });
@@ -837,7 +838,7 @@ suite('FileService', () => {
 		// setup
 		const _id = uuid.generateUuid();
 		const _testDir = path.join(parentDir, _id);
-		const _sourceDir = require.toUrl('./fixtures/service');
+		const _sourceDir = getPathFromAmdModule(require, './fixtures/service');
 
 		return pfs.copy(_sourceDir, _testDir).then(() => {
 			const encodingOverride: IEncodingOverride[] = [];
@@ -882,7 +883,7 @@ suite('FileService', () => {
 		// setup
 		const _id = uuid.generateUuid();
 		const _testDir = path.join(parentDir, _id);
-		const _sourceDir = require.toUrl('./fixtures/service');
+		const _sourceDir = getPathFromAmdModule(require, './fixtures/service');
 
 		return pfs.copy(_sourceDir, _testDir).then(() => {
 			const encodingOverride: IEncodingOverride[] = [];
@@ -927,7 +928,7 @@ suite('FileService', () => {
 		// setup
 		const _id = uuid.generateUuid();
 		const _testDir = path.join(parentDir, _id);
-		const _sourceDir = require.toUrl('./fixtures/service');
+		const _sourceDir = getPathFromAmdModule(require, './fixtures/service');
 		const resource = uri.file(path.join(testDir, 'index.html'));
 
 		const _service = new FileService(
diff --git a/src/vs/workbench/services/files/test/electron-browser/resolver.test.ts b/src/vs/workbench/services/files/test/electron-browser/resolver.test.ts
index 3a9c19ad869..11222a1f411 100644
--- a/src/vs/workbench/services/files/test/electron-browser/resolver.test.ts
+++ b/src/vs/workbench/services/files/test/electron-browser/resolver.test.ts
@@ -13,9 +13,10 @@ import { StatResolver } from 'vs/workbench/services/files/electron-browser/fileS
 import uri from 'vs/base/common/uri';
 import { isLinux } from 'vs/base/common/platform';
 import * as utils from 'vs/workbench/services/files/test/electron-browser/utils';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 function create(relativePath: string): StatResolver {
-	let basePath = require.toUrl('./fixtures/resolver');
+	let basePath = getPathFromAmdModule(require, './fixtures/resolver');
 	let absolutePath = relativePath ? path.join(basePath, relativePath) : basePath;
 	let fsStat = fs.statSync(absolutePath);
 
@@ -23,7 +24,7 @@ function create(relativePath: string): StatResolver {
 }
 
 function toResource(relativePath: string): uri {
-	let basePath = require.toUrl('./fixtures/resolver');
+	let basePath = getPathFromAmdModule(require, './fixtures/resolver');
 	let absolutePath = relativePath ? path.join(basePath, relativePath) : basePath;
 
 	return uri.file(absolutePath);
diff --git a/src/vs/workbench/services/keybinding/test/keyboardMapperTestUtils.ts b/src/vs/workbench/services/keybinding/test/keyboardMapperTestUtils.ts
index 6cf36eab48f..5d5bf78f5af 100644
--- a/src/vs/workbench/services/keybinding/test/keyboardMapperTestUtils.ts
+++ b/src/vs/workbench/services/keybinding/test/keyboardMapperTestUtils.ts
@@ -12,6 +12,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { readFile, writeFile } from 'vs/base/node/pfs';
 import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
 import { ScanCodeBinding } from 'vs/workbench/services/keybinding/common/scanCode';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export interface IResolvedKeybinding {
 	label: string;
@@ -51,7 +52,7 @@ export function assertResolveUserBinding(mapper: IKeyboardMapper, firstPart: Sim
 }
 
 export function readRawMapping<T>(file: string): TPromise<T> {
-	return readFile(require.toUrl(`vs/workbench/services/keybinding/test/${file}.js`)).then((buff) => {
+	return readFile(getPathFromAmdModule(require, `vs/workbench/services/keybinding/test/${file}.js`)).then((buff) => {
 		let contents = buff.toString();
 		let func = new Function('define', contents);
 		let rawMappings: T = null;
@@ -63,7 +64,7 @@ export function readRawMapping<T>(file: string): TPromise<T> {
 }
 
 export function assertMapping(writeFileIfDifferent: boolean, mapper: IKeyboardMapper, file: string): TPromise<void> {
-	const filePath = require.toUrl(`vs/workbench/services/keybinding/test/${file}`);
+	const filePath = getPathFromAmdModule(require, `vs/workbench/services/keybinding/test/${file}`);
 
 	return readFile(filePath).then((buff) => {
 		let expected = buff.toString();
diff --git a/src/vs/workbench/services/preferences/common/preferencesModels.ts b/src/vs/workbench/services/preferences/common/preferencesModels.ts
index 2bb3302a828..1898d088670 100644
--- a/src/vs/workbench/services/preferences/common/preferencesModels.ts
+++ b/src/vs/workbench/services/preferences/common/preferencesModels.ts
@@ -899,7 +899,7 @@ class SettingsContentBuilder {
 
 		if (setting.enumDescriptions && setting.enumDescriptions.some(desc => !!desc)) {
 			setting.enumDescriptions.forEach((desc, i) => {
-				const displayEnum = escapeInvisibleChars(setting.enum[i]);
+				const displayEnum = escapeInvisibleChars(String(setting.enum[i]));
 				const line = desc ?
 					`${displayEnum}: ${fixSettingLink(desc)}` :
 					displayEnum;
diff --git a/src/vs/workbench/services/search/node/searchService.ts b/src/vs/workbench/services/search/node/searchService.ts
index f89264988a1..5d0ce0948d9 100644
--- a/src/vs/workbench/services/search/node/searchService.ts
+++ b/src/vs/workbench/services/search/node/searchService.ts
@@ -26,6 +26,7 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IRawSearch, IRawSearchService, ISerializedFileMatch, ISerializedSearchComplete, ISerializedSearchProgressItem, isSerializedSearchComplete, isSerializedSearchSuccess, ITelemetryEvent } from './search';
 import { ISearchChannel, SearchChannelClient } from './searchIpc';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export class SearchService extends Disposable implements ISearchService {
 	public _serviceBrand: any;
@@ -331,7 +332,7 @@ export class DiskSearch implements ISearchResultProvider {
 		}
 
 		const client = new Client(
-			uri.parse(require.toUrl('bootstrap')).fsPath,
+			getPathFromAmdModule(require, 'bootstrap'),
 			opts);
 
 		const channel = getNextTickChannel(client.getChannel<ISearchChannel>('search'));
diff --git a/src/vs/workbench/services/search/node/textSearchWorkerProvider.ts b/src/vs/workbench/services/search/node/textSearchWorkerProvider.ts
index 1b7b03ef9a7..14a7e52b6d6 100644
--- a/src/vs/workbench/services/search/node/textSearchWorkerProvider.ts
+++ b/src/vs/workbench/services/search/node/textSearchWorkerProvider.ts
@@ -7,11 +7,11 @@
 
 import * as os from 'os';
 
-import uri from 'vs/base/common/uri';
 import * as ipc from 'vs/base/parts/ipc/common/ipc';
 import { Client } from 'vs/base/parts/ipc/node/ipc.cp';
 
 import { ISearchWorker, ISearchWorkerChannel, SearchWorkerChannelClient } from './worker/searchWorkerIpc';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export interface ITextSearchWorkerProvider {
 	getWorkers(): ISearchWorker[];
@@ -31,7 +31,7 @@ export class TextSearchWorkerProvider implements ITextSearchWorkerProvider {
 
 	private createWorker(): void {
 		let client = new Client(
-			uri.parse(require.toUrl('bootstrap')).fsPath,
+			getPathFromAmdModule(require, 'bootstrap'),
 			{
 				serverName: 'Search Worker ' + this.workers.length,
 				args: ['--type=searchWorker'],
@@ -49,4 +49,4 @@ export class TextSearchWorkerProvider implements ITextSearchWorkerProvider {
 
 		this.workers.push(channelClient);
 	}
-}
\ No newline at end of file
+}
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 fda8eed27b0..7e8ded6fe5d 100644
--- a/src/vs/workbench/services/search/test/node/search.test.ts
+++ b/src/vs/workbench/services/search/test/node/search.test.ts
@@ -13,8 +13,9 @@ import * as platform from 'vs/base/common/platform';
 
 import { FileWalker, Engine as FileSearchEngine } from 'vs/workbench/services/search/node/fileSearch';
 import { IRawFileMatch, IFolderSearch } from 'vs/workbench/services/search/node/search';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
-const TEST_FIXTURES = path.normalize(require.toUrl('./fixtures'));
+const TEST_FIXTURES = path.normalize(getPathFromAmdModule(require, './fixtures'));
 const EXAMPLES_FIXTURES = path.join(TEST_FIXTURES, 'examples');
 const MORE_FIXTURES = path.join(TEST_FIXTURES, 'more');
 const TEST_ROOT_FOLDER: IFolderSearch = { folder: TEST_FIXTURES };
@@ -23,7 +24,7 @@ const ROOT_FOLDER_QUERY: IFolderSearch[] = [
 ];
 
 const ROOT_FOLDER_QUERY_36438: IFolderSearch[] = [
-	{ folder: path.normalize(require.toUrl('./fixtures2/36438')) }
+	{ folder: path.normalize(getPathFromAmdModule(require, './fixtures2/36438')) }
 ];
 
 const MULTIROOT_QUERIES: IFolderSearch[] = [
@@ -629,9 +630,9 @@ suite('FileSearchEngine', () => {
 		let engine = new FileSearchEngine({
 			folderQueries: [],
 			extraFiles: [
-				path.normalize(path.join(require.toUrl('./fixtures'), 'site.css')),
-				path.normalize(path.join(require.toUrl('./fixtures'), 'examples', 'company.js')),
-				path.normalize(path.join(require.toUrl('./fixtures'), 'index.html'))
+				path.normalize(path.join(getPathFromAmdModule(require, './fixtures'), 'site.css')),
+				path.normalize(path.join(getPathFromAmdModule(require, './fixtures'), 'examples', 'company.js')),
+				path.normalize(path.join(getPathFromAmdModule(require, './fixtures'), 'index.html'))
 			],
 			filePattern: '*.js'
 		});
@@ -656,9 +657,9 @@ suite('FileSearchEngine', () => {
 		let engine = new FileSearchEngine({
 			folderQueries: [],
 			extraFiles: [
-				path.normalize(path.join(require.toUrl('./fixtures'), 'site.css')),
-				path.normalize(path.join(require.toUrl('./fixtures'), 'examples', 'company.js')),
-				path.normalize(path.join(require.toUrl('./fixtures'), 'index.html'))
+				path.normalize(path.join(getPathFromAmdModule(require, './fixtures'), 'site.css')),
+				path.normalize(path.join(getPathFromAmdModule(require, './fixtures'), 'examples', 'company.js')),
+				path.normalize(path.join(getPathFromAmdModule(require, './fixtures'), 'index.html'))
 			],
 			filePattern: '*.*',
 			includePattern: { '**/*.css': true }
@@ -684,9 +685,9 @@ suite('FileSearchEngine', () => {
 		let engine = new FileSearchEngine({
 			folderQueries: [],
 			extraFiles: [
-				path.normalize(path.join(require.toUrl('./fixtures'), 'site.css')),
-				path.normalize(path.join(require.toUrl('./fixtures'), 'examples', 'company.js')),
-				path.normalize(path.join(require.toUrl('./fixtures'), 'index.html'))
+				path.normalize(path.join(getPathFromAmdModule(require, './fixtures'), 'site.css')),
+				path.normalize(path.join(getPathFromAmdModule(require, './fixtures'), 'examples', 'company.js')),
+				path.normalize(path.join(getPathFromAmdModule(require, './fixtures'), 'index.html'))
 			],
 			filePattern: '*.*',
 			excludePattern: { '**/*.css': true }
@@ -942,4 +943,4 @@ suite('FileWalker', () => {
 		const lines = stdout.split('\n');
 		return files.every(file => lines.indexOf(file) >= 0);
 	}
-});
\ No newline at end of file
+});
diff --git a/src/vs/workbench/services/search/test/node/searchService.test.ts b/src/vs/workbench/services/search/test/node/searchService.test.ts
index eb205675ab0..23a434569ea 100644
--- a/src/vs/workbench/services/search/test/node/searchService.test.ts
+++ b/src/vs/workbench/services/search/test/node/searchService.test.ts
@@ -14,12 +14,13 @@ import { SearchService as RawSearchService } from 'vs/workbench/services/search/
 import { DiskSearch } from 'vs/workbench/services/search/node/searchService';
 import { Emitter, Event } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 const TEST_FOLDER_QUERIES = [
 	{ folder: path.normalize('/some/where') }
 ];
 
-const TEST_FIXTURES = path.normalize(require.toUrl('./fixtures'));
+const TEST_FIXTURES = path.normalize(getPathFromAmdModule(require, './fixtures'));
 const MULTIROOT_QUERIES: IFolderSearch[] = [
 	{ folder: path.join(TEST_FIXTURES, 'examples') },
 	{ folder: path.join(TEST_FIXTURES, 'more') }
@@ -350,4 +351,4 @@ suite('SearchService', () => {
 			});
 		});
 	});
-});
\ No newline at end of file
+});
diff --git a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
index 93a86a86b12..21484acb566 100644
--- a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
+++ b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
@@ -15,12 +15,13 @@ import { ISerializedFileMatch, IRawSearch, IFolderSearch } from 'vs/workbench/se
 import { Engine as TextSearchEngine } from 'vs/workbench/services/search/node/textSearch';
 import { RipgrepEngine } from 'vs/workbench/services/search/node/ripgrepTextSearch';
 import { TextSearchWorkerProvider } from 'vs/workbench/services/search/node/textSearchWorkerProvider';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 function countAll(matches: ISerializedFileMatch[]): number {
 	return matches.reduce((acc, m) => acc + m.numMatches, 0);
 }
 
-const TEST_FIXTURES = path.normalize(require.toUrl('./fixtures'));
+const TEST_FIXTURES = path.normalize(getPathFromAmdModule(require, './fixtures'));
 const EXAMPLES_FIXTURES = path.join(TEST_FIXTURES, 'examples');
 const MORE_FIXTURES = path.join(TEST_FIXTURES, 'more');
 const TEST_ROOT_FOLDER: IFolderSearch = { folder: TEST_FIXTURES };
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
index 41e23fc9981..aea7e08e8f0 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -42,6 +42,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 
 	static DEFAULT_CONTENT_CHANGE_BUFFER_DELAY = CONTENT_CHANGE_EVENT_BUFFER_DELAY;
 	static DEFAULT_ORPHANED_CHANGE_BUFFER_DELAY = 100;
+	static WHITELIST_JSON = ['package.json', 'package-lock.json', 'tsconfig.json', 'jsconfig.json', 'bower.json', '.eslintrc.json', 'tslint.json', 'composer.json'];
 
 	private static saveErrorHandler: ISaveErrorHandler;
 	static setSaveErrorHandler(handler: ISaveErrorHandler): void { TextFileEditorModel.saveErrorHandler = handler; }
@@ -360,18 +361,12 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			} else {
 				/* __GDPR__
 					"fileGet" : {
-						"mimeType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						"ext": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						"path": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						"reason": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
+						"${include}": [
+							"${FileTelemetryData}"
+						]
 					}
 				*/
-				this.telemetryService.publicLog('fileGet', {
-					mimeType: guessMimeTypes(this.resource.fsPath).join(', '),
-					ext: path.extname(this.resource.fsPath),
-					path: this.hashService.createSHA1(this.resource.fsPath),
-					reason: options && options.reason ? options.reason : LoadReason.OTHER
-				});
+				this.telemetryService.publicLog('fileGet', this.getTelemetryData(options && options.reason ? options.reason : LoadReason.OTHER));
 			}
 
 			return model;
@@ -725,16 +720,12 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 				} else {
 					/* __GDPR__
 						"filePUT" : {
-							"mimeType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							"ext": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							"reason": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
+							"${include}": [
+								"${FileTelemetryData}"
+							]
 						}
 					*/
-					this.telemetryService.publicLog('filePUT', {
-						mimeType: guessMimeTypes(this.resource.fsPath).join(', '),
-						ext: path.extname(this.resource.fsPath),
-						reason: options.reason
-					});
+					this.telemetryService.publicLog('filePUT', this.getTelemetryData(options.reason));
 				}
 
 				// Update dirty state unless model has changed meanwhile
@@ -795,6 +786,32 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		});
 	}
 
+	private getTelemetryData(reason: number): Object {
+		const ext = path.extname(this.resource.fsPath);
+		const fileName = path.basename(this.resource.fsPath);
+		const telemetryData = {
+			mimeType: guessMimeTypes(this.resource.fsPath).join(', '),
+			ext,
+			path: this.hashService.createSHA1(this.resource.fsPath),
+			reason
+		};
+
+		if (ext === '.json' && TextFileEditorModel.WHITELIST_JSON.indexOf(fileName) > -1) {
+			telemetryData['whitelistedjson'] = fileName;
+		}
+
+		/* __GDPR__FRAGMENT__
+			"FileTelemetryData" : {
+				"mimeType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"ext": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"path": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"reason": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+				"whitelistedjson": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
+		return telemetryData;
+	}
+
 	private doTouch(versionId: number): TPromise<void> {
 		return this.saveSequentializer.setPending(versionId, this.fileService.updateContent(this.lastResolvedDiskStat.resource, this.createSnapshot(), {
 			mtime: this.lastResolvedDiskStat.mtime,
diff --git a/test/electron/renderer.js b/test/electron/renderer.js
index 63729010808..b5d940e58bd 100644
--- a/test/electron/renderer.js
+++ b/test/electron/renderer.js
@@ -33,7 +33,7 @@ function initLoader(opts) {
 		nodeRequire: require,
 		nodeMain: __filename,
 		catchError: true,
-		baseUrl: path.join(__dirname, '../../src'),
+		baseUrl: `file://${path.posix.join(__dirname, '../../src')}`,
 		paths: {
 			'vs': `../${outdir}/vs`,
 			'lib': `../${outdir}/lib`,
diff --git a/yarn.lock b/yarn.lock
index b0b61b7a439..1d81bc278d2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6125,9 +6125,9 @@ vscode-textmate@^4.0.1:
   dependencies:
     oniguruma "^7.0.0"
 
-vscode-xterm@3.6.0-beta13:
-  version "3.6.0-beta13"
-  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.6.0-beta13.tgz#88c511041beb9f84fa63ed52fec074c5ccaff296"
+vscode-xterm@3.7.0-beta2:
+  version "3.7.0-beta2"
+  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.7.0-beta2.tgz#b46417f740ee6a90875ab956b4583f20a09cc2db"
 
 vso-node-api@^6.1.2-preview:
   version "6.1.2-preview"
@@ -6183,6 +6183,10 @@ windows-process-tree@0.2.2:
   dependencies:
     nan "^2.6.2"
 
+winreg@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.4.tgz#ba065629b7a925130e15779108cf540990e98d1b"
+
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"