diff --git a/extensions/yaml/OSSREADME.json b/extensions/yaml/OSSREADME.json
index e541e4c47f3..a1f9d8428ab 100644
--- a/extensions/yaml/OSSREADME.json
+++ b/extensions/yaml/OSSREADME.json
@@ -6,7 +6,7 @@
 	"license": "TextMate Bundle License",
 	"repositoryURL": "https://github.com/textmate/yaml.tmbundle",
 	"licenseDetail": [
-		"Copyright (c) textmate-yaml.tmbundle project authors",
+		"Copyright (c) 2015 FichteFoll <fichtefoll2@googlemail.com>",
 		"",
 		"If not otherwise specified (see below), files in this repository fall under the following license:",
 		"",
diff --git a/extensions/yaml/package.json b/extensions/yaml/package.json
index 23f90247e82..84c8addf08a 100644
--- a/extensions/yaml/package.json
+++ b/extensions/yaml/package.json
@@ -3,6 +3,9 @@
 	"version": "0.1.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
+	"scripts": {
+		"update-grammar": "node ../../build/npm/update-grammar.js textmate/yaml.tmbundle Syntaxes/YAML.tmLanguage ./syntaxes/yaml.json"
+	},
 	"contributes": {
 		"languages": [{
 			"id": "yaml",
diff --git a/extensions/yaml/syntaxes/yaml.json b/extensions/yaml/syntaxes/yaml.json
new file mode 100644
index 00000000000..a657a5d4881
--- /dev/null
+++ b/extensions/yaml/syntaxes/yaml.json
@@ -0,0 +1,629 @@
+{
+	"fileTypes": [
+		"yaml",
+		"yml",
+		"rviz",
+		"reek",
+		"clang-format",
+		"yaml-tmlanguage",
+		"syntax",
+		"sublime-syntax"
+	],
+	"firstLineMatch": "^%YAML( ?1.\\d+)?",
+	"keyEquivalent": "^~Y",
+	"name": "YAML",
+	"patterns": [
+		{
+			"include": "#comment"
+		},
+		{
+			"include": "#property"
+		},
+		{
+			"include": "#directive"
+		},
+		{
+			"match": "^---",
+			"name": "entity.other.document.begin.yaml"
+		},
+		{
+			"match": "^\\.{3}",
+			"name": "entity.other.document.end.yaml"
+		},
+		{
+			"include": "#node"
+		}
+	],
+	"repository": {
+		"block-collection": {
+			"patterns": [
+				{
+					"include": "#block-sequence"
+				},
+				{
+					"include": "#block-mapping"
+				}
+			]
+		},
+		"block-mapping": {
+			"patterns": [
+				{
+					"include": "#block-pair"
+				}
+			]
+		},
+		"block-node": {
+			"patterns": [
+				{
+					"include": "#prototype"
+				},
+				{
+					"include": "#block-scalar"
+				},
+				{
+					"include": "#block-collection"
+				},
+				{
+					"include": "#flow-scalar-plain-out"
+				},
+				{
+					"include": "#flow-node"
+				}
+			]
+		},
+		"block-pair": {
+			"patterns": [
+				{
+					"begin": "\\?",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.key-value.begin.yaml"
+						}
+					},
+					"end": "(?=\\?)|^ *(:)|(:)",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.separator.key-value.mapping.yaml"
+						},
+						"2": {
+							"name": "invalid.illegal.expected-newline.yaml"
+						}
+					},
+					"name": "meta.block-mapping.yaml",
+					"patterns": [
+						{
+							"include": "#block-node"
+						}
+					]
+				},
+				{
+					"begin": "(?x)\n                        (?=\n                            (?x:\n                                  [^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]\n                                | [?:-] \\S\n                            )\n                            (\n                                  [^\\s:]\n                                | : \\S\n                                | \\s+ (?![#\\s])\n                            )*\n                            \\s*\n                            :\\s\n                        )\n                    ",
+					"end": "(?x)\n                        (?=\n                              \\s* $\n                            | \\s+ \\#\n                            | \\s* : \\s\n                        )\n                    ",
+					"patterns": [
+						{
+							"include": "#flow-scalar-plain-out-implicit-type"
+						},
+						{
+							"begin": "(?x)\n                                  [^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]\n                                | [?:-] \\S\n                            ",
+							"beginCaptures": {
+								"0": {
+									"name": "entity.name.tag.yaml"
+								}
+							},
+							"contentName": "entity.name.tag.yaml",
+							"end": "(?x)\n                                (?=\n                                      \\s* $\n                                    | \\s+ \\#\n                                    | \\s* : \\s\n                                )\n                            ",
+							"name": "string.unquoted.plain.out.yaml"
+						}
+					]
+				},
+				{
+					"match": ":(?=\\s|$)",
+					"name": "punctuation.separator.key-value.mapping.yaml"
+				}
+			]
+		},
+		"block-scalar": {
+			"begin": "(?:(\\|)|(>))([1-9])?([-+])?(.*\\n?)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.definition.block.scalar.literal.yaml"
+				},
+				"2": {
+					"name": "punctuation.definition.block.scalar.folded.yaml"
+				},
+				"3": {
+					"name": "constant.numeric.indentation-indicator.yaml"
+				},
+				"4": {
+					"name": "support.other.chomping-indicator.yaml"
+				},
+				"5": {
+					"patterns": [
+						{
+							"include": "#comment"
+						},
+						{
+							"match": ".+",
+							"name": "invalid.illegal.expected-comment-or-newline.yaml"
+						}
+					]
+				}
+			},
+			"end": "^(?=\\S)|(?!\\G)",
+			"patterns": [
+				{
+					"begin": "^([ ]+)(?! )",
+					"end": "^(?!\\1|\\s*$)",
+					"name": "string.unquoted.block.yaml"
+				}
+			]
+		},
+		"block-sequence": {
+			"match": "(-)( |\\t|$)",
+			"name": "punctuation.definition.block.sequence.item.yaml"
+		},
+		"comment": {
+			"begin": "(?:(^[ \\t]*)|[ \\t]+)(?=#\\p{Print}*$)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.whitespace.comment.leading.yaml"
+				}
+			},
+			"end": "(?!\\G)",
+			"patterns": [
+				{
+					"begin": "#",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.comment.yaml"
+						}
+					},
+					"end": "\\n",
+					"name": "comment.line.number-sign.yaml"
+				}
+			]
+		},
+		"directive": {
+			"begin": "^%",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.directive.begin.yaml"
+				}
+			},
+			"end": "(?=$|[ \\t]+($|#))",
+			"name": "meta.directive.yaml",
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "keyword.other.directive.yaml.yaml"
+						},
+						"2": {
+							"name": "constant.numeric.yaml-version.yaml"
+						}
+					},
+					"match": "\\G(YAML)[ \\t]+(\\d+\\.\\d+)"
+				},
+				{
+					"captures": {
+						"1": {
+							"name": "keyword.other.directive.tag.yaml"
+						},
+						"2": {
+							"name": "storage.type.tag-handle.yaml"
+						},
+						"3": {
+							"name": "support.type.tag-prefix.yaml"
+						}
+					},
+					"match": "(?x)\n                        \\G\n                        (TAG)\n                        (?:[ \\t]+\n                            ((?:!(?:[0-9A-Za-z\\-]*!)?))\n                            (?:[ \\t]+ (\n                                  !              (?x: %\\p{XDigit}{2} | [0-9A-Za-z\\-#;/?:@&=+$,_.!~*'()\\[\\]] )*\n                                | (?![,!\\[\\]{}]) (?x: %\\p{XDigit}{2} | [0-9A-Za-z\\-#;/?:@&=+$,_.!~*'()\\[\\]] )+\n                                )\n                            )?\n                        )?\n                    "
+				},
+				{
+					"captures": {
+						"1": {
+							"name": "support.other.directive.reserved.yaml"
+						},
+						"2": {
+							"name": "string.unquoted.directive-name.yaml"
+						},
+						"3": {
+							"name": "string.unquoted.directive-parameter.yaml"
+						}
+					},
+					"match": "(?x) \\G (\\w+) (?:[ \\t]+ (\\w+) (?:[ \\t]+ (\\w+))? )?"
+				},
+				{
+					"match": "\\S+",
+					"name": "invalid.illegal.unrecognized.yaml"
+				}
+			]
+		},
+		"flow-alias": {
+			"captures": {
+				"1": {
+					"name": "keyword.control.flow.alias.yaml"
+				},
+				"2": {
+					"name": "punctuation.definition.alias.yaml"
+				},
+				"3": {
+					"name": "variable.other.alias.yaml"
+				},
+				"4": {
+					"name": "invalid.illegal.character.anchor.yaml"
+				}
+			},
+			"match": "((\\*))([^\\s\\[\\]/{/},]+)([^\\s\\]},]\\S*)?"
+		},
+		"flow-collection": {
+			"patterns": [
+				{
+					"include": "#flow-sequence"
+				},
+				{
+					"include": "#flow-mapping"
+				}
+			]
+		},
+		"flow-mapping": {
+			"begin": "\\{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.mapping.begin.yaml"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.mapping.end.yaml"
+				}
+			},
+			"name": "meta.flow-mapping.yaml",
+			"patterns": [
+				{
+					"include": "#prototype"
+				},
+				{
+					"match": ",",
+					"name": "punctuation.separator.mapping.yaml"
+				},
+				{
+					"include": "#flow-pair"
+				}
+			]
+		},
+		"flow-node": {
+			"patterns": [
+				{
+					"include": "#prototype"
+				},
+				{
+					"include": "#flow-alias"
+				},
+				{
+					"include": "#flow-collection"
+				},
+				{
+					"include": "#flow-scalar"
+				}
+			]
+		},
+		"flow-pair": {
+			"patterns": [
+				{
+					"begin": "\\?",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.key-value.begin.yaml"
+						}
+					},
+					"end": "(?=[},\\]])",
+					"name": "meta.flow-pair.explicit.yaml",
+					"patterns": [
+						{
+							"include": "#prototype"
+						},
+						{
+							"include": "#flow-pair"
+						},
+						{
+							"include": "#flow-node"
+						},
+						{
+							"begin": ":(?=\\s|$|[\\[\\]{},])",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.separator.key-value.mapping.yaml"
+								}
+							},
+							"end": "(?=[},\\]])",
+							"patterns": [
+								{
+									"include": "#flow-value"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "(?x)\n                        (?=\n                            (?:\n                                [^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]\n                              | [?:-] [^\\s[\\[\\]{},]]\n                            )\n                            (\n                                  [^\\s:[\\[\\]{},]]\n                                | : [^\\s[\\[\\]{},]]\n                                | \\s+ (?![#\\s])\n                            )*\n                            \\s*\n                            :\\s\n                        )\n                    ",
+					"end": "(?x)\n                        (?=\n                              \\s* $\n                            | \\s+ \\#\n                            | \\s* : \\s\n                            | \\s* : [\\[\\]{},]\n                            | [\\[\\]{},]\n                        )\n                    ",
+					"name": "meta.flow-pair.key.yaml",
+					"patterns": [
+						{
+							"include": "#flow-scalar-plain-in-implicit-type"
+						},
+						{
+							"begin": "(?x)\n                                  [^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]\n                                | [?:-] [^\\s[\\[\\]{},]]\n                            ",
+							"beginCaptures": {
+								"0": {
+									"name": "entity.name.tag.yaml"
+								}
+							},
+							"contentName": "entity.name.tag.yaml",
+							"end": "(?x)\n                                (?=\n                                      \\s* $\n                                    | \\s+ \\#\n                                    | \\s* : \\s\n                                    | \\s* : [\\[\\]{},]\n                                    | [\\[\\]{},]\n                                )\n                            ",
+							"name": "string.unquoted.plain.in.yaml"
+						}
+					]
+				},
+				{
+					"include": "#flow-node"
+				},
+				{
+					"begin": ":(?=\\s|$|[\\[\\]{},])",
+					"captures": {
+						"0": {
+							"name": "punctuation.separator.key-value.mapping.yaml"
+						}
+					},
+					"end": "(?=[},\\]])",
+					"name": "meta.flow-pair.yaml",
+					"patterns": [
+						{
+							"include": "#flow-value"
+						}
+					]
+				}
+			]
+		},
+		"flow-scalar": {
+			"patterns": [
+				{
+					"include": "#flow-scalar-double-quoted"
+				},
+				{
+					"include": "#flow-scalar-single-quoted"
+				},
+				{
+					"include": "#flow-scalar-plain-in"
+				}
+			]
+		},
+		"flow-scalar-double-quoted": {
+			"begin": "\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.yaml"
+				}
+			},
+			"end": "\"",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.yaml"
+				}
+			},
+			"name": "string.quoted.double.yaml",
+			"patterns": [
+				{
+					"match": "\\\\([0abtnvfre \"/\\\\N_Lp]|x\\d\\d|u\\d{4}|U\\d{8})",
+					"name": "constant.character.escape.yaml"
+				},
+				{
+					"match": "\\\\\\n",
+					"name": "constant.character.escape.double-quoted.newline.yaml"
+				}
+			]
+		},
+		"flow-scalar-plain-in": {
+			"patterns": [
+				{
+					"include": "#flow-scalar-plain-in-implicit-type"
+				},
+				{
+					"begin": "(?x)\n                          [^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]\n                        | [?:-] [^\\s[\\[\\]{},]]\n                    ",
+					"end": "(?x)\n                        (?=\n                              \\s* $\n                            | \\s+ \\#\n                            | \\s* : \\s\n                            | \\s* : [\\[\\]{},]\n                            | [\\[\\]{},]\n                        )\n                    ",
+					"name": "string.unquoted.plain.in.yaml"
+				}
+			]
+		},
+		"flow-scalar-plain-in-implicit-type": {
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "constant.language.null.yaml"
+						},
+						"2": {
+							"name": "constant.language.boolean.yaml"
+						},
+						"3": {
+							"name": "constant.numeric.integer.yaml"
+						},
+						"4": {
+							"name": "constant.numeric.float.yaml"
+						},
+						"5": {
+							"name": "constant.other.timestamp.yaml"
+						},
+						"6": {
+							"name": "constant.language.value.yaml"
+						},
+						"7": {
+							"name": "constant.language.merge.yaml"
+						}
+					},
+					"match": "(?x)\n                        (?x:\n                              (null|Null|NULL|~)\n                            | (y|Y|yes|Yes|YES|n|N|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)\n                            | (\n                                (?:\n                                      [-+]? 0b [0-1_]+ # (base 2)\n                                    | [-+]? 0  [0-7_]+ # (base 8)\n                                    | [-+]? (?: 0|[1-9][0-9_]*) # (base 10)\n                                    | [-+]? 0x [0-9a-fA-F_]+ # (base 16)\n                                    | [-+]? [1-9] [0-9_]* (?: :[0-5]?[0-9])+ # (base 60)\n                                )\n                              )\n                            | (\n                                (?x:\n                                      [-+]? (?: [0-9] [0-9_]*)? \\. [0-9.]* (?: [eE] [-+] [0-9]+)? # (base 10)\n                                    | [-+]? [0-9] [0-9_]* (?: :[0-5]?[0-9])+ \\. [0-9_]* # (base 60)\n                                    | [-+]? \\. (?: inf|Inf|INF) # (infinity)\n                                    |       \\. (?: nan|NaN|NAN) # (not a number)\n                                )\n                              )\n                            | (\n                                (?x:\n                                    \\d{4} - \\d{2} - \\d{2}           # (y-m-d)\n                                  | \\d{4}                           # (year)\n                                    - \\d{1,2}                       # (month)\n                                    - \\d{1,2}                       # (day)\n                                    (?: [Tt] | [ \\t]+) \\d{1,2}      # (hour)\n                                    : \\d{2}                         # (minute)\n                                    : \\d{2}                         # (second)\n                                    (?: \\.\\d*)?                     # (fraction)\n                                    (?:\n                                          (?:[ \\t]*) Z\n                                        | [-+] \\d{1,2} (?: :\\d{1,2})?\n                                    )?                              # (time zone)\n                                )\n                              )\n                            | (=)\n                            | (<<)\n                        )\n                        (?:\n                            (?=\n                                  \\s* $\n                                | \\s+ \\#\n                                | \\s* : \\s\n                                | \\s* : [\\[\\]{},]\n                                | [\\[\\]{},]\n                            )\n                        )\n                    "
+				}
+			]
+		},
+		"flow-scalar-plain-out": {
+			"patterns": [
+				{
+					"include": "#flow-scalar-plain-out-implicit-type"
+				},
+				{
+					"begin": "(?x)\n                          [^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]\n                        | [?:-] \\S\n                    ",
+					"end": "(?x)\n                        (?=\n                              \\s* $\n                            | \\s+ \\#\n                            | \\s* : \\s\n                        )\n                    ",
+					"name": "string.unquoted.plain.out.yaml"
+				}
+			]
+		},
+		"flow-scalar-plain-out-implicit-type": {
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "constant.language.null.yaml"
+						},
+						"2": {
+							"name": "constant.language.boolean.yaml"
+						},
+						"3": {
+							"name": "constant.numeric.integer.yaml"
+						},
+						"4": {
+							"name": "constant.numeric.float.yaml"
+						},
+						"5": {
+							"name": "constant.other.timestamp.yaml"
+						},
+						"6": {
+							"name": "constant.language.value.yaml"
+						},
+						"7": {
+							"name": "constant.language.merge.yaml"
+						}
+					},
+					"match": "(?x)\n                        (?x:\n                              (null|Null|NULL|~)\n                            | (y|Y|yes|Yes|YES|n|N|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)\n                            | (\n                                (?:\n                                      [-+]? 0b [0-1_]+ # (base 2)\n                                    | [-+]? 0  [0-7_]+ # (base 8)\n                                    | [-+]? (?: 0|[1-9][0-9_]*) # (base 10)\n                                    | [-+]? 0x [0-9a-fA-F_]+ # (base 16)\n                                    | [-+]? [1-9] [0-9_]* (?: :[0-5]?[0-9])+ # (base 60)\n                                )\n                              )\n                            | (\n                                (?x:\n                                      [-+]? (?: [0-9] [0-9_]*)? \\. [0-9.]* (?: [eE] [-+] [0-9]+)? # (base 10)\n                                    | [-+]? [0-9] [0-9_]* (?: :[0-5]?[0-9])+ \\. [0-9_]* # (base 60)\n                                    | [-+]? \\. (?: inf|Inf|INF) # (infinity)\n                                    |       \\. (?: nan|NaN|NAN) # (not a number)\n                                )\n                              )\n                            | (\n                                (?x:\n                                    \\d{4} - \\d{2} - \\d{2}           # (y-m-d)\n                                  | \\d{4}                           # (year)\n                                    - \\d{1,2}                       # (month)\n                                    - \\d{1,2}                       # (day)\n                                    (?: [Tt] | [ \\t]+) \\d{1,2}      # (hour)\n                                    : \\d{2}                         # (minute)\n                                    : \\d{2}                         # (second)\n                                    (?: \\.\\d*)?                     # (fraction)\n                                    (?:\n                                          (?:[ \\t]*) Z\n                                        | [-+] \\d{1,2} (?: :\\d{1,2})?\n                                    )?                              # (time zone)\n                                )\n                              )\n                            | (=)\n                            | (<<)\n                        )\n                        (?x:\n                            (?=\n                                  \\s* $\n                                | \\s+ \\#\n                                | \\s* : \\s\n                            )\n                        )\n                    "
+				}
+			]
+		},
+		"flow-scalar-single-quoted": {
+			"begin": "'",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.yaml"
+				}
+			},
+			"end": "'(?!')",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.yaml"
+				}
+			},
+			"name": "string.quoted.single.yaml",
+			"patterns": [
+				{
+					"match": "''",
+					"name": "constant.character.escape.single-quoted.yaml"
+				}
+			]
+		},
+		"flow-sequence": {
+			"begin": "\\[",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.sequence.begin.yaml"
+				}
+			},
+			"end": "\\]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.sequence.end.yaml"
+				}
+			},
+			"name": "meta.flow-sequence.yaml",
+			"patterns": [
+				{
+					"include": "#prototype"
+				},
+				{
+					"match": ",",
+					"name": "punctuation.separator.sequence.yaml"
+				},
+				{
+					"include": "#flow-pair"
+				},
+				{
+					"include": "#flow-node"
+				}
+			]
+		},
+		"flow-value": {
+			"patterns": [
+				{
+					"begin": "\\G(?![},\\]])",
+					"end": "(?=[},\\]])",
+					"name": "meta.flow-pair.value.yaml",
+					"patterns": [
+						{
+							"include": "#flow-node"
+						}
+					]
+				}
+			]
+		},
+		"node": {
+			"patterns": [
+				{
+					"include": "#block-node"
+				}
+			]
+		},
+		"property": {
+			"begin": "(?=!|&)",
+			"end": "(?!\\G)",
+			"name": "meta.property.yaml",
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "keyword.control.property.anchor.yaml"
+						},
+						"2": {
+							"name": "punctuation.definition.anchor.yaml"
+						},
+						"3": {
+							"name": "entity.name.type.anchor.yaml"
+						},
+						"4": {
+							"name": "invalid.illegal.character.anchor.yaml"
+						}
+					},
+					"match": "\\G((&))([^\\s\\[\\]/{/},]+)(\\S+)?"
+				},
+				{
+					"match": "(?x)\n                        \\G\n                        (?:\n                            ! < (?: %\\p{XDigit}{2} | [0-9A-Za-z\\-#;/?:@&=+$,_.!~*'()\\[\\]] )+ >\n                          | (?:!(?:[0-9A-Za-z\\-]*!)?) (?: %\\p{XDigit}{2} | [0-9A-Za-z\\-#;/?:@&=+$_.~*'()] )+\n                          | !\n                        )\n                        (?=\\ |\\t|$)\n                    ",
+					"name": "storage.type.tag-handle.yaml"
+				},
+				{
+					"match": "\\S+",
+					"name": "invalid.illegal.tag-handle.yaml"
+				}
+			]
+		},
+		"prototype": {
+			"patterns": [
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#property"
+				}
+			]
+		}
+	},
+	"scopeName": "source.yaml",
+	"uuid": "686AD6AE-33F3-4493-9512-9E9FC1D5417F",
+	"version": "https://github.com/textmate/yaml.tmbundle/commit/9a4135db812815467828e467e1a57189e1ccdac9"
+}
\ No newline at end of file