From b217a7f2367154c7bdc4f7e42fb86fdb06191090 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Tue, 22 May 2018 10:52:19 +0200
Subject: [PATCH] [pug] Use pug grammar & rename language id. Fixes #50086

---
 build/gulpfile.vscode.js                      |   2 +-
 build/npm/update-grammar.js                   |   2 +-
 extensions/markdown-basics/package.json       |   2 +-
 .../syntaxes/markdown.tmLanguage.json         |   8 +-
 extensions/pug/OSSREADME.json                 |  23 +-
 extensions/pug/package.json                   |   8 +-
 extensions/pug/syntaxes/pug.tmLanguage.json   | 846 +++++++++---------
 .../test/colorize-results/test-4287_pug.json  |   8 +-
 .../pug/test/colorize-results/test_pug.json   | 410 ++++-----
 .../theme-defaults/themes/light_vs.json       |   6 +-
 .../theme-seti/icons/vs-seti-icon-theme.json  |   2 +-
 src/vs/editor/standalone/common/themes.ts     |  12 +-
 12 files changed, 656 insertions(+), 673 deletions(-)

diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 67c8fe08858..c53b798fed7 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -141,7 +141,7 @@ const config = {
 		name: product.nameLong + ' document',
 		role: 'Editor',
 		ostypes: ["TEXT", "utxt", "TUTX", "****"],
-		extensions: ["ascx", "asp", "aspx", "bash", "bash_login", "bash_logout", "bash_profile", "bashrc", "bat", "bowerrc", "c", "cc", "clj", "cljs", "cljx", "clojure", "cmd", "code-workspace", "coffee", "config", "cpp", "cs", "cshtml", "csproj", "css", "csx", "ctp", "cxx", "dockerfile", "dot", "dtd", "editorconfig", "edn", "eyaml", "eyml", "fs", "fsi", "fsscript", "fsx", "gemspec", "gitattributes", "gitconfig", "gitignore", "go", "h", "handlebars", "hbs", "hh", "hpp", "htm", "html", "hxx", "ini", "jade", "jav", "java", "js", "jscsrc", "jshintrc", "jshtm", "json", "jsp", "less", "lua", "m", "makefile", "markdown", "md", "mdoc", "mdown", "mdtext", "mdtxt", "mdwn", "mkd", "mkdn", "ml", "mli", "php", "phtml", "pl", "pl6", "pm", "pm6", "pod", "pp", "profile", "properties", "ps1", "psd1", "psgi", "psm1", "py", "r", "rb", "rhistory", "rprofile", "rs", "rt", "scss", "sh", "shtml", "sql", "svg", "svgz", "t", "ts", "txt", "vb", "wxi", "wxl", "wxs", "xaml", "xcodeproj", "xcworkspace", "xml", "yaml", "yml", "zlogin", "zlogout", "zprofile", "zsh", "zshenv", "zshrc"],
+		extensions: ["ascx", "asp", "aspx", "bash", "bash_login", "bash_logout", "bash_profile", "bashrc", "bat", "bowerrc", "c", "cc", "clj", "cljs", "cljx", "clojure", "cmd", "code-workspace", "coffee", "config", "cpp", "cs", "cshtml", "csproj", "css", "csx", "ctp", "cxx", "dockerfile", "dot", "dtd", "editorconfig", "edn", "eyaml", "eyml", "fs", "fsi", "fsscript", "fsx", "gemspec", "gitattributes", "gitconfig", "gitignore", "go", "h", "handlebars", "hbs", "hh", "hpp", "htm", "html", "hxx", "ini", "jade", "jav", "java", "js", "jscsrc", "jshintrc", "jshtm", "json", "jsp", "less", "lua", "m", "makefile", "markdown", "md", "mdoc", "mdown", "mdtext", "mdtxt", "mdwn", "mkd", "mkdn", "ml", "mli", "php", "phtml", "pl", "pl6", "pm", "pm6", "pod", "pp", "profile", "properties", "ps1", "psd1", "psgi", "psm1", "pug", "py", "r", "rb", "rhistory", "rprofile", "rs", "rt", "scss", "sh", "shtml", "sql", "svg", "svgz", "t", "ts", "txt", "vb", "wxi", "wxl", "wxs", "xaml", "xcodeproj", "xcworkspace", "xml", "yaml", "yml", "zlogin", "zlogout", "zprofile", "zsh", "zshenv", "zshrc"],
 		iconFile: 'resources/darwin/code_file.icns'
 	}],
 	darwinBundleURLTypes: [{
diff --git a/build/npm/update-grammar.js b/build/npm/update-grammar.js
index 822de7c59c2..988b7bc3795 100644
--- a/build/npm/update-grammar.js
+++ b/build/npm/update-grammar.js
@@ -83,7 +83,7 @@ exports.update = function (repoId, repoPath, dest, modifyGrammar, version = 'mas
 			grammar = plist.parse(content);
 		} else if (ext === '.cson') {
 			grammar = cson.parse(content);
-		} else if (ext === '.json') {
+		} else if (ext === '.json' || ext === '.JSON-tmLanguage') {
 			grammar = JSON.parse(content);
 		} else {
 			return Promise.reject(new Error('Unknown file extension: ' + ext));
diff --git a/extensions/markdown-basics/package.json b/extensions/markdown-basics/package.json
index 8583ba0c8bc..a07bb0378ae 100644
--- a/extensions/markdown-basics/package.json
+++ b/extensions/markdown-basics/package.json
@@ -57,7 +57,7 @@
 					"meta.embedded.block.dockerfile": "dockerfile",
 					"meta.embedded.block.go": "go",
 					"meta.embedded.block.groovy": "groovy",
-					"meta.embedded.block.jade": "jade",
+					"meta.embedded.block.pug": "pug",
 					"meta.embedded.block.javascript": "javascript",
 					"meta.embedded.block.json": "json",
 					"meta.embedded.block.less": "less",
diff --git a/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json b/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
index 091e4378a90..52b3dcd3ca9 100644
--- a/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
+++ b/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
@@ -109,7 +109,7 @@
 					"include": "#fenced_code_block_groovy"
 				},
 				{
-					"include": "#fenced_code_block_jade"
+					"include": "#fenced_code_block_pug"
 				},
 				{
 					"include": "#fenced_code_block_js"
@@ -1058,7 +1058,7 @@
 						}
 					]
 				},
