     end: '\\]'
     endCaptures: 0: name: 'punctuation.definition.argument.optional.end.tikz'
     contentName: 'variable.parameter.optional.tikz'
-    patterns: [{ include: '$self' }]
+    patterns: [{ include: '#text.tex.latex.tikz' }]
   }
   pathDescriptor: {
     comment: 'For the constructions like --, -|, |-, etc.'

  { include: '#coordinate' }
  { include: '#options' }
  { include: '#pathDescriptor' }
  {
    comment: 'This prevents .tikz files being scoped as LaTeX & embedded with TikZ'
    match: '((\\\\)(begin|end))(\\{)(tikzpicture)(\\})'

  # General structures that apply anywhere
  coordinate: {
    comment: 'The contents is either a point, or name (which refers to a point).'
    begin: '\\('
    end: '\\)|$'
    beginCaptures: 0: name: 'punctuation.definition.begin.coordinate.tikz'
    endCaptures: 0: name: 'punctuation.definition.end.coordinate.tikz'
    contentName:'markup.other.coordinate.tikz'
    patterns: [{ include: '$self' }]
  }
  options: {
    begin: '\\['
