diff --git a/package.json b/package.json
index 5ff2da0978980629883fb2d180846dc1cfc31663..8119ad211998154264c49a936758ab808005a29e 100644
--- a/package.json
+++ b/package.json
@@ -30,10 +30,10 @@
     "pty.js": "https://github.com/Tyriar/pty.js/tarball/prebuilt",
     "sax": "1.1.2",
     "semver": "4.3.6",
-    "term.js": "https://github.com/jeremyramin/term.js/tarball/master",
     "vscode-debugprotocol": "1.9.0",
     "vscode-textmate": "1.1.0",
     "winreg": "1.2.0",
+    "xterm": "^0.33.0",
     "yauzl": "2.3.1"
   },
   "devDependencies": {
diff --git a/src/typings/term.js.d.ts b/src/typings/xterm.d.ts
similarity index 96%
rename from src/typings/term.js.d.ts
rename to src/typings/xterm.d.ts
index faa6d112d7a45ca4412c488ea98547a1a98d6648..53a8527228046bd93985b0541b240d51a51cbf51 100644
--- a/src/typings/term.js.d.ts
+++ b/src/typings/xterm.d.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-declare module 'term.js' {
+declare module 'xterm' {
 	function init(options: any): TermJsTerminal;
 
 	// There seems to be no way to export this so it can be referenced outside of this file when a
diff --git a/src/vs/workbench/parts/terminal/electron-browser/media/terminal.contribution.css b/src/vs/workbench/parts/terminal/electron-browser/media/terminal.contribution.css
index 62c19d5ec2525e7a3d6086833f7b6be8e5059208..39fe61b138b64849ae65799617e9d39fe0006715 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/media/terminal.contribution.css
+++ b/src/vs/workbench/parts/terminal/electron-browser/media/terminal.contribution.css
@@ -36,7 +36,12 @@
 	color: #CCC;
 }
 
-.vs-dark .monaco-workbench .integrated-terminal .terminal-cursor {
+.vs-dark .monaco-workbench .integrated-terminal .terminal:not(:focus) .terminal-cursor {
+	outline: 1px solid #CCC;
+	outline-offset: -1px;
+}
+
+.vs-dark .monaco-workbench .integrated-terminal .terminal:focus .terminal-cursor {
 	background-color: #CCC;
 }
 
@@ -57,3 +62,2130 @@
 .hc-black .monaco-workbench .integrated-terminal .reverse-video {
 	color: #FFF;
 }
+
+
+
+
+/**
+ * xterm.js: xterm, in the browser
+ * Copyright (c) 2014, sourceLair Limited (www.sourcelair.com (MIT License)
+ * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
+ * https://github.com/chjj/term.js
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Originally forked from (with the author's permission):
+ *   Fabrice Bellard's javascript vt100 for jslinux:
+ *   http://bellard.org/jslinux/
+ *   Copyright (c) 2011 Fabrice Bellard
+ *   The original design remains. The terminal itself
+ *   has been extended to include xterm CSI codes, among
+ *   other features.
+ */
+
+/*
+ *  Default style for xterm.js
+ */
+
+.terminal {
+	background-color: #000;
+	color: #cccccc;
+	position: relative;
+}
+
+.terminal:focus {
+	outline: none !important;
+}
+
+.terminal .xterm-helpers {
+	position: absolute;
+	top: 0;
+	left: -9999em;
+}
+
+/*
+ *  Determine default colors for xterm.js
+ */
+.terminal .xterm-bold {
+	font-weight: bold;
+}
+
+.terminal .xterm-underline {
+	text-decoration: underline;
+}
+
+.terminal .xterm-blink {
+	text-decoration: blink;
+}
+
+.terminal .xterm-hidden {
+	visibility: hidden;
+}
+
+.terminal *::selection {
+	color: #1e1e1e;
+	background-color: rgba(204, 204, 204, 0.996);
+}
+
+.terminal .xterm-color-0 { color: #2e3436; }
+.terminal .xterm-color-0::selection { background-color: #2e3436; }
+.terminal .xterm-bg-color-0 { background-color: #2e3436; }
+.terminal .xterm-bg-color-0::selection { color: #2e3436; }
+
+.terminal .xterm-color-1 { color: #cc0000; }
+.terminal .xterm-color-1::selection { background-color: rgba(204, 0, 0, 0.996); }
+.terminal .xterm-bg-color-1 { background-color: #cc0000; }
+.terminal .xterm-bg-color-1::selection { color: #cc0000; }
+
+.terminal .xterm-color-2 { color: #4e9a06; }
+.terminal .xterm-color-2::selection { background-color: rgba(78, 154, 6, 0.996); }
+.terminal .xterm-bg-color-2 { background-color: #4e9a06; }
+.terminal .xterm-bg-color-2::selection { color: #4e9a06; }
+
+.terminal .xterm-color-3 { color: #c4a000; }
+
+.terminal .xterm-bg-color-3 {
+	background-color: #c4a000;
+}
+
+.terminal .xterm-color-4 {
+	color: #3465a4;
+}
+
+.terminal .xterm-bg-color-4 {
+	background-color: #3465a4;
+}
+
+.terminal .xterm-color-5 {
+	color: #75507b;
+}
+
+.terminal .xterm-bg-color-5 {
+	background-color: #75507b;
+}
+
+.terminal .xterm-color-6 {
+	color: #06989a;
+}
+
+.terminal .xterm-bg-color-6 {
+	background-color: #06989a;
+}
+
+.terminal .xterm-color-7 {
+	color: #d3d7cf;
+}
+
+.terminal .xterm-bg-color-7 {
+	background-color: #d3d7cf;
+}
+
+.terminal .xterm-color-8 {
+	color: #555753;
+}
+
+.terminal .xterm-bg-color-8 {
+	background-color: #555753;
+}
+
+.terminal .xterm-color-9 {
+	color: #ef2929;
+}
+
+.terminal .xterm-bg-color-9 {
+	background-color: #ef2929;
+}
+
+.terminal .xterm-color-10 {
+	color: #8ae234;
+}
+
+.terminal .xterm-bg-color-10 {
+	background-color: #8ae234;
+}
+
+.terminal .xterm-color-11 { color: #fce94f; }
+.terminal .xterm-color-11::selection { background-color: rgba(252, 233, 79, 0.996); }
+.terminal .xterm-bg-color-11 { background-color: #fce94f; }
+.terminal .xterm-bg-color-11::selection { color: #fce94f; }
+
+.terminal .xterm-color-12 { color: #729fcf; }
+.terminal .xterm-color-12::selection { background-color: rgba(114, 159, 207, 0.996); }
+.terminal .xterm-bg-color-12 { background-color: #729fcf; }
+.terminal .xterm-bg-color-12::selection { color: #729fcf; }
+
+.terminal .xterm-color-13 {
+	color: #ad7fa8;
+}
+
+.terminal .xterm-bg-color-13 {
+	background-color: #ad7fa8;
+}
+
+.terminal .xterm-color-14 {
+	color: #34e2e2;
+}
+
+.terminal .xterm-bg-color-14 {
+	background-color: #34e2e2;
+}
+
+.terminal .xterm-color-15 {
+	color: #eeeeec;
+}
+
+.terminal .xterm-bg-color-15 {
+	background-color: #eeeeec;
+}
+
+.terminal .xterm-color-16 {
+	color: #000000;
+}
+
+.terminal .xterm-bg-color-16 {
+	background-color: #000000;
+}
+
+.terminal .xterm-color-17 {
+	color: #00005f;
+}
+
+.terminal .xterm-bg-color-17 {
+	background-color: #00005f;
+}
+
+.terminal .xterm-color-18 {
+	color: #000087;
+}
+
+.terminal .xterm-bg-color-18 {
+	background-color: #000087;
+}
+
+.terminal .xterm-color-19 {
+	color: #0000af;
+}
+
+.terminal .xterm-bg-color-19 {
+	background-color: #0000af;
+}
+
+.terminal .xterm-color-20 {
+	color: #0000d7;
+}
+
+.terminal .xterm-bg-color-20 {
+	background-color: #0000d7;
+}
+
+.terminal .xterm-color-21 {
+	color: #0000ff;
+}
+
+.terminal .xterm-bg-color-21 {
+	background-color: #0000ff;
+}
+
+.terminal .xterm-color-22 {
+	color: #005f00;
+}
+
+.terminal .xterm-bg-color-22 {
+	background-color: #005f00;
+}
+
+.terminal .xterm-color-23 {
+	color: #005f5f;
+}
+
+.terminal .xterm-bg-color-23 {
+	background-color: #005f5f;
+}
+
+.terminal .xterm-color-24 {
+	color: #005f87;
+}
+
+.terminal .xterm-bg-color-24 {
+	background-color: #005f87;
+}
+
+.terminal .xterm-color-25 {
+	color: #005faf;
+}
+
+.terminal .xterm-bg-color-25 {
+	background-color: #005faf;
+}
+
+.terminal .xterm-color-26 {
+	color: #005fd7;
+}
+
+.terminal .xterm-bg-color-26 {
+	background-color: #005fd7;
+}
+
+.terminal .xterm-color-27 {
+	color: #005fff;
+}
+
+.terminal .xterm-bg-color-27 {
+	background-color: #005fff;
+}
+
+.terminal .xterm-color-28 {
+	color: #008700;
+}
+
+.terminal .xterm-bg-color-28 {
+	background-color: #008700;
+}
+
+.terminal .xterm-color-29 {
+	color: #00875f;
+}
+
+.terminal .xterm-bg-color-29 {
+	background-color: #00875f;
+}
+
+.terminal .xterm-color-30 {
+	color: #008787;
+}
+
+.terminal .xterm-bg-color-30 {
+	background-color: #008787;
+}
+
+.terminal .xterm-color-31 {
+	color: #0087af;
+}
+
+.terminal .xterm-bg-color-31 {
+	background-color: #0087af;
+}
+
+.terminal .xterm-color-32 {
+	color: #0087d7;
+}
+
+.terminal .xterm-bg-color-32 {
+	background-color: #0087d7;
+}
+
+.terminal .xterm-color-33 {
+	color: #0087ff;
+}
+
+.terminal .xterm-bg-color-33 {
+	background-color: #0087ff;
+}
+
+.terminal .xterm-color-34 {
+	color: #00af00;
+}
+
+.terminal .xterm-bg-color-34 {
+	background-color: #00af00;
+}
+
+.terminal .xterm-color-35 {
+	color: #00af5f;
+}
+
+.terminal .xterm-bg-color-35 {
+	background-color: #00af5f;
+}
+
+.terminal .xterm-color-36 {
+	color: #00af87;
+}
+
+.terminal .xterm-bg-color-36 {
+	background-color: #00af87;
+}
+
+.terminal .xterm-color-37 {
+	color: #00afaf;
+}
+
+.terminal .xterm-bg-color-37 {
+	background-color: #00afaf;
+}
+
+.terminal .xterm-color-38 {
+	color: #00afd7;
+}
+
+.terminal .xterm-bg-color-38 {
+	background-color: #00afd7;
+}
+
+.terminal .xterm-color-39 {
+	color: #00afff;
+}
+
+.terminal .xterm-bg-color-39 {
+	background-color: #00afff;
+}
+
+.terminal .xterm-color-40 {
+	color: #00d700;
+}
+
+.terminal .xterm-bg-color-40 {
+	background-color: #00d700;
+}
+
+.terminal .xterm-color-41 {
+	color: #00d75f;
+}
+
+.terminal .xterm-bg-color-41 {
+	background-color: #00d75f;
+}
+
+.terminal .xterm-color-42 {
+	color: #00d787;
+}
+
+.terminal .xterm-bg-color-42 {
+	background-color: #00d787;
+}
+
+.terminal .xterm-color-43 {
+	color: #00d7af;
+}
+
+.terminal .xterm-bg-color-43 {
+	background-color: #00d7af;
+}
+
+.terminal .xterm-color-44 {
+	color: #00d7d7;
+}
+
+.terminal .xterm-bg-color-44 {
+	background-color: #00d7d7;
+}
+
+.terminal .xterm-color-45 {
+	color: #00d7ff;
+}
+
+.terminal .xterm-bg-color-45 {
+	background-color: #00d7ff;
+}
+
+.terminal .xterm-color-46 {
+	color: #00ff00;
+}
+
+.terminal .xterm-bg-color-46 {
+	background-color: #00ff00;
+}
+
+.terminal .xterm-color-47 {
+	color: #00ff5f;
+}
+
+.terminal .xterm-bg-color-47 {
+	background-color: #00ff5f;
+}
+
+.terminal .xterm-color-48 {
+	color: #00ff87;
+}
+
+.terminal .xterm-bg-color-48 {
+	background-color: #00ff87;
+}
+
+.terminal .xterm-color-49 {
+	color: #00ffaf;
+}
+
+.terminal .xterm-bg-color-49 {
+	background-color: #00ffaf;
+}
+
+.terminal .xterm-color-50 {
+	color: #00ffd7;
+}
+
+.terminal .xterm-bg-color-50 {
+	background-color: #00ffd7;
+}
+
+.terminal .xterm-color-51 {
+	color: #00ffff;
+}
+
+.terminal .xterm-bg-color-51 {
+	background-color: #00ffff;
+}
+
+.terminal .xterm-color-52 {
+	color: #5f0000;
+}
+
+.terminal .xterm-bg-color-52 {
+	background-color: #5f0000;
+}
+
+.terminal .xterm-color-53 {
+	color: #5f005f;
+}
+
+.terminal .xterm-bg-color-53 {
+	background-color: #5f005f;
+}
+
+.terminal .xterm-color-54 {
+	color: #5f0087;
+}
+
+.terminal .xterm-bg-color-54 {
+	background-color: #5f0087;
+}
+
+.terminal .xterm-color-55 {
+	color: #5f00af;
+}
+
+.terminal .xterm-bg-color-55 {
+	background-color: #5f00af;
+}
+
+.terminal .xterm-color-56 {
+	color: #5f00d7;
+}
+
+.terminal .xterm-bg-color-56 {
+	background-color: #5f00d7;
+}
+
+.terminal .xterm-color-57 {
+	color: #5f00ff;
+}
+
+.terminal .xterm-bg-color-57 {
+	background-color: #5f00ff;
+}
+
+.terminal .xterm-color-58 {
+	color: #5f5f00;
+}
+
+.terminal .xterm-bg-color-58 {
+	background-color: #5f5f00;
+}
+
+.terminal .xterm-color-59 {
+	color: #5f5f5f;
+}
+
+.terminal .xterm-bg-color-59 {
+	background-color: #5f5f5f;
+}
+
+.terminal .xterm-color-60 {
+	color: #5f5f87;
+}
+
+.terminal .xterm-bg-color-60 {
+	background-color: #5f5f87;
+}
+
+.terminal .xterm-color-61 {
+	color: #5f5faf;
+}
+
+.terminal .xterm-bg-color-61 {
+	background-color: #5f5faf;
+}
+
+.terminal .xterm-color-62 {
+	color: #5f5fd7;
+}
+
+.terminal .xterm-bg-color-62 {
+	background-color: #5f5fd7;
+}
+
+.terminal .xterm-color-63 {
+	color: #5f5fff;
+}
+
+.terminal .xterm-bg-color-63 {
+	background-color: #5f5fff;
+}
+
+.terminal .xterm-color-64 {
+	color: #5f8700;
+}
+
+.terminal .xterm-bg-color-64 {
+	background-color: #5f8700;
+}
+
+.terminal .xterm-color-65 {
+	color: #5f875f;
+}
+
+.terminal .xterm-bg-color-65 {
+	background-color: #5f875f;
+}
+
+.terminal .xterm-color-66 {
+	color: #5f8787;
+}
+
+.terminal .xterm-bg-color-66 {
+	background-color: #5f8787;
+}
+
+.terminal .xterm-color-67 {
+	color: #5f87af;
+}
+
+.terminal .xterm-bg-color-67 {
+	background-color: #5f87af;
+}
+
+.terminal .xterm-color-68 {
+	color: #5f87d7;
+}
+
+.terminal .xterm-bg-color-68 {
+	background-color: #5f87d7;
+}
+
+.terminal .xterm-color-69 {
+	color: #5f87ff;
+}
+
+.terminal .xterm-bg-color-69 {
+	background-color: #5f87ff;
+}
+
+.terminal .xterm-color-70 {
+	color: #5faf00;
+}
+
+.terminal .xterm-bg-color-70 {
+	background-color: #5faf00;
+}
+
+.terminal .xterm-color-71 {
+	color: #5faf5f;
+}
+
+.terminal .xterm-bg-color-71 {
+	background-color: #5faf5f;
+}
+
+.terminal .xterm-color-72 {
+	color: #5faf87;
+}
+
+.terminal .xterm-bg-color-72 {
+	background-color: #5faf87;
+}
+
+.terminal .xterm-color-73 {
+	color: #5fafaf;
+}
+
+.terminal .xterm-bg-color-73 {
+	background-color: #5fafaf;
+}
+
+.terminal .xterm-color-74 {
+	color: #5fafd7;
+}
+
+.terminal .xterm-bg-color-74 {
+	background-color: #5fafd7;
+}
+
+.terminal .xterm-color-75 {
+	color: #5fafff;
+}
+
+.terminal .xterm-bg-color-75 {
+	background-color: #5fafff;
+}
+
+.terminal .xterm-color-76 {
+	color: #5fd700;
+}
+
+.terminal .xterm-bg-color-76 {
+	background-color: #5fd700;
+}
+
+.terminal .xterm-color-77 {
+	color: #5fd75f;
+}
+
+.terminal .xterm-bg-color-77 {
+	background-color: #5fd75f;
+}
+
+.terminal .xterm-color-78 {
+	color: #5fd787;
+}
+
+.terminal .xterm-bg-color-78 {
+	background-color: #5fd787;
+}
+
+.terminal .xterm-color-79 {
+	color: #5fd7af;
+}
+
+.terminal .xterm-bg-color-79 {
+	background-color: #5fd7af;
+}
+
+.terminal .xterm-color-80 {
+	color: #5fd7d7;
+}
+
+.terminal .xterm-bg-color-80 {
+	background-color: #5fd7d7;
+}
+
+.terminal .xterm-color-81 {
+	color: #5fd7ff;
+}
+
+.terminal .xterm-bg-color-81 {
+	background-color: #5fd7ff;
+}
+
+.terminal .xterm-color-82 {
+	color: #5fff00;
+}
+
+.terminal .xterm-bg-color-82 {
+	background-color: #5fff00;
+}
+
+.terminal .xterm-color-83 {
+	color: #5fff5f;
+}
+
+.terminal .xterm-bg-color-83 {
+	background-color: #5fff5f;
+}
+
+.terminal .xterm-color-84 {
+	color: #5fff87;
+}
+
+.terminal .xterm-bg-color-84 {
+	background-color: #5fff87;
+}
+
+.terminal .xterm-color-85 {
+	color: #5fffaf;
+}
+
+.terminal .xterm-bg-color-85 {
+	background-color: #5fffaf;
+}
+
+.terminal .xterm-color-86 {
+	color: #5fffd7;
+}
+
+.terminal .xterm-bg-color-86 {
+	background-color: #5fffd7;
+}
+
+.terminal .xterm-color-87 {
+	color: #5fffff;
+}
+
+.terminal .xterm-bg-color-87 {
+	background-color: #5fffff;
+}
+
+.terminal .xterm-color-88 {
+	color: #870000;
+}
+
+.terminal .xterm-bg-color-88 {
+	background-color: #870000;
+}
+
+.terminal .xterm-color-89 {
+	color: #87005f;
+}
+
+.terminal .xterm-bg-color-89 {
+	background-color: #87005f;
+}
+
+.terminal .xterm-color-90 {
+	color: #870087;
+}
+
+.terminal .xterm-bg-color-90 {
+	background-color: #870087;
+}
+
+.terminal .xterm-color-91 {
+	color: #8700af;
+}
+
+.terminal .xterm-bg-color-91 {
+	background-color: #8700af;
+}
+
+.terminal .xterm-color-92 {
+	color: #8700d7;
+}
+
+.terminal .xterm-bg-color-92 {
+	background-color: #8700d7;
+}
+
+.terminal .xterm-color-93 {
+	color: #8700ff;
+}
+
+.terminal .xterm-bg-color-93 {
+	background-color: #8700ff;
+}
+
+.terminal .xterm-color-94 {
+	color: #875f00;
+}
+
+.terminal .xterm-bg-color-94 {
+	background-color: #875f00;
+}
+
+.terminal .xterm-color-95 {
+	color: #875f5f;
+}
+
+.terminal .xterm-bg-color-95 {
+	background-color: #875f5f;
+}
+
+.terminal .xterm-color-96 {
+	color: #875f87;
+}
+
+.terminal .xterm-bg-color-96 {
+	background-color: #875f87;
+}
+
+.terminal .xterm-color-97 {
+	color: #875faf;
+}
+
+.terminal .xterm-bg-color-97 {
+	background-color: #875faf;
+}
+
+.terminal .xterm-color-98 {
+	color: #875fd7;
+}
+
+.terminal .xterm-bg-color-98 {
+	background-color: #875fd7;
+}
+
+.terminal .xterm-color-99 {
+	color: #875fff;
+}
+
+.terminal .xterm-bg-color-99 {
+	background-color: #875fff;
+}
+
+.terminal .xterm-color-100 {
+	color: #878700;
+}
+
+.terminal .xterm-bg-color-100 {
+	background-color: #878700;
+}
+
+.terminal .xterm-color-101 {
+	color: #87875f;
+}
+
+.terminal .xterm-bg-color-101 {
+	background-color: #87875f;
+}
+
+.terminal .xterm-color-102 {
+	color: #878787;
+}
+
+.terminal .xterm-bg-color-102 {
+	background-color: #878787;
+}
+
+.terminal .xterm-color-103 {
+	color: #8787af;
+}
+
+.terminal .xterm-bg-color-103 {
+	background-color: #8787af;
+}
+
+.terminal .xterm-color-104 {
+	color: #8787d7;
+}
+
+.terminal .xterm-bg-color-104 {
+	background-color: #8787d7;
+}
+
+.terminal .xterm-color-105 {
+	color: #8787ff;
+}
+
+.terminal .xterm-bg-color-105 {
+	background-color: #8787ff;
+}
+
+.terminal .xterm-color-106 {
+	color: #87af00;
+}
+
+.terminal .xterm-bg-color-106 {
+	background-color: #87af00;
+}
+
+.terminal .xterm-color-107 {
+	color: #87af5f;
+}
+
+.terminal .xterm-bg-color-107 {
+	background-color: #87af5f;
+}
+
+.terminal .xterm-color-108 {
+	color: #87af87;
+}
+
+.terminal .xterm-bg-color-108 {
+	background-color: #87af87;
+}
+
+.terminal .xterm-color-109 {
+	color: #87afaf;
+}
+
+.terminal .xterm-bg-color-109 {
+	background-color: #87afaf;
+}
+
+.terminal .xterm-color-110 {
+	color: #87afd7;
+}
+
+.terminal .xterm-bg-color-110 {
+	background-color: #87afd7;
+}
+
+.terminal .xterm-color-111 {
+	color: #87afff;
+}
+
+.terminal .xterm-bg-color-111 {
+	background-color: #87afff;
+}
+
+.terminal .xterm-color-112 {
+	color: #87d700;
+}
+
+.terminal .xterm-bg-color-112 {
+	background-color: #87d700;
+}
+
+.terminal .xterm-color-113 {
+	color: #87d75f;
+}
+
+.terminal .xterm-bg-color-113 {
+	background-color: #87d75f;
+}
+
+.terminal .xterm-color-114 {
+	color: #87d787;
+}
+
+.terminal .xterm-bg-color-114 {
+	background-color: #87d787;
+}
+
+.terminal .xterm-color-115 {
+	color: #87d7af;
+}
+
+.terminal .xterm-bg-color-115 {
+	background-color: #87d7af;
+}
+
+.terminal .xterm-color-116 {
+	color: #87d7d7;
+}
+
+.terminal .xterm-bg-color-116 {
+	background-color: #87d7d7;
+}
+
+.terminal .xterm-color-117 {
+	color: #87d7ff;
+}
+
+.terminal .xterm-bg-color-117 {
+	background-color: #87d7ff;
+}
+
+.terminal .xterm-color-118 {
+	color: #87ff00;
+}
+
+.terminal .xterm-bg-color-118 {
+	background-color: #87ff00;
+}
+
+.terminal .xterm-color-119 {
+	color: #87ff5f;
+}
+
+.terminal .xterm-bg-color-119 {
+	background-color: #87ff5f;
+}
+
+.terminal .xterm-color-120 {
+	color: #87ff87;
+}
+
+.terminal .xterm-bg-color-120 {
+	background-color: #87ff87;
+}
+
+.terminal .xterm-color-121 {
+	color: #87ffaf;
+}
+
+.terminal .xterm-bg-color-121 {
+	background-color: #87ffaf;
+}
+
+.terminal .xterm-color-122 {
+	color: #87ffd7;
+}
+
+.terminal .xterm-bg-color-122 {
+	background-color: #87ffd7;
+}
+
+.terminal .xterm-color-123 {
+	color: #87ffff;
+}
+
+.terminal .xterm-bg-color-123 {
+	background-color: #87ffff;
+}
+
+.terminal .xterm-color-124 {
+	color: #af0000;
+}
+
+.terminal .xterm-bg-color-124 {
+	background-color: #af0000;
+}
+
+.terminal .xterm-color-125 {
+	color: #af005f;
+}
+
+.terminal .xterm-bg-color-125 {
+	background-color: #af005f;
+}
+
+.terminal .xterm-color-126 {
+	color: #af0087;
+}
+
+.terminal .xterm-bg-color-126 {
+	background-color: #af0087;
+}
+
+.terminal .xterm-color-127 {
+	color: #af00af;
+}
+
+.terminal .xterm-bg-color-127 {
+	background-color: #af00af;
+}
+
+.terminal .xterm-color-128 {
+	color: #af00d7;
+}
+
+.terminal .xterm-bg-color-128 {
+	background-color: #af00d7;
+}
+
+.terminal .xterm-color-129 {
+	color: #af00ff;
+}
+
+.terminal .xterm-bg-color-129 {
+	background-color: #af00ff;
+}
+
+.terminal .xterm-color-130 {
+	color: #af5f00;
+}
+
+.terminal .xterm-bg-color-130 {
+	background-color: #af5f00;
+}
+
+.terminal .xterm-color-131 {
+	color: #af5f5f;
+}
+
+.terminal .xterm-bg-color-131 {
+	background-color: #af5f5f;
+}
+
+.terminal .xterm-color-132 {
+	color: #af5f87;
+}
+
+.terminal .xterm-bg-color-132 {
+	background-color: #af5f87;
+}
+
+.terminal .xterm-color-133 {
+	color: #af5faf;
+}
+
+.terminal .xterm-bg-color-133 {
+	background-color: #af5faf;
+}
+
+.terminal .xterm-color-134 {
+	color: #af5fd7;
+}
+
+.terminal .xterm-bg-color-134 {
+	background-color: #af5fd7;
+}
+
+.terminal .xterm-color-135 {
+	color: #af5fff;
+}
+
+.terminal .xterm-bg-color-135 {
+	background-color: #af5fff;
+}
+
+.terminal .xterm-color-136 {
+	color: #af8700;
+}
+
+.terminal .xterm-bg-color-136 {
+	background-color: #af8700;
+}
+
+.terminal .xterm-color-137 {
+	color: #af875f;
+}
+
+.terminal .xterm-bg-color-137 {
+	background-color: #af875f;
+}
+
+.terminal .xterm-color-138 {
+	color: #af8787;
+}
+
+.terminal .xterm-bg-color-138 {
+	background-color: #af8787;
+}
+
+.terminal .xterm-color-139 {
+	color: #af87af;
+}
+
+.terminal .xterm-bg-color-139 {
+	background-color: #af87af;
+}
+
+.terminal .xterm-color-140 {
+	color: #af87d7;
+}
+
+.terminal .xterm-bg-color-140 {
+	background-color: #af87d7;
+}
+
+.terminal .xterm-color-141 {
+	color: #af87ff;
+}
+
+.terminal .xterm-bg-color-141 {
+	background-color: #af87ff;
+}
+
+.terminal .xterm-color-142 {
+	color: #afaf00;
+}
+
+.terminal .xterm-bg-color-142 {
+	background-color: #afaf00;
+}
+
+.terminal .xterm-color-143 {
+	color: #afaf5f;
+}
+
+.terminal .xterm-bg-color-143 {
+	background-color: #afaf5f;
+}
+
+.terminal .xterm-color-144 {
+	color: #afaf87;
+}
+
+.terminal .xterm-bg-color-144 {
+	background-color: #afaf87;
+}
+
+.terminal .xterm-color-145 {
+	color: #afafaf;
+}
+
+.terminal .xterm-bg-color-145 {
+	background-color: #afafaf;
+}
+
+.terminal .xterm-color-146 {
+	color: #afafd7;
+}
+
+.terminal .xterm-bg-color-146 {
+	background-color: #afafd7;
+}
+
+.terminal .xterm-color-147 {
+	color: #afafff;
+}
+
+.terminal .xterm-bg-color-147 {
+	background-color: #afafff;
+}
+
+.terminal .xterm-color-148 {
+	color: #afd700;
+}
+
+.terminal .xterm-bg-color-148 {
+	background-color: #afd700;
+}
+
+.terminal .xterm-color-149 {
+	color: #afd75f;
+}
+
+.terminal .xterm-bg-color-149 {
+	background-color: #afd75f;
+}
+
+.terminal .xterm-color-150 {
+	color: #afd787;
+}
+
+.terminal .xterm-bg-color-150 {
+	background-color: #afd787;
+}
+
+.terminal .xterm-color-151 {
+	color: #afd7af;
+}
+
+.terminal .xterm-bg-color-151 {
+	background-color: #afd7af;
+}
+
+.terminal .xterm-color-152 {
+	color: #afd7d7;
+}
+
+.terminal .xterm-bg-color-152 {
+	background-color: #afd7d7;
+}
+
+.terminal .xterm-color-153 {
+	color: #afd7ff;
+}
+
+.terminal .xterm-bg-color-153 {
+	background-color: #afd7ff;
+}
+
+.terminal .xterm-color-154 {
+	color: #afff00;
+}
+
+.terminal .xterm-bg-color-154 {
+	background-color: #afff00;
+}
+
+.terminal .xterm-color-155 {
+	color: #afff5f;
+}
+
+.terminal .xterm-bg-color-155 {
+	background-color: #afff5f;
+}
+
+.terminal .xterm-color-156 {
+	color: #afff87;
+}
+
+.terminal .xterm-bg-color-156 {
+	background-color: #afff87;
+}
+
+.terminal .xterm-color-157 {
+	color: #afffaf;
+}
+
+.terminal .xterm-bg-color-157 {
+	background-color: #afffaf;
+}
+
+.terminal .xterm-color-158 {
+	color: #afffd7;
+}
+
+.terminal .xterm-bg-color-158 {
+	background-color: #afffd7;
+}
+
+.terminal .xterm-color-159 {
+	color: #afffff;
+}
+
+.terminal .xterm-bg-color-159 {
+	background-color: #afffff;
+}
+
+.terminal .xterm-color-160 {
+	color: #d70000;
+}
+
+.terminal .xterm-bg-color-160 {
+	background-color: #d70000;
+}
+
+.terminal .xterm-color-161 {
+	color: #d7005f;
+}
+
+.terminal .xterm-bg-color-161 {
+	background-color: #d7005f;
+}
+
+.terminal .xterm-color-162 {
+	color: #d70087;
+}
+
+.terminal .xterm-bg-color-162 {
+	background-color: #d70087;
+}
+
+.terminal .xterm-color-163 {
+	color: #d700af;
+}
+
+.terminal .xterm-bg-color-163 {
+	background-color: #d700af;
+}
+
+.terminal .xterm-color-164 {
+	color: #d700d7;
+}
+
+.terminal .xterm-bg-color-164 {
+	background-color: #d700d7;
+}
+
+.terminal .xterm-color-165 {
+	color: #d700ff;
+}
+
+.terminal .xterm-bg-color-165 {
+	background-color: #d700ff;
+}
+
+.terminal .xterm-color-166 {
+	color: #d75f00;
+}
+
+.terminal .xterm-bg-color-166 {
+	background-color: #d75f00;
+}
+
+.terminal .xterm-color-167 {
+	color: #d75f5f;
+}
+
+.terminal .xterm-bg-color-167 {
+	background-color: #d75f5f;
+}
+
+.terminal .xterm-color-168 {
+	color: #d75f87;
+}
+
+.terminal .xterm-bg-color-168 {
+	background-color: #d75f87;
+}
+
+.terminal .xterm-color-169 {
+	color: #d75faf;
+}
+
+.terminal .xterm-bg-color-169 {
+	background-color: #d75faf;
+}
+
+.terminal .xterm-color-170 {
+	color: #d75fd7;
+}
+
+.terminal .xterm-bg-color-170 {
+	background-color: #d75fd7;
+}
+
+.terminal .xterm-color-171 {
+	color: #d75fff;
+}
+
+.terminal .xterm-bg-color-171 {
+	background-color: #d75fff;
+}
+
+.terminal .xterm-color-172 {
+	color: #d78700;
+}
+
+.terminal .xterm-bg-color-172 {
+	background-color: #d78700;
+}
+
+.terminal .xterm-color-173 {
+	color: #d7875f;
+}
+
+.terminal .xterm-bg-color-173 {
+	background-color: #d7875f;
+}
+
+.terminal .xterm-color-174 {
+	color: #d78787;
+}
+
+.terminal .xterm-bg-color-174 {
+	background-color: #d78787;
+}
+
+.terminal .xterm-color-175 {
+	color: #d787af;
+}
+
+.terminal .xterm-bg-color-175 {
+	background-color: #d787af;
+}
+
+.terminal .xterm-color-176 {
+	color: #d787d7;
+}
+
+.terminal .xterm-bg-color-176 {
+	background-color: #d787d7;
+}
+
+.terminal .xterm-color-177 {
+	color: #d787ff;
+}
+
+.terminal .xterm-bg-color-177 {
+	background-color: #d787ff;
+}
+
+.terminal .xterm-color-178 {
+	color: #d7af00;
+}
+
+.terminal .xterm-bg-color-178 {
+	background-color: #d7af00;
+}
+
+.terminal .xterm-color-179 {
+	color: #d7af5f;
+}
+
+.terminal .xterm-bg-color-179 {
+	background-color: #d7af5f;
+}
+
+.terminal .xterm-color-180 {
+	color: #d7af87;
+}
+
+.terminal .xterm-bg-color-180 {
+	background-color: #d7af87;
+}
+
+.terminal .xterm-color-181 {
+	color: #d7afaf;
+}
+
+.terminal .xterm-bg-color-181 {
+	background-color: #d7afaf;
+}
+
+.terminal .xterm-color-182 {
+	color: #d7afd7;
+}
+
+.terminal .xterm-bg-color-182 {
+	background-color: #d7afd7;
+}
+
+.terminal .xterm-color-183 {
+	color: #d7afff;
+}
+
+.terminal .xterm-bg-color-183 {
+	background-color: #d7afff;
+}
+
+.terminal .xterm-color-184 {
+	color: #d7d700;
+}
+
+.terminal .xterm-bg-color-184 {
+	background-color: #d7d700;
+}
+
+.terminal .xterm-color-185 {
+	color: #d7d75f;
+}
+
+.terminal .xterm-bg-color-185 {
+	background-color: #d7d75f;
+}
+
+.terminal .xterm-color-186 {
+	color: #d7d787;
+}
+
+.terminal .xterm-bg-color-186 {
+	background-color: #d7d787;
+}
+
+.terminal .xterm-color-187 {
+	color: #d7d7af;
+}
+
+.terminal .xterm-bg-color-187 {
+	background-color: #d7d7af;
+}
+
+.terminal .xterm-color-188 {
+	color: #d7d7d7;
+}
+
+.terminal .xterm-bg-color-188 {
+	background-color: #d7d7d7;
+}
+
+.terminal .xterm-color-189 {
+	color: #d7d7ff;
+}
+
+.terminal .xterm-bg-color-189 {
+	background-color: #d7d7ff;
+}
+
+.terminal .xterm-color-190 {
+	color: #d7ff00;
+}
+
+.terminal .xterm-bg-color-190 {
+	background-color: #d7ff00;
+}
+
+.terminal .xterm-color-191 {
+	color: #d7ff5f;
+}
+
+.terminal .xterm-bg-color-191 {
+	background-color: #d7ff5f;
+}
+
+.terminal .xterm-color-192 {
+	color: #d7ff87;
+}
+
+.terminal .xterm-bg-color-192 {
+	background-color: #d7ff87;
+}
+
+.terminal .xterm-color-193 {
+	color: #d7ffaf;
+}
+
+.terminal .xterm-bg-color-193 {
+	background-color: #d7ffaf;
+}
+
+.terminal .xterm-color-194 {
+	color: #d7ffd7;
+}
+
+.terminal .xterm-bg-color-194 {
+	background-color: #d7ffd7;
+}
+
+.terminal .xterm-color-195 {
+	color: #d7ffff;
+}
+
+.terminal .xterm-bg-color-195 {
+	background-color: #d7ffff;
+}
+
+.terminal .xterm-color-196 {
+	color: #ff0000;
+}
+
+.terminal .xterm-bg-color-196 {
+	background-color: #ff0000;
+}
+
+.terminal .xterm-color-197 {
+	color: #ff005f;
+}
+
+.terminal .xterm-bg-color-197 {
+	background-color: #ff005f;
+}
+
+.terminal .xterm-color-198 {
+	color: #ff0087;
+}
+
+.terminal .xterm-bg-color-198 {
+	background-color: #ff0087;
+}
+
+.terminal .xterm-color-199 {
+	color: #ff00af;
+}
+
+.terminal .xterm-bg-color-199 {
+	background-color: #ff00af;
+}
+
+.terminal .xterm-color-200 {
+	color: #ff00d7;
+}
+
+.terminal .xterm-bg-color-200 {
+	background-color: #ff00d7;
+}
+
+.terminal .xterm-color-201 {
+	color: #ff00ff;
+}
+
+.terminal .xterm-bg-color-201 {
+	background-color: #ff00ff;
+}
+
+.terminal .xterm-color-202 {
+	color: #ff5f00;
+}
+
+.terminal .xterm-bg-color-202 {
+	background-color: #ff5f00;
+}
+
+.terminal .xterm-color-203 {
+	color: #ff5f5f;
+}
+
+.terminal .xterm-bg-color-203 {
+	background-color: #ff5f5f;
+}
+
+.terminal .xterm-color-204 {
+	color: #ff5f87;
+}
+
+.terminal .xterm-bg-color-204 {
+	background-color: #ff5f87;
+}
+
+.terminal .xterm-color-205 {
+	color: #ff5faf;
+}
+
+.terminal .xterm-bg-color-205 {
+	background-color: #ff5faf;
+}
+
+.terminal .xterm-color-206 {
+	color: #ff5fd7;
+}
+
+.terminal .xterm-bg-color-206 {
+	background-color: #ff5fd7;
+}
+
+.terminal .xterm-color-207 {
+	color: #ff5fff;
+}
+
+.terminal .xterm-bg-color-207 {
+	background-color: #ff5fff;
+}
+
+.terminal .xterm-color-208 {
+	color: #ff8700;
+}
+
+.terminal .xterm-bg-color-208 {
+	background-color: #ff8700;
+}
+
+.terminal .xterm-color-209 {
+	color: #ff875f;
+}
+
+.terminal .xterm-bg-color-209 {
+	background-color: #ff875f;
+}
+
+.terminal .xterm-color-210 {
+	color: #ff8787;
+}
+
+.terminal .xterm-bg-color-210 {
+	background-color: #ff8787;
+}
+
+.terminal .xterm-color-211 {
+	color: #ff87af;
+}
+
+.terminal .xterm-bg-color-211 {
+	background-color: #ff87af;
+}
+
+.terminal .xterm-color-212 {
+	color: #ff87d7;
+}
+
+.terminal .xterm-bg-color-212 {
+	background-color: #ff87d7;
+}
+
+.terminal .xterm-color-213 {
+	color: #ff87ff;
+}
+
+.terminal .xterm-bg-color-213 {
+	background-color: #ff87ff;
+}
+
+.terminal .xterm-color-214 {
+	color: #ffaf00;
+}
+
+.terminal .xterm-bg-color-214 {
+	background-color: #ffaf00;
+}
+
+.terminal .xterm-color-215 {
+	color: #ffaf5f;
+}
+
+.terminal .xterm-bg-color-215 {
+	background-color: #ffaf5f;
+}
+
+.terminal .xterm-color-216 {
+	color: #ffaf87;
+}
+
+.terminal .xterm-bg-color-216 {
+	background-color: #ffaf87;
+}
+
+.terminal .xterm-color-217 {
+	color: #ffafaf;
+}
+
+.terminal .xterm-bg-color-217 {
+	background-color: #ffafaf;
+}
+
+.terminal .xterm-color-218 {
+	color: #ffafd7;
+}
+
+.terminal .xterm-bg-color-218 {
+	background-color: #ffafd7;
+}
+
+.terminal .xterm-color-219 {
+	color: #ffafff;
+}
+
+.terminal .xterm-bg-color-219 {
+	background-color: #ffafff;
+}
+
+.terminal .xterm-color-220 {
+	color: #ffd700;
+}
+
+.terminal .xterm-bg-color-220 {
+	background-color: #ffd700;
+}
+
+.terminal .xterm-color-221 {
+	color: #ffd75f;
+}
+
+.terminal .xterm-bg-color-221 {
+	background-color: #ffd75f;
+}
+
+.terminal .xterm-color-222 {
+	color: #ffd787;
+}
+
+.terminal .xterm-bg-color-222 {
+	background-color: #ffd787;
+}
+
+.terminal .xterm-color-223 {
+	color: #ffd7af;
+}
+
+.terminal .xterm-bg-color-223 {
+	background-color: #ffd7af;
+}
+
+.terminal .xterm-color-224 {
+	color: #ffd7d7;
+}
+
+.terminal .xterm-bg-color-224 {
+	background-color: #ffd7d7;
+}
+
+.terminal .xterm-color-225 {
+	color: #ffd7ff;
+}
+
+.terminal .xterm-bg-color-225 {
+	background-color: #ffd7ff;
+}
+
+.terminal .xterm-color-226 {
+	color: #ffff00;
+}
+
+.terminal .xterm-bg-color-226 {
+	background-color: #ffff00;
+}
+
+.terminal .xterm-color-227 {
+	color: #ffff5f;
+}
+
+.terminal .xterm-bg-color-227 {
+	background-color: #ffff5f;
+}
+
+.terminal .xterm-color-228 {
+	color: #ffff87;
+}
+
+.terminal .xterm-bg-color-228 {
+	background-color: #ffff87;
+}
+
+.terminal .xterm-color-229 {
+	color: #ffffaf;
+}
+
+.terminal .xterm-bg-color-229 {
+	background-color: #ffffaf;
+}
+
+.terminal .xterm-color-230 {
+	color: #ffffd7;
+}
+
+.terminal .xterm-bg-color-230 {
+	background-color: #ffffd7;
+}
+
+.terminal .xterm-color-231 {
+	color: #ffffff;
+}
+
+.terminal .xterm-bg-color-231 {
+	background-color: #ffffff;
+}
+
+.terminal .xterm-color-232 {
+	color: #080808;
+}
+
+.terminal .xterm-bg-color-232 {
+	background-color: #080808;
+}
+
+.terminal .xterm-color-233 {
+	color: #121212;
+}
+
+.terminal .xterm-bg-color-233 {
+	background-color: #121212;
+}
+
+.terminal .xterm-color-234 {
+	color: #1c1c1c;
+}
+
+.terminal .xterm-bg-color-234 {
+	background-color: #1c1c1c;
+}
+
+.terminal .xterm-color-235 {
+	color: #262626;
+}
+
+.terminal .xterm-bg-color-235 {
+	background-color: #262626;
+}
+
+.terminal .xterm-color-236 {
+	color: #303030;
+}
+
+.terminal .xterm-bg-color-236 {
+	background-color: #303030;
+}
+
+.terminal .xterm-color-237 {
+	color: #3a3a3a;
+}
+
+.terminal .xterm-bg-color-237 {
+	background-color: #3a3a3a;
+}
+
+.terminal .xterm-color-238 {
+	color: #444444;
+}
+
+.terminal .xterm-bg-color-238 {
+	background-color: #444444;
+}
+
+.terminal .xterm-color-239 {
+	color: #4e4e4e;
+}
+
+.terminal .xterm-bg-color-239 {
+	background-color: #4e4e4e;
+}
+
+.terminal .xterm-color-240 {
+	color: #585858;
+}
+
+.terminal .xterm-bg-color-240 {
+	background-color: #585858;
+}
+
+.terminal .xterm-color-241 {
+	color: #626262;
+}
+
+.terminal .xterm-bg-color-241 {
+	background-color: #626262;
+}
+
+.terminal .xterm-color-242 {
+	color: #6c6c6c;
+}
+
+.terminal .xterm-bg-color-242 {
+	background-color: #6c6c6c;
+}
+
+.terminal .xterm-color-243 {
+	color: #767676;
+}
+
+.terminal .xterm-bg-color-243 {
+	background-color: #767676;
+}
+
+.terminal .xterm-color-244 {
+	color: #808080;
+}
+
+.terminal .xterm-bg-color-244 {
+	background-color: #808080;
+}
+
+.terminal .xterm-color-245 {
+	color: #8a8a8a;
+}
+
+.terminal .xterm-bg-color-245 {
+	background-color: #8a8a8a;
+}
+
+.terminal .xterm-color-246 {
+	color: #949494;
+}
+
+.terminal .xterm-bg-color-246 {
+	background-color: #949494;
+}
+
+.terminal .xterm-color-247 {
+	color: #9e9e9e;
+}
+
+.terminal .xterm-bg-color-247 {
+	background-color: #9e9e9e;
+}
+
+.terminal .xterm-color-248 {
+	color: #a8a8a8;
+}
+
+.terminal .xterm-bg-color-248 {
+	background-color: #a8a8a8;
+}
+
+.terminal .xterm-color-249 {
+	color: #b2b2b2;
+}
+
+.terminal .xterm-bg-color-249 {
+	background-color: #b2b2b2;
+}
+
+.terminal .xterm-color-250 {
+	color: #bcbcbc;
+}
+
+.terminal .xterm-bg-color-250 {
+	background-color: #bcbcbc;
+}
+
+.terminal .xterm-color-251 {
+	color: #c6c6c6;
+}
+
+.terminal .xterm-bg-color-251 {
+	background-color: #c6c6c6;
+}
+
+.terminal .xterm-color-252 {
+	color: #d0d0d0;
+}
+
+.terminal .xterm-bg-color-252 {
+	background-color: #d0d0d0;
+}
+
+.terminal .xterm-color-253 {
+	color: #dadada;
+}
+
+.terminal .xterm-bg-color-253 {
+	background-color: #dadada;
+}
+
+.terminal .xterm-color-254 {
+	color: #e4e4e4;
+}
+
+.terminal .xterm-bg-color-254 {
+	background-color: #e4e4e4;
+}
+
+.terminal .xterm-color-255 {
+	color: #eeeeee;
+}
+
+.terminal .xterm-bg-color-255 {
+	background-color: #eeeeee;
+}
+
+/**
+ * All terminal rows should have explicitly declared height,
+ * in order to allow child elements to adjust.
+ */
+.terminal .xterm-rows > div {
+	line-height: 1.2;
+}
+
+/**
+ * All styled spans inside terminal lines should be inline-blocks,
+ * in orde to achieve better height adjustment.
+ */
+.terminal .xterm-rows span {
+	display: inline-block;
+}
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
index 9e64b72ff9e6b03a1ed5f439f3786dc7d37a3d1a..15c981cb8f10a709db019652ceb237056aab705f 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import cp = require('child_process');
-import termJs = require('term.js');
+import xterm = require('xterm');
 import lifecycle = require('vs/base/common/lifecycle');
 import os = require('os');
 import path = require('path');
@@ -45,7 +45,7 @@ export class TerminalInstance {
 			vertical: ScrollbarVisibility.Auto
 		});
 		this.toDispose.push(terminalScrollbar);
-		this.terminal = termJs({
+		this.terminal = xterm({
 			cursorBlink: false // term.js' blinking cursor breaks selection
 		});