-				"fenced_code_block_jade": {
+				"fenced_code_block_pug": {
 					"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(jade|pug)(\\s+[^`~]*)?$)",
 					"name": "markup.fenced_code.block.markdown",
 					"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
@@ -1082,10 +1082,10 @@
 						{
 							"begin": "(^|\\G)(\\s*)(.*)",
 							"while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
-							"contentName": "meta.embedded.block.jade",
+							"contentName": "meta.embedded.block.pug",
 							"patterns": [
 								{
-									"include": "text.jade"
+									"include": "text.pug"
 								}
 							]
 						}
diff --git a/extensions/pug/OSSREADME.json b/extensions/pug/OSSREADME.json
index 35a98417d24..37b45142cc0 100644
--- a/extensions/pug/OSSREADME.json
+++ b/extensions/pug/OSSREADME.json
@@ -1,25 +1,8 @@
 // ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
 [{
-	"name": "davidrios/jade-tmbundle",
+	"name": "davidrios/pug-tmbundle",
 	"version": "0.0.0",
 	"license": "MIT",
-	"repositoryURL": "https://github.com/davidrios/jade-tmbundle",
-	"description": "The file syntaxes/Jade.json was derived from Jade.tmLanguage in https://github.com/davidrios/jade-tmbundle.",
-	"licenseDetail": [
-		"The MIT License (MIT)",
-		"",
-		"Copyright (c) 2014 David Rios",
-		"",
-		"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"
-	]
+	"repositoryURL": "https://github.com/davidrios/pug-tmbundle",
+	"description": "The file syntaxes/pug.tmLanguage.json was derived from Syntaxes/Pug.JSON-tmLanguage in https://github.com/davidrios/pug-tmbundle."
 }]
diff --git a/extensions/pug/package.json b/extensions/pug/package.json
index 8c584ed78b4..60d7bf783fb 100644
--- a/extensions/pug/package.json
+++ b/extensions/pug/package.json
@@ -6,18 +6,18 @@
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js davidrios/jade-tmbundle Syntaxes/Jade.tmLanguage ./syntaxes/pug.tmLanguage.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js davidrios/pug-tmbundle Syntaxes/Pug.JSON-tmLanguage ./syntaxes/pug.tmLanguage.json"
 	},
 	"contributes": {
 		"languages": [{
-			"id": "jade",
+			"id": "pug",
 			"extensions": [ ".jade", ".pug" ],
 			"aliases": [ "Pug", "Jade", "jade" ],
 			"configuration": "./language-configuration.json"
 		}],
 		"grammars": [{
-			"language": "jade",
-			"scopeName": "text.jade",
+			"language": "pug",
+			"scopeName": "text.pug",
 			"path": "./syntaxes/pug.tmLanguage.json"
 		}]
 	}
diff --git a/extensions/pug/syntaxes/pug.tmLanguage.json b/extensions/pug/syntaxes/pug.tmLanguage.json
index cff09cd9a37..108fc1ed1c6 100644
--- a/extensions/pug/syntaxes/pug.tmLanguage.json
+++ b/extensions/pug/syntaxes/pug.tmLanguage.json
@@ -1,58 +1,58 @@
 {
 	"information_for_contributors": [
-		"This file has been converted from https://github.com/davidrios/jade-tmbundle/blob/master/Syntaxes/Jade.tmLanguage",
+		"This file has been converted from https://github.com/davidrios/pug-tmbundle/blob/master/Syntaxes/Pug.JSON-tmLanguage",
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/davidrios/jade-tmbundle/commit/f311a516bb29296fcebfdc7da8149b1c79dfb0a1",
-	"name": "Jade",
-	"scopeName": "text.jade",
+	"version": "https://github.com/davidrios/pug-tmbundle/commit/e67e895f6fb64932aa122e471000fa55d826bff6",
+	"name": "Pug",
+	"scopeName": "text.pug",
 	"patterns": [
 		{
-			"comment": "Doctype declaration.",
 			"match": "^(!!!|doctype)(\\s*[a-zA-Z0-9-_]+)?",
-			"name": "meta.tag.sgml.doctype.html"
+			"name": "meta.tag.sgml.doctype.html",
+			"comment": "Doctype declaration."
 		},
 		{
 			"begin": "^(\\s*)//-",
-			"comment": "Unbuffered (jade-only) comments.",
 			"end": "^(?!(\\1\\s)|\\s*$)",
-			"name": "comment.unbuffered.block.jade"
+			"name": "comment.unbuffered.block.pug",
+			"comment": "Unbuffered (pug-only) comments."
 		},
 		{
 			"begin": "^(\\s*)//",
-			"comment": "Buffered (html) comments.",
 			"end": "^(?!(\\1\\s)|\\s*$)",
-			"name": "string.comment.buffered.block.jade",
+			"name": "string.comment.buffered.block.pug",
+			"comment": "Buffered (html) comments.",
 			"patterns": [
 				{
 					"captures": {
 						"1": {
-							"name": "invalid.illegal.comment.comment.block.jade"
+							"name": "invalid.illegal.comment.comment.block.pug"
 						}
 					},
-					"comment": "Buffered comments inside buffered comments will generate invalid html.",
 					"match": "^\\s*(//)(?!-)",
-					"name": "string.comment.buffered.block.jade"
+					"name": "string.comment.buffered.block.pug",
+					"comment": "Buffered comments inside buffered comments will generate invalid html."
 				}
 			]
 		},
 		{
 			"begin": "<!--",
 			"end": "--\\s*>",
-			"name": "comment.unbuffered.block.jade",
+			"name": "comment.unbuffered.block.pug",
 			"patterns": [
 				{
 					"match": "--",
-					"name": "invalid.illegal.comment.comment.block.jade"
+					"name": "invalid.illegal.comment.comment.block.pug"
 				}
 			]
 		},
 		{
 			"begin": "^(\\s*)-$",
-			"comment": "Unbuffered code block.",
 			"end": "^(?!(\\1\\s)|\\s*$)",
 			"name": "source.js",
+			"comment": "Unbuffered code block.",
 			"patterns": [
 				{
 					"include": "source.js"
@@ -63,12 +63,12 @@
 			"begin": "^(\\s*)(script)((\\.$)|(?=[^\\n]*(text|application)/javascript.*\\.$))",
 			"beginCaptures": {
 				"2": {
-					"name": "entity.name.tag.jade"
+					"name": "entity.name.tag.pug"
 				}
 			},
-			"comment": "Script tag with JavaScript code.",
 			"end": "^(?!(\\1\\s)|\\s*$)",
 			"name": "meta.tag.other",
+			"comment": "Script tag with JavaScript code.",
 			"patterns": [
 				{
 					"begin": "\\G(?=\\()",
@@ -97,12 +97,12 @@
 			"begin": "^(\\s*)(style)((\\.$)|(?=[.#(].*\\.$))",
 			"beginCaptures": {
 				"2": {
-					"name": "entity.name.tag.jade"
+					"name": "entity.name.tag.pug"
 				}
 			},
-			"comment": "Style tag with CSS code.",
 			"end": "^(?!(\\1\\s)|\\s*$)",
 			"name": "meta.tag.other",
+			"comment": "Style tag with CSS code.",
 			"patterns": [
 				{
 					"begin": "\\G(?=\\()",
@@ -131,11 +131,11 @@
 			"begin": "^(\\s*):(sass)(?=\\(|$)",
 			"beginCaptures": {
 				"2": {
-					"name": "constant.language.name.sass.filter.jade"
+					"name": "constant.language.name.sass.filter.pug"
 				}
 			},
 			"end": "^(?!(\\1\\s)|\\s*$)",
-			"name": "source.sass.filter.jade",
+			"name": "source.sass.filter.pug",
 			"patterns": [
 				{
 					"include": "#tag_attributes"
@@ -149,11 +149,11 @@
 			"begin": "^(\\s*):(less)(?=\\(|$)",
 			"beginCaptures": {
 				"2": {
-					"name": "constant.language.name.less.filter.jade"
+					"name": "constant.language.name.less.filter.pug"
 				}
 			},
 			"end": "^(?!(\\1\\s)|\\s*$)",
-			"name": "source.less.filter.jade",
+			"name": "source.less.filter.pug",
 			"patterns": [
 				{
 					"include": "#tag_attributes"
@@ -167,7 +167,7 @@
 			"begin": "^(\\s*):(stylus)(?=\\(|$)",
 			"beginCaptures": {
 				"2": {
-					"name": "constant.language.name.stylus.filter.jade"
+					"name": "constant.language.name.stylus.filter.pug"
 				}
 			},
 			"end": "^(?!(\\1\\s)|\\s*$)",
@@ -184,11 +184,11 @@
 			"begin": "^(\\s*):(coffee(-?script)?)(?=\\(|$)",
 			"beginCaptures": {
 				"2": {
-					"name": "constant.language.name.coffeescript.filter.jade"
+					"name": "constant.language.name.coffeescript.filter.pug"
 				}
 			},
 			"end": "^(?!(\\1\\s)|\\s*$)",
-			"name": "source.coffeescript.filter.jade",
+			"name": "source.coffeescript.filter.pug",
 			"patterns": [
 				{
 					"include": "#tag_attributes"
@@ -202,31 +202,31 @@
 			"begin": "^(\\s*)((:(?=.))|(:$))",
 			"beginCaptures": {
 				"4": {
-					"name": "invalid.illegal.empty.generic.filter.jade"
+					"name": "invalid.illegal.empty.generic.filter.pug"
 				}
 			},
-			"comment": "Generic Jade filter.",
 			"end": "^(?!(\\1\\s)|\\s*$)",
+			"comment": "Generic Pug filter.",
 			"patterns": [
 				{
 					"begin": "\\G(?<=:)(?=.)",
 					"end": "$",
-					"name": "name.generic.filter.jade",
+					"name": "name.generic.filter.pug",
 					"patterns": [
 						{
 							"match": "\\G\\(",
-							"name": "invalid.illegal.name.generic.filter.jade"
+							"name": "invalid.illegal.name.generic.filter.pug"
 						},
 						{
 							"match": "[\\w-]",
-							"name": "constant.language.name.generic.filter.jade"
+							"name": "constant.language.name.generic.filter.pug"
 						},
 						{
 							"include": "#tag_attributes"
 						},
 						{
 							"match": "\\W",
-							"name": "invalid.illegal.name.generic.filter.jade"
+							"name": "invalid.illegal.name.generic.filter.pug"
 						}
 					]
 				}
@@ -236,17 +236,17 @@
 			"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": "entity.other.attribute-name.id.jade"
+					"name": "entity.other.attribute-name.id.pug"
 				},
 				"3": {
-					"name": "entity.other.attribute-name.class.jade"
+					"name": "entity.other.attribute-name.class.pug"
 				},
 				"4": {
-					"name": "meta.tag.other entity.name.tag.jade"
+					"name": "meta.tag.other entity.name.tag.pug"
 				}
 			},
-			"comment": "Generated from dot_block_tag.py",
 			"end": "^(?!(\\1\\s)|\\s*$)",
+			"comment": "Generated from dot_block_tag.py",
 			"patterns": [
 				{
 					"include": "#tag_attributes"
@@ -257,10 +257,10 @@
 				{
 					"begin": "^(?=.)",
 					"end": "$",
-					"name": "text.block.jade",
+					"name": "text.block.pug",
 					"patterns": [
 						{
-							"include": "#inline_jade"
+							"include": "#inline_pug"
 						},
 						{
 							"include": "#embedded_html"
@@ -280,11 +280,11 @@
 		},
 		{
 			"begin": "^\\s*",
-			"comment": "All constructs that generally span a single line starting with any number of white-spaces.",
 			"end": "$",
+			"comment": "All constructs that generally span a single line starting with any number of white-spaces.",
 			"patterns": [
 				{
-					"include": "#inline_jade"
+					"include": "#inline_pug"
 				},
 				{
 					"include": "#blocks_and_includes"
@@ -306,12 +306,12 @@
 				},
 				{
 					"begin": "\\|",
-					"comment": "Tag pipe text line.",
 					"end": "$",
-					"name": "text.block.pipe.jade",
+					"name": "text.block.pipe.pug",
+					"comment": "Tag pipe text line.",
 					"patterns": [
 						{
-							"include": "#inline_jade"
+							"include": "#inline_pug"
 						},
 						{
 							"include": "#embedded_html"
@@ -332,15 +332,15 @@
 				},
 				{
 					"begin": "\\G(?=(#[^\\{\\w-])|[^\\w.#])",
-					"comment": "Line starting with characters incompatible with tag name/id/class is standalone text.",
 					"end": "$",
+					"comment": "Line starting with characters incompatible with tag name/id/class is standalone text.",
 					"patterns": [
 						{
 							"begin": "</?(?=[!#])",
 							"end": ">|$",
 							"patterns": [
 								{
-									"include": "#inline_jade"
+									"include": "#inline_pug"
 								},
 								{
 									"include": "#interpolated_value"
@@ -351,7 +351,7 @@
 							]
 						},
 						{
-							"include": "#inline_jade"
+							"include": "#inline_pug"
 						},
 						{
 							"include": "#embedded_html"
@@ -374,10 +374,33 @@
 		}
 	],
 	"repository": {
-		"babel_parens": {
-			"begin": "\\(",
-			"end": "\\)|(({\\s*)?$)",
+		"blocks_and_includes": {
+			"captures": {
+				"1": {
+					"name": "storage.type.import.include.pug"
+				},
+				"4": {
+					"name": "variable.control.import.include.pug"
+				}
+			},
+			"match": "(extends|include|yield|append|prepend|block( (append|prepend))?)\\s+(.*)$",
+			"name": "meta.first-class.pug",
+			"comment": "Template blocks and includes."
+		},
+		"unbuffered_code": {
+			"begin": "(-|(([a-zA-Z0-9_]+)\\s+=))",
+			"beginCaptures": {
+				"3": {
+					"name": "variable.parameter.javascript.embedded.pug"
+				}
+			},
+			"end": "(?=\\])|(({\\s*)?$)",
+			"name": "source.js",
+			"comment": "name = function() {}",
 			"patterns": [
+				{
+					"include": "#js_brackets"
+				},
 				{
 					"include": "#babel_parens"
 				},
@@ -386,34 +409,122 @@
 				}
 			]
 		},
-		"blocks_and_includes": {
+		"mixin_definition": {
+			"match": "(mixin\\s+)([\\w-]+)(?:(\\()\\s*((?:[a-zA-Z_]\\w*\\s*)(?:,\\s*[a-zA-Z_]\\w*\\s*)*)(\\)))?$",
 			"captures": {
 				"1": {
-					"name": "storage.type.import.include.jade"
+					"name": "storage.type.function.pug"
+				},
+				"2": {
+					"name": "meta.tag.other entity.name.function.pug"
+				},
+				"3": {
+					"name": "punctuation.definition.parameters.begin.js"
 				},
 				"4": {
-					"name": "variable.control.import.include.jade"
+					"name": "variable.parameter.function.js"
+				},
+				"5": {
+					"name": "punctuation.definition.parameters.begin.js"
+				}
+			}
+		},
+		"mixin_call": {
+			"begin": "((?:mixin\\s+)|\\+)([\\w-]+)",
+			"beginCaptures": {
+				"1": {
+					"name": "storage.type.function.pug"
+				},
+				"2": {
+					"name": "meta.tag.other entity.name.function.pug"
 				}
 			},
-			"comment": "Template blocks and includes.",
-			"match": "(extends|include|yield|append|prepend|block( (append|prepend))?)\\s+(.*)$",
-			"name": "meta.first-class.jade"
+			"end": "(?!\\()|$",
+			"patterns": [
+				{
+					"begin": "(?<!\\))\\(",
+					"end": "\\)",
+					"name": "args.mixin.pug",
+					"patterns": [
+						{
+							"include": "#js_parens"
+						},
+						{
+							"include": "#string"
+						},
+						{
+							"match": "([^\\s(),=/]+)\\s*=\\s*",
+							"captures": {
+								"1": {
+									"name": "meta.tag.other entity.other.attribute-name.tag.pug"
+								}
+							}
+						},
+						{
+							"include": "source.js"
+						}
+					]
+				},
+				{
+					"include": "#tag_attributes"
+				}
+			]
+		},
+		"flow_control": {
+			"begin": "(for|if|else if|else|each|until|while|unless|case)(\\s+|$)",
+			"captures": {
+				"1": {
+					"name": "storage.type.function.pug"
+				}
+			},
+			"end": "$",
+			"name": "meta.control.flow.pug",
+			"comment": "Pug control flow.",
+			"patterns": [
+				{
+					"begin": "",
+					"end": "$",
+					"name": "js.embedded.control.flow.pug",
+					"patterns": [
+						{
+							"include": "source.js"
+						}
+					]
+				}
+			]
+		},
+		"case_when_paren": {
+			"begin": "\\(",
+			"end": "\\)",
+			"name": "js.when.control.flow.pug",
+			"patterns": [
+				{
+					"include": "#case_when_paren"
+				},
+				{
+					"match": ":",
+					"name": "invalid.illegal.name.tag.pug"
+				},
+				{
+					"include": "source.js"
+				}
+			]
 		},
 		"case_conds": {
 			"begin": "(default|when)((\\s+|(?=:))|$)",
 			"captures": {
 				"1": {
-					"name": "storage.type.function.jade"
+					"name": "storage.type.function.pug"
 				}
 			},
-			"comment": "Jade case conditionals.",
 			"end": "$",
-			"name": "meta.control.flow.jade",
+			"name": "meta.control.flow.pug",
+			"comment": "Pug case conditionals.",
 			"patterns": [
 				{
 					"begin": "\\G(?!:)",
 					"end": "(?=:\\s+)|$",
-					"name": "js.embedded.control.flow.jade",
+					"name": "js.embedded.control.flow.pug",
 					"patterns": [
 						{
 							"include": "#case_when_paren"
@@ -426,7 +537,7 @@
 				{
 					"begin": ":\\s+",
 					"end": "$",
-					"name": "tag.case.control.flow.jade",
+					"name": "tag.case.control.flow.pug",
 					"patterns": [
 						{
 							"include": "#complete_tag"
@@ -435,23 +546,6 @@
 				}
 			]
 		},
-		"case_when_paren": {
-			"begin": "\\(",
-			"end": "\\)",
-			"name": "js.when.control.flow.jade",
-			"patterns": [
-				{
-					"include": "#case_when_paren"
-				},
-				{
-					"match": ":",
-					"name": "invalid.illegal.name.tag.jade"
-				},
-				{
-					"include": "source.js"
-				}
-			]
-		},
 		"complete_tag": {
 			"begin": "(?=[\\w.#])|(:\\s*)",
 			"end": "(\\.?$)|(?=:.)",
@@ -470,7 +564,7 @@
 				},
 				{
 					"match": "(?<=:)\\w.*$",
-					"name": "invalid.illegal.name.tag.jade"
+					"name": "invalid.illegal.name.tag.pug"
 				},
 				{
 					"include": "#tag_name"
@@ -488,15 +582,15 @@
 					"include": "#tag_mixin_attributes"
 				},
 				{
+					"match": "((\\.)\\s+$)|((:)\\s*$)",
 					"captures": {
 						"2": {
-							"name": "invalid.illegal.end.tag.jade"
+							"name": "invalid.illegal.end.tag.pug"
 						},
 						"4": {
-							"name": "invalid.illegal.end.tag.jade"
+							"name": "invalid.illegal.end.tag.pug"
 						}
-					},
-					"match": "((\\.)\\s+$)|((:)\\s*$)"
+					}
 				},
 				{
 					"include": "#printed_expression"
@@ -506,38 +600,20 @@
 				}
 			]
 		},
-		"embedded_html": {
-			"begin": "(?=<[^>]*>)",
-			"end": "$|(?=>)",
-			"name": "html",
+		"tag_name": {
+			"begin": "([#!]\\{(?=.*?\\}))|(\\w(([\\w:-]+[\\w-])|([\\w-]*)))",
+			"end": "(\\G(?<!\\5[^\\w-]))|\\}|$",
+			"name": "meta.tag.other entity.name.tag.pug",
 			"patterns": [
 				{
-					"include": "text.html.basic"
-				},
-				{
-					"include": "#interpolated_value"
-				},
-				{
-					"include": "#interpolated_error"
-				}
-			]
-		},
-		"flow_control": {
-			"begin": "(for|if|else if|else|each|until|while|unless|case)(\\s+|$)",
-			"captures": {
-				"1": {
-					"name": "storage.type.function.jade"
-				}
-			},
-			"comment": "Jade control flow.",
-			"end": "$",
-			"name": "meta.control.flow.jade",
-			"patterns": [
-				{
-					"begin": "",
-					"end": "$",
-					"name": "js.embedded.control.flow.jade",
+					"begin": "\\G(?<=\\{)",
+					"end": "(?=\\})",
+					"name": "meta.tag.other entity.name.tag.pug",
 					"patterns": [
+						{
+							"match": "{",
+							"name": "invalid.illegal.tag.pug"
+						},
 						{
 							"include": "source.js"
 						}
@@ -545,287 +621,24 @@
 				}
 			]
 		},
-		"html_entity": {
-			"patterns": [
-				{
-					"match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
-					"name": "constant.character.entity.html.text.jade"
-				},
-				{
-					"match": "[<>&]",
-					"name": "invalid.illegal.html_entity.text.jade"
-				}
-			]
+		"tag_id": {
+			"match": "#[\\w-]+",
+			"name": "entity.other.attribute-name.id.pug"
 		},
-		"inline_jade": {
-			"begin": "(?<!\\\\)(#\\[)",
+		"tag_classes": {
+			"match": "\\.([^\\w-])?[\\w-]*",
 			"captures": {
 				"1": {
-					"name": "entity.name.function.jade"
-				},
-				"2": {
-					"name": "entity.name.function.jade"
+					"name": "invalid.illegal.tag.pug"
 				}
 			},
-			"end": "(\\])",
-			"name": "inline.jade",
-			"patterns": [
-				{
-					"include": "#inline_jade"
-				},
-				{
-					"include": "#mixin_call"
-				},
-				{
-					"begin": "(?<!\\])(?=[\\w.#])|(:\\s*)",
-					"end": "(?=\\]|(:.)|=|\\s)",
-					"name": "tag.inline.jade",
-					"patterns": [
-						{
-							"include": "#tag_name"
-						},
-						{
-							"include": "#tag_id"
-						},
-						{
-							"include": "#tag_classes"
-						},
-						{
-							"include": "#tag_attributes"
-						},
-						{
-							"include": "#tag_mixin_attributes"
-						},
-						{
-							"include": "#inline_jade"
-						},
-						{
-							"match": "\\[",
-							"name": "invalid.illegal.tag.jade"
-						}
-					]
-				},
-				{
-					"include": "#unbuffered_code"
-				},
-				{
-					"include": "#printed_expression"
-				},
-				{
-					"match": "\\[",
-					"name": "invalid.illegal.tag.jade"
-				},
-				{
-					"include": "#inline_jade_text"
-				}
-			]
-		},
-		"inline_jade_text": {
-			"begin": "",
-			"end": "(?=\\])",
-			"patterns": [
-				{
-					"begin": "\\[",
-					"end": "\\]",
-					"patterns": [
-						{
-							"include": "#inline_jade_text"
-						}
-					]
-				},
-				{
-					"include": "#inline_jade"
-				},
-				{
-					"include": "#embedded_html"
-				},
-				{
-					"include": "#html_entity"
-				},
-				{
-					"include": "#interpolated_value"
-				},
-				{
-					"include": "#interpolated_error"
-				}
-			]
-		},
-		"interpolated_error": {
-			"match": "(?<!\\\\)[#!]\\{(?=[^}]*$)",
-			"name": "invalid.illegal.tag.jade"
-		},
-		"interpolated_value": {
-			"begin": "(?<!\\\\)[#!]\\{(?=.*?\\})",
-			"end": "\\}",
-			"name": "string.interpolated.jade",
-			"patterns": [
-				{
-					"match": "{",
-					"name": "invalid.illegal.tag.jade"
-				},
-				{
-					"include": "source.js"
-				}
-			]
-		},
-		"js_braces": {
-			"begin": "\\{",
-			"end": "\\}",
-			"patterns": [
-				{
-					"include": "#js_braces"
-				},
-				{
-					"include": "source.js"
-				}
-			]
-		},
-		"js_brackets": {
-			"begin": "\\[",
-			"end": "\\]",
-			"patterns": [
-				{
-					"include": "#js_brackets"
-				},
-				{
-					"include": "source.js"
-				}
-			]
-		},
-		"js_parens": {
-			"begin": "\\(",
-			"end": "\\)",
-			"patterns": [
-				{
-					"include": "#js_parens"
-				},
-				{
-					"include": "source.js"
-				}
-			]
-		},
-		"mixin_call": {
-			"begin": "((?:mixin\\s+)|\\+)([\\w-]+)",
-			"beginCaptures": {
-				"1": {
-					"name": "storage.type.function.jade"
-				},
-				"2": {
-					"name": "meta.tag.other entity.name.function.jade"
-				}
-			},
-			"end": "(?!\\()|$",
-			"patterns": [
-				{
-					"begin": "(?<!\\))\\(",
-					"end": "\\)",
-					"name": "args.mixin.jade",
-					"patterns": [
-						{
-							"include": "#js_parens"
-						},
-						{
-							"include": "#string"
-						},
-						{
-							"captures": {
-								"1": {
-									"name": "meta.tag.other entity.other.attribute-name.tag.jade"
-								}
-							},
-							"match": "([^\\s(),=/]+)\\s*=\\s*"
-						},
-						{
-							"include": "source.js"
-						}
-					]
-				},
-				{
-					"include": "#tag_attributes"
-				}
-			]
-		},
-		"mixin_definition": {
-			"captures": {
-				"1": {
-					"name": "storage.type.function.jade"
-				},
-				"2": {
-					"name": "meta.tag.other entity.name.function.jade"
-				},
-				"3": {
-					"name": "punctuation.definition.parameters.begin.js"
-				},
-				"4": {
-					"name": "variable.parameter.function.js"
-				},
-				"5": {
-					"name": "punctuation.definition.parameters.begin.js"
-				}
-			},
-			"match": "(mixin\\s+)([\\w-]+)(?:(\\()\\s*((?:[a-zA-Z_]\\w*\\s*)(?:,\\s*[a-zA-Z_]\\w*\\s*)*)(\\)))?$"
-		},
-		"printed_expression": {
-			"begin": "(!?\\=)\\s*",
-			"captures": {
-				"1": {
-					"name": "constant"
-				}
-			},
-			"end": "(?=\\])|$",
-			"name": "source.js",
-			"patterns": [
-				{
-					"include": "#js_brackets"
-				},
-				{
-					"include": "source.js"
-				}
-			]
-		},
-		"string": {
-			"begin": "(['\"])",
-			"end": "(?<!\\\\)\\1",
-			"name": "string.quoted.jade",
-			"patterns": [
-				{
-					"match": "\\\\((x[0-9a-fA-F]{2})|(u[0-9]{4})|.)",
-					"name": "constant.character.quoted.jade"
-				},
-				{
-					"include": "#interpolated_value"
-				},
-				{
-					"include": "#interpolated_error"
-				}
-			]
-		},
-		"tag_attribute_name": {
-			"captures": {
-				"1": {
-					"name": "entity.other.attribute-name.tag.jade"
-				}
-			},
-			"match": "([^\\s(),=/!]+)\\s*"
-		},
-		"tag_attribute_name_paren": {
-			"begin": "\\(\\s*",
-			"end": "\\)",
-			"name": "entity.other.attribute-name.tag.jade",
-			"patterns": [
-				{
-					"include": "#tag_attribute_name_paren"
-				},
-				{
-					"include": "#tag_attribute_name"
-				}
-			]
+			"name": "entity.other.attribute-name.class.pug"
 		},
 		"tag_attributes": {
 			"begin": "(\\(\\s*)",
 			"captures": {
 				"1": {
-					"name": "constant.name.attribute.tag.jade"
+					"name": "constant.name.attribute.tag.pug"
 				}
 			},
 			"end": "(\\))",
@@ -839,7 +652,7 @@
 				},
 				{
 					"match": "!(?!=)",
-					"name": "invalid.illegal.tag.jade"
+					"name": "invalid.illegal.tag.pug"
 				},
 				{
 					"begin": "=\\s*",
@@ -887,24 +700,32 @@
 				}
 			]
 		},
-		"tag_classes": {
+		"tag_attribute_name": {
+			"match": "([^\\s(),=/!]+)\\s*",
 			"captures": {
 				"1": {
-					"name": "invalid.illegal.tag.jade"
+					"name": "entity.other.attribute-name.tag.pug"
 				}
-			},
-			"match": "\\.([^\\w-])?[\\w-]*",
-			"name": "entity.other.attribute-name.class.jade"
+			}
 		},
-		"tag_id": {
-			"match": "#[\\w-]+",
-			"name": "entity.other.attribute-name.id.jade"
+		"tag_attribute_name_paren": {
+			"begin": "\\(\\s*",
+			"end": "\\)",
+			"name": "entity.other.attribute-name.tag.pug",
+			"patterns": [
+				{
+					"include": "#tag_attribute_name_paren"
+				},
+				{
+					"include": "#tag_attribute_name"
+				}
+			]
 		},
 		"tag_mixin_attributes": {
 			"begin": "(&attributes\\()",
 			"captures": {
 				"1": {
-					"name": "entity.name.function.jade"
+					"name": "entity.name.function.pug"
 				}
 			},
 			"end": "(\\))",
@@ -912,40 +733,19 @@
 			"patterns": [
 				{
 					"match": "attributes(?=\\))",
-					"name": "storage.type.keyword.jade"
+					"name": "storage.type.keyword.pug"
 				},
 				{
 					"include": "source.js"
 				}
 			]
 		},
-		"tag_name": {
-			"begin": "([#!]\\{(?=.*?\\}))|(\\w(([\\w:-]+[\\w-])|([\\w-]*)))",
-			"end": "(\\G(?<!\\5[^\\w-]))|\\}|$",
-			"name": "meta.tag.other entity.name.tag.jade",
-			"patterns": [
-				{
-					"begin": "\\G(?<=\\{)",
-					"end": "(?=\\})",
-					"name": "meta.tag.other entity.name.tag.jade",
-					"patterns": [
-						{
-							"match": "{",
-							"name": "invalid.illegal.tag.jade"
-						},
-						{
-							"include": "source.js"
-						}
-					]
-				}
-			]
-		},
 		"tag_text": {
 			"begin": "(?=.)",
 			"end": "$",
 			"patterns": [
 				{
-					"include": "#inline_jade"
+					"include": "#inline_pug"
 				},
 				{
 					"include": "#embedded_html"
@@ -961,20 +761,220 @@
 				}
 			]
 		},
-		"unbuffered_code": {
-			"begin": "(-|(([a-zA-Z0-9_]+)\\s+=))",
-			"beginCaptures": {
-				"3": {
-					"name": "variable.parameter.javascript.embedded.jade"
+		"inline_pug_text": {
+			"begin": "",
+			"end": "(?=\\])",
+			"patterns": [
+				{
+					"begin": "\\[",
+					"end": "\\]",
+					"patterns": [
+						{
+							"include": "#inline_pug_text"
+						}
+					]
+				},
+				{
+					"include": "#inline_pug"
+				},
+				{
+					"include": "#embedded_html"
+				},
+				{
+					"include": "#html_entity"
+				},
+				{
+					"include": "#interpolated_value"
+				},
+				{
+					"include": "#interpolated_error"
+				}
+			]
+		},
+		"inline_pug": {
+			"begin": "(?<!\\\\)(#\\[)",
+			"captures": {
+				"1": {
+					"name": "entity.name.function.pug"
+				},
+				"2": {
+					"name": "entity.name.function.pug"
 				}
 			},
-			"comment": "name = function() {}",
-			"end": "(?=\\])|(({\\s*)?$)",
+			"end": "(\\])",
+			"name": "inline.pug",
+			"patterns": [
+				{
+					"include": "#inline_pug"
+				},
+				{
+					"include": "#mixin_call"
+				},
+				{
+					"begin": "(?<!\\])(?=[\\w.#])|(:\\s*)",
+					"end": "(?=\\]|(:.)|=|\\s)",
+					"name": "tag.inline.pug",
+					"patterns": [
+						{
+							"include": "#tag_name"
+						},
+						{
+							"include": "#tag_id"
+						},
+						{
+							"include": "#tag_classes"
+						},
+						{
+							"include": "#tag_attributes"
+						},
+						{
+							"include": "#tag_mixin_attributes"
+						},
+						{
+							"include": "#inline_pug"
+						},
+						{
+							"match": "\\[",
+							"name": "invalid.illegal.tag.pug"
+						}
+					]
+				},
+				{
+					"include": "#unbuffered_code"
+				},
+				{
+					"include": "#printed_expression"
+				},
+				{
+					"match": "\\[",
+					"name": "invalid.illegal.tag.pug"
+				},
+				{
+					"include": "#inline_pug_text"
+				}
+			]
+		},
+		"html_entity": {
+			"patterns": [
+				{
+					"match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+					"name": "constant.character.entity.html.text.pug"
+				},
+				{
+					"match": "[<>&]",
+					"name": "invalid.illegal.html_entity.text.pug"
+				}
+			]
+		},
+		"interpolated_value": {
+			"begin": "(?<!\\\\)[#!]\\{(?=.*?\\})",
+			"end": "\\}",
+			"name": "string.interpolated.pug",
+			"patterns": [
+				{
+					"match": "{",
+					"name": "invalid.illegal.tag.pug"
+				},
+				{
+					"include": "source.js"
+				}
+			]
+		},
+		"interpolated_error": {
+			"match": "(?<!\\\\)[#!]\\{(?=[^}]*$)",
+			"name": "invalid.illegal.tag.pug"
+		},
+		"printed_expression": {
+			"begin": "(!?\\=)\\s*",
+			"captures": {
+				"1": {
+					"name": "constant"
+				}
+			},
+			"end": "(?=\\])|$",
 			"name": "source.js",
 			"patterns": [
 				{
 					"include": "#js_brackets"
 				},
+				{
+					"include": "source.js"
+				}
+			]
+		},
+		"string": {
+			"begin": "(['\"])",
+			"end": "(?<!\\\\)\\1",
+			"name": "string.quoted.pug",
+			"patterns": [
+				{
+					"match": "\\\\((x[0-9a-fA-F]{2})|(u[0-9]{4})|.)",
+					"name": "constant.character.quoted.pug"
+				},
+				{
+					"include": "#interpolated_value"
+				},
+				{
+					"include": "#interpolated_error"
+				}
+			]
+		},
+		"embedded_html": {
+			"begin": "(?=<[^>]*>)",
+			"end": "$|(?=>)",
+			"name": "html",
+			"patterns": [
+				{
+					"include": "text.html.basic"
+				},
+				{
+					"include": "#interpolated_value"
+				},
+				{
+					"include": "#interpolated_error"
+				}
+			]
+		},
+		"js_parens": {
+			"begin": "\\(",
+			"end": "\\)",
+			"patterns": [
+				{
+					"include": "#js_parens"
+				},
+				{
+					"include": "source.js"
+				}
+			]
+		},
+		"js_brackets": {
+			"begin": "\\[",
+			"end": "\\]",
+			"patterns": [
+				{
+					"include": "#js_brackets"
+				},
+				{
+					"include": "source.js"
+				}
+			]
+		},
+		"js_braces": {
+			"begin": "\\{",
+			"end": "\\}",
+			"patterns": [
+				{
+					"include": "#js_braces"
+				},
+				{
+					"include": "source.js"
+				}
+			]
+		},
+		"babel_parens": {
+			"begin": "\\(",
+			"end": "\\)|(({\\s*)?$)",
+			"patterns": [
 				{
 					"include": "#babel_parens"
 				},
diff --git a/extensions/pug/test/colorize-results/test-4287_pug.json b/extensions/pug/test/colorize-results/test-4287_pug.json
index 8dc6967058b..e5cfb3f9469 100644
--- a/extensions/pug/test/colorize-results/test-4287_pug.json
+++ b/extensions/pug/test/colorize-results/test-4287_pug.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": ".ssdsd",
-		"t": "text.jade entity.other.attribute-name.class.jade",
+		"t": "text.pug entity.other.attribute-name.class.pug",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -12,12 +12,12 @@
 	},
 	{
 		"c": "    // asdsdas",
-		"t": "text.jade string.comment.buffered.block.jade",
+		"t": "text.pug string.comment.buffered.block.pug",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.comment.buffered.block.jade: #0000FF",
+			"light_plus": "string.comment.buffered.block.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.comment.buffered.block.jade: #0000FF",
+			"light_vs": "string.comment.buffered.block.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	}
diff --git a/extensions/pug/test/colorize-results/test_pug.json b/extensions/pug/test/colorize-results/test_pug.json
index ad73e9dbaf5..64472e02b4e 100644
--- a/extensions/pug/test/colorize-results/test_pug.json
+++ b/extensions/pug/test/colorize-results/test_pug.json
@@ -1,40 +1,40 @@
 [
 	{
 		"c": "// h1(name=maintainer.name)",
-		"t": "text.jade string.comment.buffered.block.jade",
+		"t": "text.pug string.comment.buffered.block.pug",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.comment.buffered.block.jade: #0000FF",
+			"light_plus": "string.comment.buffered.block.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.comment.buffered.block.jade: #0000FF",
+			"light_vs": "string.comment.buffered.block.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": "//   | Maintainer:",
-		"t": "text.jade string.comment.buffered.block.jade",
+		"t": "text.pug string.comment.buffered.block.pug",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.comment.buffered.block.jade: #0000FF",
+			"light_plus": "string.comment.buffered.block.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.comment.buffered.block.jade: #0000FF",
+			"light_vs": "string.comment.buffered.block.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": "//   = ' ' + maintainer.name",
-		"t": "text.jade string.comment.buffered.block.jade",
+		"t": "text.pug string.comment.buffered.block.pug",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.comment.buffered.block.jade: #0000FF",
+			"light_plus": "string.comment.buffered.block.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.comment.buffered.block.jade: #0000FF",
+			"light_vs": "string.comment.buffered.block.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": "table",
-		"t": "text.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -45,7 +45,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -56,7 +56,7 @@
 	},
 	{
 		"c": "tr",
-		"t": "text.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -67,7 +67,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -78,7 +78,7 @@
 	},
 	{
 		"c": "td",
-		"t": "text.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -89,7 +89,7 @@
 	},
 	{
 		"c": "(",
-		"t": "text.jade meta.tag.other constant.name.attribute.tag.jade",
+		"t": "text.pug meta.tag.other constant.name.attribute.tag.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -100,7 +100,7 @@
 	},
 	{
 		"c": "style",
-		"t": "text.jade meta.tag.other entity.other.attribute-name.tag.jade",
+		"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -111,7 +111,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.jade meta.tag.other attribute_value",
+		"t": "text.pug meta.tag.other attribute_value",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -122,18 +122,18 @@
 	},
 	{
 		"c": "'width: '",
-		"t": "text.jade meta.tag.other attribute_value string.quoted.jade",
+		"t": "text.pug meta.tag.other attribute_value string.quoted.pug",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.jade: #0000FF",
+			"light_plus": "string.quoted.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.quoted.jade: #0000FF",
+			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": "+",
-		"t": "text.jade meta.tag.other attribute_value keyword.operator.arithmetic.js",
+		"t": "text.pug meta.tag.other attribute_value keyword.operator.arithmetic.js",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -144,7 +144,7 @@
 	},
 	{
 		"c": "(",
-		"t": "text.jade meta.tag.other attribute_value",
+		"t": "text.pug meta.tag.other attribute_value",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "100",
-		"t": "text.jade meta.tag.other attribute_value constant.numeric.decimal.js",
+		"t": "text.pug meta.tag.other attribute_value constant.numeric.decimal.js",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -166,7 +166,7 @@
 	},
 	{
 		"c": "/",
-		"t": "text.jade meta.tag.other attribute_value keyword.operator.arithmetic.js",
+		"t": "text.pug meta.tag.other attribute_value keyword.operator.arithmetic.js",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -177,7 +177,7 @@
 	},
 	{
 		"c": "2",
-		"t": "text.jade meta.tag.other attribute_value constant.numeric.decimal.js",
+		"t": "text.pug meta.tag.other attribute_value constant.numeric.decimal.js",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -188,7 +188,7 @@
 	},
 	{
 		"c": ")",
-		"t": "text.jade meta.tag.other attribute_value",
+		"t": "text.pug meta.tag.other attribute_value",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -199,7 +199,7 @@
 	},
 	{
 		"c": "+",
-		"t": "text.jade meta.tag.other attribute_value keyword.operator.arithmetic.js",
+		"t": "text.pug meta.tag.other attribute_value keyword.operator.arithmetic.js",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -210,18 +210,18 @@
 	},
 	{
 		"c": "'%'",
-		"t": "text.jade meta.tag.other attribute_value string.quoted.jade",
+		"t": "text.pug meta.tag.other attribute_value string.quoted.pug",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.jade: #0000FF",
+			"light_plus": "string.quoted.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.quoted.jade: #0000FF",
+			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": ")",
-		"t": "text.jade meta.tag.other constant.name.attribute.tag.jade",
+		"t": "text.pug meta.tag.other constant.name.attribute.tag.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -232,7 +232,7 @@
 	},
 	{
 		"c": ".",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -243,7 +243,7 @@
 	},
 	{
 		"c": "      ",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -254,7 +254,7 @@
 	},
 	{
 		"c": "Twitter",
-		"t": "text.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -265,7 +265,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -276,7 +276,7 @@
 	},
 	{
 		"c": "td",
-		"t": "text.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -287,7 +287,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.jade source.js constant",
+		"t": "text.pug source.js constant",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -298,7 +298,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.jade source.js",
+		"t": "text.pug source.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": "maintainer",
-		"t": "text.jade source.js variable.other.object.js",
+		"t": "text.pug source.js variable.other.object.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -320,7 +320,7 @@
 	},
 	{
 		"c": ".",
-		"t": "text.jade source.js punctuation.accessor.js",
+		"t": "text.pug source.js punctuation.accessor.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -331,7 +331,7 @@
 	},
 	{
 		"c": "twitter",
-		"t": "text.jade source.js variable.other.property.js",
+		"t": "text.pug source.js variable.other.property.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -342,7 +342,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -353,7 +353,7 @@
 	},
 	{
 		"c": "tr",
-		"t": "text.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -364,7 +364,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -375,7 +375,7 @@
 	},
 	{
 		"c": "td",
-		"t": "text.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -386,7 +386,7 @@
 	},
 	{
 		"c": "(",
-		"t": "text.jade meta.tag.other constant.name.attribute.tag.jade",
+		"t": "text.pug meta.tag.other constant.name.attribute.tag.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -397,7 +397,7 @@
 	},
 	{
 		"c": "style",
-		"t": "text.jade meta.tag.other entity.other.attribute-name.tag.jade",
+		"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -408,7 +408,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.jade meta.tag.other attribute_value",
+		"t": "text.pug meta.tag.other attribute_value",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -419,18 +419,18 @@
 	},
 	{
 		"c": "'width: '",
-		"t": "text.jade meta.tag.other attribute_value string.quoted.jade",
+		"t": "text.pug meta.tag.other attribute_value string.quoted.pug",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.jade: #0000FF",
+			"light_plus": "string.quoted.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.quoted.jade: #0000FF",
+			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": "+",
-		"t": "text.jade meta.tag.other attribute_value keyword.operator.arithmetic.js",
+		"t": "text.pug meta.tag.other attribute_value keyword.operator.arithmetic.js",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -441,7 +441,7 @@
 	},
 	{
 		"c": "(",
-		"t": "text.jade meta.tag.other attribute_value",
+		"t": "text.pug meta.tag.other attribute_value",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -452,7 +452,7 @@
 	},
 	{
 		"c": "100",
-		"t": "text.jade meta.tag.other attribute_value constant.numeric.decimal.js",
+		"t": "text.pug meta.tag.other attribute_value constant.numeric.decimal.js",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -463,7 +463,7 @@
 	},
 	{
 		"c": "/",
-		"t": "text.jade meta.tag.other attribute_value keyword.operator.arithmetic.js",
+		"t": "text.pug meta.tag.other attribute_value keyword.operator.arithmetic.js",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -474,7 +474,7 @@
 	},
 	{
 		"c": "2",
-		"t": "text.jade meta.tag.other attribute_value constant.numeric.decimal.js",
+		"t": "text.pug meta.tag.other attribute_value constant.numeric.decimal.js",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -485,7 +485,7 @@
 	},
 	{
 		"c": ")",
-		"t": "text.jade meta.tag.other attribute_value",
+		"t": "text.pug meta.tag.other attribute_value",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -496,7 +496,7 @@
 	},
 	{
 		"c": "+",
-		"t": "text.jade meta.tag.other attribute_value keyword.operator.arithmetic.js",
+		"t": "text.pug meta.tag.other attribute_value keyword.operator.arithmetic.js",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -507,18 +507,18 @@
 	},
 	{
 		"c": "'%'",
-		"t": "text.jade meta.tag.other attribute_value string.quoted.jade",
+		"t": "text.pug meta.tag.other attribute_value string.quoted.pug",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.jade: #0000FF",
+			"light_plus": "string.quoted.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.quoted.jade: #0000FF",
+			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": ")",
-		"t": "text.jade meta.tag.other constant.name.attribute.tag.jade",
+		"t": "text.pug meta.tag.other constant.name.attribute.tag.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -529,7 +529,7 @@
 	},
 	{
 		"c": ".",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -540,7 +540,7 @@
 	},
 	{
 		"c": "      ",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -551,7 +551,7 @@
 	},
 	{
 		"c": "Blog",
-		"t": "text.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -562,7 +562,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -573,7 +573,7 @@
 	},
 	{
 		"c": "td",
-		"t": "text.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -584,7 +584,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.jade source.js constant",
+		"t": "text.pug source.js constant",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -595,7 +595,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.jade source.js",
+		"t": "text.pug source.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -606,7 +606,7 @@
 	},
 	{
 		"c": "maintainer",
-		"t": "text.jade source.js variable.other.object.js",
+		"t": "text.pug source.js variable.other.object.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -617,7 +617,7 @@
 	},
 	{
 		"c": ".",
-		"t": "text.jade source.js punctuation.accessor.js",
+		"t": "text.pug source.js punctuation.accessor.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -628,7 +628,7 @@
 	},
 	{
 		"c": "blog",
-		"t": "text.jade source.js variable.other.property.js",
+		"t": "text.pug source.js variable.other.property.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -639,7 +639,7 @@
 	},
 	{
 		"c": "- ",
-		"t": "text.jade source.js",
+		"t": "text.pug source.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -650,7 +650,7 @@
 	},
 	{
 		"c": "var",
-		"t": "text.jade source.js meta.var.expr.js storage.type.js",
+		"t": "text.pug source.js meta.var.expr.js storage.type.js",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -661,7 +661,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.jade source.js meta.var.expr.js",
+		"t": "text.pug source.js meta.var.expr.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -672,7 +672,7 @@
 	},
 	{
 		"c": "user",
-		"t": "text.jade source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
+		"t": "text.pug source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -683,7 +683,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.jade source.js meta.var.expr.js meta.var-single-variable.expr.js",
+		"t": "text.pug source.js meta.var.expr.js meta.var-single-variable.expr.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -694,7 +694,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.jade source.js meta.var.expr.js keyword.operator.assignment.js",
+		"t": "text.pug source.js meta.var.expr.js keyword.operator.assignment.js",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -705,7 +705,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.jade source.js meta.var.expr.js",
+		"t": "text.pug source.js meta.var.expr.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -716,7 +716,7 @@
 	},
 	{
 		"c": "{",
-		"t": "text.jade source.js meta.var.expr.js meta.objectliteral.js punctuation.definition.block.js",
+		"t": "text.pug source.js meta.var.expr.js meta.objectliteral.js punctuation.definition.block.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -727,7 +727,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.jade source.js meta.var.expr.js meta.objectliteral.js",
+		"t": "text.pug source.js meta.var.expr.js meta.objectliteral.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -738,7 +738,7 @@
 	},
 	{
 		"c": "name",
-		"t": "text.jade source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js",
+		"t": "text.pug source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js",
 		"r": {
 			"dark_plus": "meta.object-literal.key: #9CDCFE",
 			"light_plus": "meta.object-literal.key: #001080",
@@ -749,7 +749,7 @@
 	},
 	{
 		"c": ":",
-		"t": "text.jade source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js punctuation.separator.key-value.js",
+		"t": "text.pug source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.object-literal.key.js punctuation.separator.key-value.js",
 		"r": {
 			"dark_plus": "meta.object-literal.key: #9CDCFE",
 			"light_plus": "meta.object-literal.key: #001080",
@@ -760,7 +760,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.jade source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js",
+		"t": "text.pug source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -771,7 +771,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.jade source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js string.quoted.single.js punctuation.definition.string.begin.js",
+		"t": "text.pug source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js string.quoted.single.js punctuation.definition.string.begin.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -782,7 +782,7 @@
 	},
 	{
 		"c": "John",
-		"t": "text.jade source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js string.quoted.single.js",
+		"t": "text.pug source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js string.quoted.single.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -793,7 +793,7 @@
 	},
 	{
 		"c": "'",
-		"t": "text.jade source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js string.quoted.single.js punctuation.definition.string.end.js",
+		"t": "text.pug source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js string.quoted.single.js punctuation.definition.string.end.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -804,7 +804,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.jade source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js",
+		"t": "text.pug source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -815,7 +815,7 @@
 	},
 	{
 		"c": "}",
-		"t": "text.jade source.js meta.var.expr.js meta.objectliteral.js punctuation.definition.block.js",
+		"t": "text.pug source.js meta.var.expr.js meta.objectliteral.js punctuation.definition.block.js",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -826,7 +826,7 @@
 	},
 	{
 		"c": "if",
-		"t": "text.jade meta.control.flow.jade storage.type.function.jade",
+		"t": "text.pug meta.control.flow.pug storage.type.function.pug",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -837,7 +837,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.jade meta.control.flow.jade",
+		"t": "text.pug meta.control.flow.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -848,7 +848,7 @@
 	},
 	{
 		"c": "user",
-		"t": "text.jade meta.control.flow.jade variable.other.readwrite.js",
+		"t": "text.pug meta.control.flow.pug variable.other.readwrite.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -859,7 +859,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -870,7 +870,7 @@
 	},
 	{
 		"c": "div",
-		"t": "text.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -881,7 +881,7 @@
 	},
 	{
 		"c": ".welcomebox",
-		"t": "text.jade entity.other.attribute-name.class.jade",
+		"t": "text.pug entity.other.attribute-name.class.pug",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -892,18 +892,18 @@
 	},
 	{
 		"c": "    // Filtered inline output",
-		"t": "text.jade string.comment.buffered.block.jade",
+		"t": "text.pug string.comment.buffered.block.pug",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.comment.buffered.block.jade: #0000FF",
+			"light_plus": "string.comment.buffered.block.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.comment.buffered.block.jade: #0000FF",
+			"light_vs": "string.comment.buffered.block.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": "    ",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -914,7 +914,7 @@
 	},
 	{
 		"c": "p",
-		"t": "text.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -925,7 +925,7 @@
 	},
 	{
 		"c": ".",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -936,7 +936,7 @@
 	},
 	{
 		"c": "      Welcome, ",
-		"t": "text.jade text.block.jade",
+		"t": "text.pug text.block.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -947,62 +947,62 @@
 	},
 	{
 		"c": "#{",
-		"t": "text.jade text.block.jade string.interpolated.jade",
+		"t": "text.pug text.block.pug string.interpolated.pug",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.interpolated.jade: #0000FF",
+			"light_plus": "string.interpolated.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.interpolated.jade: #0000FF",
+			"light_vs": "string.interpolated.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": "user",
-		"t": "text.jade text.block.jade string.interpolated.jade variable.other.object.js",
+		"t": "text.pug text.block.pug string.interpolated.pug variable.other.object.js",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.interpolated.jade: #0000FF",
+			"light_vs": "string.interpolated.pug: #0000FF",
 			"hc_black": "variable: #9CDCFE"
 		}
 	},
 	{
 		"c": ".",
-		"t": "text.jade text.block.jade string.interpolated.jade punctuation.accessor.js",
+		"t": "text.pug text.block.pug string.interpolated.pug punctuation.accessor.js",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.interpolated.jade: #0000FF",
+			"light_plus": "string.interpolated.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.interpolated.jade: #0000FF",
+			"light_vs": "string.interpolated.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": "name",
-		"t": "text.jade text.block.jade string.interpolated.jade support.variable.property.dom.js",
+		"t": "text.pug text.block.pug string.interpolated.pug support.variable.property.dom.js",
 		"r": {
 			"dark_plus": "support.variable: #9CDCFE",
 			"light_plus": "support.variable: #001080",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.interpolated.jade: #0000FF",
+			"light_vs": "string.interpolated.pug: #0000FF",
 			"hc_black": "support.variable: #9CDCFE"
 		}
 	},
 	{
 		"c": "}",
-		"t": "text.jade text.block.jade string.interpolated.jade",
+		"t": "text.pug text.block.pug string.interpolated.pug",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.interpolated.jade: #0000FF",
+			"light_plus": "string.interpolated.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.interpolated.jade: #0000FF",
+			"light_vs": "string.interpolated.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": "else",
-		"t": "text.jade meta.control.flow.jade storage.type.function.jade",
+		"t": "text.pug meta.control.flow.pug storage.type.function.pug",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -1013,7 +1013,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1024,7 +1024,7 @@
 	},
 	{
 		"c": "div",
-		"t": "text.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1035,7 +1035,7 @@
 	},
 	{
 		"c": ".loginbox",
-		"t": "text.jade entity.other.attribute-name.class.jade",
+		"t": "text.pug entity.other.attribute-name.class.pug",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1046,7 +1046,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1057,7 +1057,7 @@
 	},
 	{
 		"c": "form",
-		"t": "text.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1068,7 +1068,7 @@
 	},
 	{
 		"c": "(",
-		"t": "text.jade meta.tag.other constant.name.attribute.tag.jade",
+		"t": "text.pug meta.tag.other constant.name.attribute.tag.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1079,7 +1079,7 @@
 	},
 	{
 		"c": "name",
-		"t": "text.jade meta.tag.other entity.other.attribute-name.tag.jade",
+		"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1090,7 +1090,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.jade meta.tag.other attribute_value",
+		"t": "text.pug meta.tag.other attribute_value",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1101,18 +1101,18 @@
 	},
 	{
 		"c": "\"login\"",
-		"t": "text.jade meta.tag.other attribute_value string.quoted.jade",
+		"t": "text.pug meta.tag.other attribute_value string.quoted.pug",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.jade: #0000FF",
+			"light_plus": "string.quoted.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.quoted.jade: #0000FF",
+			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": ", ",
-		"t": "text.jade meta.tag.other",
+		"t": "text.pug meta.tag.other",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1123,7 +1123,7 @@
 	},
 	{
 		"c": "action",
-		"t": "text.jade meta.tag.other entity.other.attribute-name.tag.jade",
+		"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1134,7 +1134,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.jade meta.tag.other attribute_value",
+		"t": "text.pug meta.tag.other attribute_value",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1145,18 +1145,18 @@
 	},
 	{
 		"c": "\"/login\"",
-		"t": "text.jade meta.tag.other attribute_value string.quoted.jade",
+		"t": "text.pug meta.tag.other attribute_value string.quoted.pug",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.jade: #0000FF",
+			"light_plus": "string.quoted.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.quoted.jade: #0000FF",
+			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": ", ",
-		"t": "text.jade meta.tag.other",
+		"t": "text.pug meta.tag.other",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1167,7 +1167,7 @@
 	},
 	{
 		"c": "method",
-		"t": "text.jade meta.tag.other entity.other.attribute-name.tag.jade",
+		"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1178,7 +1178,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.jade meta.tag.other attribute_value",
+		"t": "text.pug meta.tag.other attribute_value",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1189,18 +1189,18 @@
 	},
 	{
 		"c": "\"post\"",
-		"t": "text.jade meta.tag.other attribute_value string.quoted.jade",
+		"t": "text.pug meta.tag.other attribute_value string.quoted.pug",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.jade: #0000FF",
+			"light_plus": "string.quoted.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.quoted.jade: #0000FF",
+			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": ")",
-		"t": "text.jade meta.tag.other constant.name.attribute.tag.jade",
+		"t": "text.pug meta.tag.other constant.name.attribute.tag.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1211,7 +1211,7 @@
 	},
 	{
 		"c": "      ",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1222,7 +1222,7 @@
 	},
 	{
 		"c": "input",
-		"t": "text.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1233,7 +1233,7 @@
 	},
 	{
 		"c": "(",
-		"t": "text.jade meta.tag.other constant.name.attribute.tag.jade",
+		"t": "text.pug meta.tag.other constant.name.attribute.tag.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1244,7 +1244,7 @@
 	},
 	{
 		"c": "type",
-		"t": "text.jade meta.tag.other entity.other.attribute-name.tag.jade",
+		"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1255,7 +1255,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.jade meta.tag.other attribute_value",
+		"t": "text.pug meta.tag.other attribute_value",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1266,18 +1266,18 @@
 	},
 	{
 		"c": "\"text\"",
-		"t": "text.jade meta.tag.other attribute_value string.quoted.jade",
+		"t": "text.pug meta.tag.other attribute_value string.quoted.pug",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.jade: #0000FF",
+			"light_plus": "string.quoted.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.quoted.jade: #0000FF",
+			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": ", ",
-		"t": "text.jade meta.tag.other",
+		"t": "text.pug meta.tag.other",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1288,7 +1288,7 @@
 	},
 	{
 		"c": "name",
-		"t": "text.jade meta.tag.other entity.other.attribute-name.tag.jade",
+		"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1299,7 +1299,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.jade meta.tag.other attribute_value",
+		"t": "text.pug meta.tag.other attribute_value",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1310,18 +1310,18 @@
 	},
 	{
 		"c": "\"user\"",
-		"t": "text.jade meta.tag.other attribute_value string.quoted.jade",
+		"t": "text.pug meta.tag.other attribute_value string.quoted.pug",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.jade: #0000FF",
+			"light_plus": "string.quoted.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.quoted.jade: #0000FF",
+			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": ")",
-		"t": "text.jade meta.tag.other constant.name.attribute.tag.jade",
+		"t": "text.pug meta.tag.other constant.name.attribute.tag.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1332,7 +1332,7 @@
 	},
 	{
 		"c": "      ",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1343,7 +1343,7 @@
 	},
 	{
 		"c": "input",
-		"t": "text.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1354,7 +1354,7 @@
 	},
 	{
 		"c": "(",
-		"t": "text.jade meta.tag.other constant.name.attribute.tag.jade",
+		"t": "text.pug meta.tag.other constant.name.attribute.tag.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1365,7 +1365,7 @@
 	},
 	{
 		"c": "type",
-		"t": "text.jade meta.tag.other entity.other.attribute-name.tag.jade",
+		"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1376,7 +1376,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.jade meta.tag.other attribute_value",
+		"t": "text.pug meta.tag.other attribute_value",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1387,18 +1387,18 @@
 	},
 	{
 		"c": "\"password\"",
-		"t": "text.jade meta.tag.other attribute_value string.quoted.jade",
+		"t": "text.pug meta.tag.other attribute_value string.quoted.pug",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.jade: #0000FF",
+			"light_plus": "string.quoted.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.quoted.jade: #0000FF",
+			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": ", ",
-		"t": "text.jade meta.tag.other",
+		"t": "text.pug meta.tag.other",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1409,7 +1409,7 @@
 	},
 	{
 		"c": "name",
-		"t": "text.jade meta.tag.other entity.other.attribute-name.tag.jade",
+		"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1420,7 +1420,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.jade meta.tag.other attribute_value",
+		"t": "text.pug meta.tag.other attribute_value",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1431,18 +1431,18 @@
 	},
 	{
 		"c": "\"pass\"",
-		"t": "text.jade meta.tag.other attribute_value string.quoted.jade",
+		"t": "text.pug meta.tag.other attribute_value string.quoted.pug",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.jade: #0000FF",
+			"light_plus": "string.quoted.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.quoted.jade: #0000FF",
+			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": ")",
-		"t": "text.jade meta.tag.other constant.name.attribute.tag.jade",
+		"t": "text.pug meta.tag.other constant.name.attribute.tag.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1453,7 +1453,7 @@
 	},
 	{
 		"c": "      ",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1464,7 +1464,7 @@
 	},
 	{
 		"c": "input",
-		"t": "text.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1475,7 +1475,7 @@
 	},
 	{
 		"c": "(",
-		"t": "text.jade meta.tag.other constant.name.attribute.tag.jade",
+		"t": "text.pug meta.tag.other constant.name.attribute.tag.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1486,7 +1486,7 @@
 	},
 	{
 		"c": "type",
-		"t": "text.jade meta.tag.other entity.other.attribute-name.tag.jade",
+		"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1497,7 +1497,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.jade meta.tag.other attribute_value",
+		"t": "text.pug meta.tag.other attribute_value",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1508,18 +1508,18 @@
 	},
 	{
 		"c": "\"submit\"",
-		"t": "text.jade meta.tag.other attribute_value string.quoted.jade",
+		"t": "text.pug meta.tag.other attribute_value string.quoted.pug",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.jade: #0000FF",
+			"light_plus": "string.quoted.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.quoted.jade: #0000FF",
+			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": ", ",
-		"t": "text.jade meta.tag.other",
+		"t": "text.pug meta.tag.other",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1530,7 +1530,7 @@
 	},
 	{
 		"c": "value",
-		"t": "text.jade meta.tag.other entity.other.attribute-name.tag.jade",
+		"t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1541,7 +1541,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.jade meta.tag.other attribute_value",
+		"t": "text.pug meta.tag.other attribute_value",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1552,18 +1552,18 @@
 	},
 	{
 		"c": "\"login\"",
-		"t": "text.jade meta.tag.other attribute_value string.quoted.jade",
+		"t": "text.pug meta.tag.other attribute_value string.quoted.pug",
 		"r": {
 			"dark_plus": "string: #CE9178",
-			"light_plus": "string.quoted.jade: #0000FF",
+			"light_plus": "string.quoted.pug: #0000FF",
 			"dark_vs": "string: #CE9178",
-			"light_vs": "string.quoted.jade: #0000FF",
+			"light_vs": "string.quoted.pug: #0000FF",
 			"hc_black": "string: #CE9178"
 		}
 	},
 	{
 		"c": ")",
-		"t": "text.jade meta.tag.other constant.name.attribute.tag.jade",
+		"t": "text.pug meta.tag.other constant.name.attribute.tag.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1574,7 +1574,7 @@
 	},
 	{
 		"c": "p",
-		"t": "text.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1585,7 +1585,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1596,7 +1596,7 @@
 	},
 	{
 		"c": "#[",
-		"t": "text.jade inline.jade entity.name.function.jade",
+		"t": "text.pug inline.pug entity.name.function.pug",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -1607,7 +1607,7 @@
 	},
 	{
 		"c": "code",
-		"t": "text.jade inline.jade tag.inline.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug inline.pug tag.inline.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1618,7 +1618,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.jade inline.jade",
+		"t": "text.pug inline.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1629,7 +1629,7 @@
 	},
 	{
 		"c": "samp",
-		"t": "text.jade inline.jade tag.inline.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug inline.pug tag.inline.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1640,7 +1640,7 @@
 	},
 	{
 		"c": "]",
-		"t": "text.jade inline.jade entity.name.function.jade",
+		"t": "text.pug inline.pug entity.name.function.pug",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -1651,7 +1651,7 @@
 	},
 	{
 		"c": " — Regular text. ",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1662,7 +1662,7 @@
 	},
 	{
 		"c": "#[",
-		"t": "text.jade inline.jade entity.name.function.jade",
+		"t": "text.pug inline.pug entity.name.function.pug",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -1673,7 +1673,7 @@
 	},
 	{
 		"c": "samp",
-		"t": "text.jade inline.jade tag.inline.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug inline.pug tag.inline.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1684,7 +1684,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.jade inline.jade",
+		"t": "text.pug inline.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1695,7 +1695,7 @@
 	},
 	{
 		"c": "This",
-		"t": "text.jade inline.jade tag.inline.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug inline.pug tag.inline.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1706,7 +1706,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.jade inline.jade",
+		"t": "text.pug inline.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1717,7 +1717,7 @@
 	},
 	{
 		"c": "is",
-		"t": "text.jade inline.jade tag.inline.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug inline.pug tag.inline.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1728,7 +1728,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.jade inline.jade",
+		"t": "text.pug inline.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1739,7 +1739,7 @@
 	},
 	{
 		"c": "sample",
-		"t": "text.jade inline.jade tag.inline.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug inline.pug tag.inline.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1750,7 +1750,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.jade inline.jade",
+		"t": "text.pug inline.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1761,7 +1761,7 @@
 	},
 	{
 		"c": "text",
-		"t": "text.jade inline.jade tag.inline.jade meta.tag.other entity.name.tag.jade",
+		"t": "text.pug inline.pug tag.inline.pug meta.tag.other entity.name.tag.pug",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1772,7 +1772,7 @@
 	},
 	{
 		"c": "]",
-		"t": "text.jade inline.jade entity.name.function.jade",
+		"t": "text.pug inline.pug entity.name.function.pug",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -1783,7 +1783,7 @@
 	},
 	{
 		"c": " more text.",
-		"t": "text.jade",
+		"t": "text.pug",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/theme-defaults/themes/light_vs.json b/extensions/theme-defaults/themes/light_vs.json
index 67c7bc44af1..0fafec36645 100644
--- a/extensions/theme-defaults/themes/light_vs.json
+++ b/extensions/theme-defaults/themes/light_vs.json
@@ -216,9 +216,9 @@
 		},
 		{
 			"scope": [
-				"string.comment.buffered.block.jade",
-				"string.quoted.jade",
-				"string.interpolated.jade",
+				"string.comment.buffered.block.pug",
+				"string.quoted.pug",
+				"string.interpolated.pug",
 				"string.unquoted.plain.in.yaml",
 				"string.unquoted.plain.out.yaml",
 				"string.unquoted.block.yaml",
diff --git a/extensions/theme-seti/icons/vs-seti-icon-theme.json b/extensions/theme-seti/icons/vs-seti-icon-theme.json
index 6aeb37e95c6..08dc5fcce54 100644
--- a/extensions/theme-seti/icons/vs-seti-icon-theme.json
+++ b/extensions/theme-seti/icons/vs-seti-icon-theme.json
@@ -1403,7 +1403,7 @@
 		"perl": "_perl",
 		"php": "_php",
 		"powershell": "_powershell",
-		"jade": "_jade",
+		"pug": "_jade",
 		"python": "_python",
 		"ruby": "_ruby",
 		"rust": "_rust",
diff --git a/src/vs/editor/standalone/common/themes.ts b/src/vs/editor/standalone/common/themes.ts
index 5ac8ffea7e7..5a8dbe57541 100644
--- a/src/vs/editor/standalone/common/themes.ts
+++ b/src/vs/editor/standalone/common/themes.ts
@@ -34,8 +34,8 @@ export const vs: IStandaloneThemeData = {
 		{ token: 'delimiter.xml', foreground: '0000FF' },
 
 		{ token: 'tag', foreground: '800000' },
-		{ token: 'tag.id.jade', foreground: '4F76AC' },
-		{ token: 'tag.class.jade', foreground: '4F76AC' },
+		{ token: 'tag.id.pug', foreground: '4F76AC' },
+		{ token: 'tag.class.pug', foreground: '4F76AC' },
 		{ token: 'meta.scss', foreground: '800000' },
 		{ token: 'metatag', foreground: 'e00000' },
 		{ token: 'metatag.content.html', foreground: 'FF0000' },
@@ -107,8 +107,8 @@ export const vs_dark: IStandaloneThemeData = {
 		{ token: 'delimiter.xml', foreground: '808080' },
 
 		{ token: 'tag', foreground: '569CD6' },
-		{ token: 'tag.id.jade', foreground: '4F76AC' },
-		{ token: 'tag.class.jade', foreground: '4F76AC' },
+		{ token: 'tag.id.pug', foreground: '4F76AC' },
+		{ token: 'tag.class.pug', foreground: '4F76AC' },
 		{ token: 'meta.scss', foreground: 'A79873' },
 		{ token: 'meta.tag', foreground: 'CE9178' },
 		{ token: 'metatag', foreground: 'DD6A6F' },
@@ -176,8 +176,8 @@ export const hc_black: IStandaloneThemeData = {
 		{ token: 'delimiter.html', foreground: 'FFFF00' },
 
 		{ token: 'tag', foreground: '569CD6' },
-		{ token: 'tag.id.jade', foreground: '4F76AC' },
-		{ token: 'tag.class.jade', foreground: '4F76AC' },
+		{ token: 'tag.id.pug', foreground: '4F76AC' },
+		{ token: 'tag.class.pug', foreground: '4F76AC' },
 		{ token: 'meta', foreground: 'D4D4D4' },
 		{ token: 'meta.tag', foreground: 'CE9178' },
 		{ token: 'metatag', foreground: '569CD6' },