diff --git a/grammars/yaml.cson b/grammars/yaml.cson
index 12c4e46..0ab6b2c 100644
--- a/grammars/yaml.cson
+++ b/grammars/yaml.cson
@@ -35,6 +35,12 @@
     'match': '^\\.\\.\\.'
     'name': 'punctuation.definition.document.end.yaml'
   }
+  {
+    'include': '#mapping'
+  }
+  {
+    'include': '#sequence'
+  }
   {
     # hello: >
     # hello: |
@@ -259,6 +265,161 @@
         'name': 'invalid.illegal.escape.yaml'
       }
     ]
+  'mapping':
+    'begin': '{'
+    'beginCaptures':
+      '0':
+        'name': 'punctuation.definition.mapping.begin.yaml'
+    'end': '}'
+    'endCaptures':
+      '0':
+        'name': 'punctuation.definition.mapping.end.yaml'
+    'name': 'meta.mapping.yaml'
+    'patterns': [
+      {
+        'include': '#mapping'
+      }
+      {
+        'begin': '([^!{@#%&*>,\'"][^#\'"]*?)(:)\\s+'
+        'beginCaptures':
+          '1':
+            'name': 'entity.name.tag.yaml'
+          '2':
+            'name': 'punctuation.separator.key-value.yaml'
+        'end': ',|(?=})'
+        'endCaptures':
+          '0':
+            'name': 'punctuation.separator.yaml'
+        'patterns': [
+          {
+            'include': '#mapping-scalar-content'
+          }
+        ]
+      }
+      {
+        # JSON-like: no spaces are needed after the key
+        'begin': '(?:((\')([^\']*?)(\'))|((")([^"]*?)(")))(:)'
+        'beginCaptures':
+          '1':
+            'name': 'string.quoted.single.yaml'
+          '2':
+            'name': 'punctuation.definition.string.begin.yaml'
+          '3':
+            'name': 'entity.name.tag.yaml'
+          '4':
+            'name': 'punctuation.definition.string.end.yaml'
+          '5':
+            'name': 'string.quoted.double.yaml'
+          '6':
+            'name': 'punctuation.definition.string.begin.yaml'
+          '7':
+            'name': 'entity.name.tag.yaml'
+          '8':
+            'name': 'punctuation.definition.string.end.yaml'
+          '9':
+            'name': 'punctuation.separator.key-value.yaml'
+        'end': ',|(?=})'
+        'endCaptures':
+          '0':
+            'name': 'punctuation.separator.yaml'
+        'patterns': [
+          {
+            'include': '#mapping-scalar-content'
+          }
+        ]
+      }
+    ]
+  'mapping-scalar-content':
+    'patterns': [
+      # This is mostly the same thing as scalar-content, but with an extra (?=[,}]) lookahead added at the end of each rule
+      {
+        'match': '!(?=\\s)'
+        'name': 'punctuation.definition.tag.non-specific.yaml'
+      }
+      {
+        'include': '#mapping'
+      }
+      {
+        'match': '(?<=\\s)(true|false|null)(?=\\s*($|[,}]))'
+        'name': 'constant.language.yaml'
+      }
+      {
+        'match': '([0-9]{4}-[0-9]{2}-[0-9]{2})(?=\\s*($|[,}]))'
+        'captures':
+          '1':
+            'name': 'constant.other.date.yaml'
+      }
+      {
+        'match': '(((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f)?)(?=\\s*($|[,}]))'
+        'captures':
+          '1':
+            'name': 'constant.numeric.yaml'
+      }
+      {
+        'begin': '"'
+        'beginCaptures':
+          '0':
+            'name': 'punctuation.definition.string.begin.yaml'
+        'end': '"'
+        'endCaptures':
+          '0':
+            'name': 'punctuation.definition.string.end.yaml'
+        'name': 'string.quoted.double.yaml'
+        'patterns': [
+          {
+            'include': '#escaped_char'
+          }
+          {
+            'include': '#erb'
+          }
+        ]
+      }
+      {
+        # Per http://www.yaml.org/spec/1.2/spec.html#id2788097, only single quotes can be escaped
+        'begin': "'"
+        'beginCaptures':
+          '0':
+            'name': 'punctuation.definition.string.begin.yaml'
+        'end': "'"
+        'endCaptures':
+          '0':
+            'name': 'punctuation.definition.string.end.yaml'
+        'name': 'string.quoted.single.yaml'
+        'applyEndPatternLast': true
+        'patterns': [
+          {
+            'match': "''"
+            'name': 'constant.character.escape.yaml'
+          }
+          {
+            'include': '#erb'
+          }
+        ]
+      }
+      {
+        'begin': '`'
+        'beginCaptures':
+          '0':
+            'name': 'punctuation.definition.string.begin.yaml'
+        'end': '`'
+        'endCaptures':
+          '0':
+            'name': 'punctuation.definition.string.end.yaml'
+        'name': 'string.interpolated.yaml'
+        'patterns': [
+          {
+            'include': '#escaped_char'
+          }
+          {
+            'include': '#erb'
+          }
+        ]
+      }
+      {
+        'match': '[^\\s"\'\\n](?!\\s*#(?!{))([^,{}#\\n]|((?<!\\s)#))*'
+        'name': 'string.unquoted.yaml'
+      }
+    ]
   'numeric':
     'match': '(((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f)?)\\s*($|(?=#)(?!#{))'
     'captures':
