diff --git a/extensions/javascript/src/features/packageJSONContribution.ts b/extensions/javascript/src/features/packageJSONContribution.ts
index 573b8b1608f..0ffcdb49a74 100644
--- a/extensions/javascript/src/features/packageJSONContribution.ts
+++ b/extensions/javascript/src/features/packageJSONContribution.ts
@@ -18,7 +18,7 @@ let LIMIT = 40;
 export class PackageJSONContribution implements IJSONContribution {
 
 	private mostDependedOn = ['lodash', 'async', 'underscore', 'request', 'commander', 'express', 'debug', 'chalk', 'colors', 'q', 'coffee-script',
-		'mkdirp', 'optimist', 'through2', 'yeoman-generator', 'moment', 'bluebird', 'glob', 'gulp-util', 'minimist', 'cheerio', 'jade', 'redis', 'node-uuid',
+		'mkdirp', 'optimist', 'through2', 'yeoman-generator', 'moment', 'bluebird', 'glob', 'gulp-util', 'minimist', 'cheerio', 'pug', 'redis', 'node-uuid',
 		'socket', 'io', 'uglify-js', 'winston', 'through', 'fs-extra', 'handlebars', 'body-parser', 'rimraf', 'mime', 'semver', 'mongodb', 'jquery',
 		'grunt', 'connect', 'yosay', 'underscore', 'string', 'xml2js', 'ejs', 'mongoose', 'marked', 'extend', 'mocha', 'superagent', 'js-yaml', 'xtend',
 		'shelljs', 'gulp', 'yargs', 'browserify', 'minimatch', 'react', 'less', 'prompt', 'inquirer', 'ws', 'event-stream', 'inherits', 'mysql', 'esprima',
diff --git a/extensions/jade/OSSREADME.json b/extensions/pug/OSSREADME.json
similarity index 100%
rename from extensions/jade/OSSREADME.json
rename to extensions/pug/OSSREADME.json
diff --git a/extensions/jade/language-configuration.json b/extensions/pug/language-configuration.json
similarity index 100%
rename from extensions/jade/language-configuration.json
rename to extensions/pug/language-configuration.json
diff --git a/extensions/jade/package.json b/extensions/pug/package.json
similarity index 68%
rename from extensions/jade/package.json
rename to extensions/pug/package.json
index a075eedaffe..2d80e2c46d0 100644
--- a/extensions/jade/package.json
+++ b/extensions/pug/package.json
@@ -1,22 +1,22 @@
 {
-	"name": "jade",
+	"name": "pug",
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js davidrios/jade-tmbundle Syntaxes/Jade.tmLanguage ./syntaxes/Jade.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js davidrios/jade-tmbundle Syntaxes/Jade.tmLanguage ./syntaxes/pug.tmLanguage.json"
 	},
 	"contributes": {
 		"languages": [{
 			"id": "jade",
 			"extensions": [ ".jade", ".pug" ],
-			"aliases": [ "Jade", "jade" ],
+			"aliases": [ "Pug", "Jade", "jade" ],
 			"configuration": "./language-configuration.json"
 		}],
 		"grammars": [{
 			"language": "jade",
 			"scopeName": "text.jade",
-			"path": "./syntaxes/Jade.json"
+			"path": "./syntaxes/pug.tmLanguage.json"
 		}]
 	}
 }
\ No newline at end of file
diff --git a/extensions/jade/syntaxes/Jade.json b/extensions/pug/syntaxes/pug.tmLanguage.json
similarity index 95%
rename from extensions/jade/syntaxes/Jade.json
rename to extensions/pug/syntaxes/pug.tmLanguage.json
index 0bb3f888222..808be9e6db8 100644
--- a/extensions/jade/syntaxes/Jade.json
+++ b/extensions/pug/syntaxes/pug.tmLanguage.json
@@ -33,6 +33,17 @@
 				}
 			]
 		},