@@ -340,6 +501,12 @@
         'match': '!(?=\\s)'
         'name': 'punctuation.definition.tag.non-specific.yaml'
       }
+      {
+        'include': '#mapping'
+      }
+      {
+        'include': '#sequence'
+      }
       {
         'include': '#constants'
       }
@@ -353,6 +520,223 @@
         'include': '#strings'
       }
     ]
+  'sequence':
+    'begin': '\\['
+    'beginCaptures':
+      '0':
+        'name': 'punctuation.definition.sequence.begin.yaml'
+    'end': '\\]'
+    'endCaptures':
+      '0':
+        'name': 'punctuation.definition.sequence.end.yaml'
+    'name': 'meta.sequence.yaml'
+    'patterns': [
+      {
+        'include': '#sequence'
+      }
+      {
+        'match': ','
+        'name': 'punctuation.separator.yaml'
+      }
+      {
+        'begin': '([^!{@#%&*>,\'"][^#\'"]*?)(:)\\s+'
+        'beginCaptures':
+          '1':
+            'name': 'entity.name.tag.yaml'
+          '2':
+            'name': 'punctuation.separator.key-value.yaml'
+        'end': '(?=[,\\]])'
+        'patterns': [
+          {
+            'include': '#sequence-scalar-content'
+          }
+        ]
+      }
+      {
+        # JSON-like: no spaces are needed after the key
+        'begin': '(?:((\')([^\']*?)(\'))|((")([^"]*?)(")))(:)'
+        'beginCaptures':
+          '1':
+            'name': 'string.quoted.single.yaml'
+          '2':
+            'name': 'punctuation.definition.string.begin.yaml'
+          '3':
+            'name': 'entity.name.tag.yaml'
+          '4':
+            'name': 'punctuation.definition.string.end.yaml'
+          '5':
+            'name': 'string.quoted.double.yaml'
+          '6':
+            'name': 'punctuation.definition.string.begin.yaml'
+          '7':
+            'name': 'entity.name.tag.yaml'
+          '8':
+            'name': 'punctuation.definition.string.end.yaml'
+          '9':
+            'name': 'punctuation.separator.key-value.yaml'
+        'end': '(?=[,\\]])'
+        'patterns': [
+          {
+            'include': '#sequence-scalar-content'
+          }
+        ]
+      }
+      {
+        'begin': '"'
+        'beginCaptures':
+          '0':
+            'name': 'punctuation.definition.string.begin.yaml'
+        'end': '"'
+        'endCaptures':
+          '0':
+            'name': 'punctuation.definition.string.end.yaml'
+        'name': 'string.quoted.double.yaml'
+        'patterns': [
+          {
+            'include': '#escaped_char'
+          }
+          {
+            'include': '#erb'
+          }
+        ]
+      }
+      {
+        # Per http://www.yaml.org/spec/1.2/spec.html#id2788097, only single quotes can be escaped
+        'begin': "'"
+        'beginCaptures':
+          '0':
+            'name': 'punctuation.definition.string.begin.yaml'
+        'end': "'"
+        'endCaptures':
+          '0':
+            'name': 'punctuation.definition.string.end.yaml'
+        'name': 'string.quoted.single.yaml'
+        'applyEndPatternLast': true
+        'patterns': [
+          {
+            'match': "''"
+            'name': 'constant.character.escape.yaml'
+          }
+          {
+            'include': '#erb'
+          }
+        ]
+      }
+      {
+        'begin': '`'
+        'beginCaptures':
+          '0':
+            'name': 'punctuation.definition.string.begin.yaml'
+        'end': '`'
+        'endCaptures':
+          '0':
+            'name': 'punctuation.definition.string.end.yaml'
+        'name': 'string.interpolated.yaml'
+        'patterns': [
+          {
+            'include': '#escaped_char'
+          }
+          {
+            'include': '#erb'
+          }
+        ]
+      }
+      {
+        'match': '[^\\s"\'\\n](?!\\s*#(?!{))([^,\\[\\]#\\n]|((?<!\\s)#))*'
+        'name': 'string.unquoted.yaml'
+      }
+    ]
+  'sequence-scalar-content':
+    'patterns': [
+      # This is mostly the same thing as scalar-content, but with an extra (?=[,\\]]) lookahead added at the end of each rule
+      {
+        'match': '!(?=\\s)'
+        'name': 'punctuation.definition.tag.non-specific.yaml'
+      }
+      {
+        'include': '#sequence'
+      }
+      {
+        'match': '(?<=\\s)(true|false|null)(?=\\s*($|[,\\]]))'
+        'name': 'constant.language.yaml'
+      }
+      {
+        'match': '([0-9]{4}-[0-9]{2}-[0-9]{2})(?=\\s*($|[,\\]]))'
+        'captures':
+          '1':
+            'name': 'constant.other.date.yaml'
+      }
+      {
+        'match': '(((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f)?)(?=\\s*($|[,\\]]))'
+        'captures':
+          '1':
+            'name': 'constant.numeric.yaml'
+      }
+      {
+        'begin': '"'
+        'beginCaptures':
+          '0':
+            'name': 'punctuation.definition.string.begin.yaml'
+        'end': '"'
+        'endCaptures':
+          '0':
+            'name': 'punctuation.definition.string.end.yaml'
+        'name': 'string.quoted.double.yaml'
+        'patterns': [
+          {
+            'include': '#escaped_char'
+          }
+          {
+            'include': '#erb'
+          }
+        ]
+      }
+      {
+        # Per http://www.yaml.org/spec/1.2/spec.html#id2788097, only single quotes can be escaped
+        'begin': "'"
+        'beginCaptures':
+          '0':
+            'name': 'punctuation.definition.string.begin.yaml'
+        'end': "'"
+        'endCaptures':
+          '0':
+            'name': 'punctuation.definition.string.end.yaml'
+        'name': 'string.quoted.single.yaml'
+        'applyEndPatternLast': true
+        'patterns': [
+          {
+            'match': "''"
+            'name': 'constant.character.escape.yaml'
+          }
+          {
+            'include': '#erb'
+          }
+        ]
+      }
+      {
+        'begin': '`'
+        'beginCaptures':
+          '0':
+            'name': 'punctuation.definition.string.begin.yaml'
+        'end': '`'
+        'endCaptures':
+          '0':
+            'name': 'punctuation.definition.string.end.yaml'
+        'name': 'string.interpolated.yaml'
+        'patterns': [
+          {
+            'include': '#escaped_char'
+          }
+          {
+            'include': '#erb'
+          }
+        ]
+      }
+      {
+        'match': '[^\\s"\'\\n](?!\\s*#(?!{))([^,\\[\\]#\\n]|((?<!\\s)#))*'
+        'name': 'string.unquoted.yaml'
+      }
+    ]
   'variables':
     'captures':
       '1':
diff --git a/spec/yaml-spec.coffee b/spec/yaml-spec.coffee
index 84b2307..7a7b79e 100644
--- a/spec/yaml-spec.coffee
+++ b/spec/yaml-spec.coffee
@@ -455,11 +455,6 @@ describe "YAML grammar", ->
     expect(tokens[3]).toEqual value: "#", scopes: ["source.yaml", "comment.line.number-sign.yaml", "punctuation.definition.comment.yaml"]
     expect(tokens[4]).toEqual value: " This colon breaks syntax highlighting: see?", scopes: ["source.yaml", "comment.line.number-sign.yaml"]
 
-  it "does not confuse keys and unquoted strings", ->
-    {tokens} = grammar.tokenizeLine("- { role: common }")
-    expect(tokens[0]).toEqual value: "-", scopes: ["source.yaml", "punctuation.definition.entry.yaml"]
-    expect(tokens[2]).toEqual value: "{ role: common }", scopes: ["source.yaml", "string.unquoted.yaml"]
-
   it "parses colons in key names", ->
     lines = grammar.tokenizeLines """
       colon::colon: 1