+		{
+			"begin": "<!--",
+			"end": "--\\s*>",
+			"name": "comment.unbuffered.block.jade",
+			"patterns": [
+				{
+					"match": "--",
+					"name": "invalid.illegal.comment.comment.block.jade"
+				}
+			]
+		},
 		{
 			"begin": "^(\\s*)-$",
 			"comment": "Unbuffered code block.",
@@ -45,10 +56,10 @@
 			]
 		},
 		{
-			"begin": "^(\\s*)(script)(?=[.#(\\s])((?![^\\n]*type=)|(?=[^\\n]*(text|application)/javascript))",
+			"begin": "^(\\s*)(script)((\\.$)|(?=[^\\n]*(text|application)/javascript.*\\.$))",
 			"beginCaptures": {
 				"2": {
-					"name": "entity.name.tag.script.jade"
+					"name": "entity.name.tag.jade"
 				}
 			},
 			"comment": "Script tag with JavaScript code.",
@@ -58,7 +69,6 @@
 				{
 					"begin": "\\G(?=\\()",
 					"end": "$",
-					"name": "stuff.tag.script.jade",
 					"patterns": [
 						{
 							"include": "#tag_attributes"
@@ -68,7 +78,6 @@
 				{
 					"begin": "\\G(?=[.#])",
 					"end": "$",
-					"name": "stuff.tag.script.jade",
 					"patterns": [
 						{
 							"include": "#complete_tag"
@@ -84,7 +93,7 @@
 			"begin": "^(\\s*)(style)((\\.$)|(?=[.#(].*\\.$))",
 			"beginCaptures": {
 				"2": {
-					"name": "entity.name.tag.script.jade"
+					"name": "entity.name.tag.jade"
 				}
 			},
 			"comment": "Style tag with CSS code.",
@@ -94,7 +103,6 @@
 				{
 					"begin": "\\G(?=\\()",
 					"end": "$",
-					"name": "stuff.tag.style.jade",
 					"patterns": [
 						{
 							"include": "#tag_attributes"
@@ -104,7 +112,6 @@
 				{
 					"begin": "\\G(?=[.#])",
 					"end": "$",
-					"name": "stuff.tag.style.jade",
 					"patterns": [
 						{
 							"include": "#complete_tag"
@@ -225,10 +232,10 @@
 			"begin": "^(\\s*)(?=[\\w.#].*?\\.$)(?=(?:(?:(?:(?:(?:#[\\w-]+)|(?:\\.[\\w-]+))|(?:(?:[#!]\\{[^}]*\\})|(?:\\w(?:(?:[\\w:-]+[\\w-])|(?:[\\w-]*)))))(?:(?:#[\\w-]+)|(?:\\.[\\w-]+)|(?:\\((?:[^()\\'\\\"]*(?:(?:\\'(?:[^\\']|(?:(?<!\\\\)\\\\\\'))*\\')|(?:\\\"(?:[^\\\"]|(?:(?<!\\\\)\\\\\\\"))*\\\")))*[^()]*\\))*)*)(?:(?:(?::\\s+)|(?<=\\)))(?:(?:(?:(?:#[\\w-]+)|(?:\\.[\\w-]+))|(?:(?:[#!]\\{[^}]*\\})|(?:\\w(?:(?:[\\w:-]+[\\w-])|(?:[\\w-]*)))))(?:(?:#[\\w-]+)|(?:\\.[\\w-]+)|(?:\\((?:[^()\\'\\\"]*(?:(?:\\'(?:[^\\']|(?:(?<!\\\\)\\\\\\'))*\\')|(?:\\\"(?:[^\\\"]|(?:(?<!\\\\)\\\\\\\"))*\\\")))*[^()]*\\))*)*))*)\\.$)(?:(?:(#[\\w-]+)|(\\.[\\w-]+))|((?:[#!]\\{[^}]*\\})|(?:\\w(?:(?:[\\w:-]+[\\w-])|(?:[\\w-]*)))))",
 			"beginCaptures": {
 				"2": {
-					"name": "constant.id.tag.jade"
+					"name": "entity.other.attribute-name.id.jade"
 				},
 				"3": {
-					"name": "constant.language.js"
+					"name": "entity.other.attribute-name.class.jade"
 				},
 				"4": {
 					"name": "meta.tag.other entity.name.tag.jade"
@@ -363,6 +370,18 @@
 		}
 	],
 	"repository": {
+		"babel_parens": {
+			"begin": "\\(",
+			"end": "\\)|(({\\s*)?$)",
+			"patterns": [
+				{
+					"include": "#babel_parens"
+				},
+				{
+					"include": "source.js"
+				}
+			]
+		},
 		"blocks_and_includes": {
 			"captures": {
 				"1": {
@@ -871,11 +890,11 @@
 				}
 			},
 			"match": "\\.([^\\w-])?[\\w-]*",
-			"name": "constant.language.js"
+			"name": "entity.other.attribute-name.class.jade"
 		},
 		"tag_id": {
 			"match": "#[\\w-]+",
-			"name": "constant.id.tag.jade"
+			"name": "entity.other.attribute-name.id.jade"
 		},
 		"tag_mixin_attributes": {
 			"begin": "(&attributes\\()",
@@ -946,12 +965,15 @@
 				}
 			},
 			"comment": "name = function() {}",
-			"end": "(?=\\])|$",
+			"end": "(?=\\])|(({\\s*)?$)",
 			"name": "source.js",
 			"patterns": [
 				{
 					"include": "#js_brackets"
 				},
+				{
+					"include": "#babel_parens"
+				},
 				{
 					"include": "source.js"
 				}
@@ -960,5 +982,5 @@
 	},
 	"scopeName": "text.jade",
 	"uuid": "eee6ba25-6ac2-4f7e-9c70-cddf2bd3448b",
-	"version": "https://github.com/davidrios/jade-tmbundle/commit/7c1304aa5a0d916a93fd296d3dd994219ecdc90f"
+	"version": "https://github.com/davidrios/jade-tmbundle/commit/f311a516bb29296fcebfdc7da8149b1c79dfb0a1"
 }
\ No newline at end of file
diff --git a/extensions/jade/test/colorize-fixtures/test-4287.jade b/extensions/pug/test/colorize-fixtures/test-4287.pug
similarity index 100%
rename from extensions/jade/test/colorize-fixtures/test-4287.jade
rename to extensions/pug/test/colorize-fixtures/test-4287.pug
diff --git a/extensions/jade/test/colorize-fixtures/test.jade b/extensions/pug/test/colorize-fixtures/test.pug
similarity index 100%
rename from extensions/jade/test/colorize-fixtures/test.jade
rename to extensions/pug/test/colorize-fixtures/test.pug
diff --git a/extensions/jade/test/colorize-results/test-4287_jade.json b/extensions/pug/test/colorize-results/test-4287_pug.json
similarity index 100%
rename from extensions/jade/test/colorize-results/test-4287_jade.json
rename to extensions/pug/test/colorize-results/test-4287_pug.json
diff --git a/extensions/jade/test/colorize-results/test_jade.json b/extensions/pug/test/colorize-results/test_pug.json
similarity index 100%
rename from extensions/jade/test/colorize-results/test_jade.json
rename to extensions/pug/test/colorize-results/test_pug.json