diff --git a/grammars/language-asciidoc.cson b/grammars/language-asciidoc.cson
index f1a65ef..c708bdb 100644
--- a/grammars/language-asciidoc.cson
+++ b/grammars/language-asciidoc.cson
@@ -227,10 +227,7 @@ repository:
     patterns: [
       {
         name: "markup.explicit.asciidoc"
-        match: '''
-          ^\\[((normal|literal|listing|TIP|NOTE|IMPORTANT|WARNING|CAUTION|partintro|comment|example|sidebar|source|music|latex|graphviz))\\]$(?<!
-          ---)
-        '''
+        match: "^\\[((normal|literal|listing|TIP|NOTE|IMPORTANT|WARNING|CAUTION|partintro|comment|example|sidebar|source|music|latex|graphviz))\\]$(?<!\\n---)"
         captures:
           "1":
             name: "entity.name.function.asciidoc"
@@ -896,11 +893,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -936,11 +932,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -976,11 +971,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1016,11 +1010,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1056,11 +1049,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1096,11 +1088,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1136,11 +1127,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1176,11 +1166,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1216,11 +1205,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1256,11 +1244,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1296,11 +1283,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1336,11 +1322,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1376,11 +1361,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1416,11 +1400,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1456,11 +1439,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1496,11 +1478,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1536,11 +1517,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1576,11 +1556,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1616,11 +1595,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1656,11 +1634,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1696,11 +1673,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1736,11 +1712,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1776,11 +1751,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1816,11 +1790,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1856,11 +1829,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1896,11 +1868,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1936,11 +1907,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1976,11 +1946,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2016,11 +1985,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2056,11 +2024,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2096,11 +2063,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2136,11 +2102,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2176,11 +2141,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2216,11 +2180,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2256,11 +2219,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2296,11 +2258,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2336,11 +2297,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2376,11 +2336,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2416,11 +2375,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2456,11 +2414,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2496,11 +2453,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2536,11 +2492,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2576,11 +2531,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2616,11 +2570,10 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "entity.name.type.asciidoc"
+            name: "string.asciidoc"
           "3":
-            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2651,14 +2604,14 @@ repository:
         end: "(?<=----)[\\r\\n]+$"
       }
       {
-        begin: "^\\[(source)(,([^\\]]*))?\\]$"
+        begin: "^\\[(source)(?:,([^,\\]]*)){0,2}\\]$"
         beginCaptures:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "entity.name.function.asciidoc"
+            name: "constant.asciidoc"
           "2":
-            name: "markup.meta.attribute-list.asciidoc"
+            name: "string.asciidoc"
         end: "(?<=----)[\\r\\n]+$"
         patterns: [
           {
diff --git a/grammars/repositories/partials/explicit-paragraph-grammar.cson b/grammars/repositories/partials/explicit-paragraph-grammar.cson
index 9d0430b..36fbf84 100644
--- a/grammars/repositories/partials/explicit-paragraph-grammar.cson
+++ b/grammars/repositories/partials/explicit-paragraph-grammar.cson
@@ -10,7 +10,7 @@ patterns: [
   #   This is a normal paragraph.
   #
   name: 'markup.explicit.asciidoc'
-  match: '^\\[((normal|literal|listing|TIP|NOTE|IMPORTANT|WARNING|CAUTION|partintro|comment|example|sidebar|source|music|latex|graphviz))\\]$(?<!\n---)'
+  match: '^\\[((normal|literal|listing|TIP|NOTE|IMPORTANT|WARNING|CAUTION|partintro|comment|example|sidebar|source|music|latex|graphviz))\\]$(?<!\\n---)'
   captures:
     1: name: 'entity.name.function.asciidoc'
 ]
diff --git a/lib/code-block-generator.coffee b/lib/code-block-generator.coffee
index f0cedcc..5fc3da9 100644
--- a/lib/code-block-generator.coffee
+++ b/lib/code-block-generator.coffee
@@ -38,7 +38,6 @@ module.exports =
         0: name: 'support.asciidoc'
         1: name: 'entity.name.function.asciidoc'
         2: name: 'markup.meta.attribute-list.asciidoc'
-      end: '(?<=----)[\\r\\n]+$'
       patterns: [
         name: 'markup.raw.asciidoc'
         begin: '^(-{4,})\\s*$'
@@ -51,6 +50,7 @@ module.exports =
         endCaptures:
           0: name: 'support.asciidoc'
       ]
+      end: '(?<=----)[\\r\\n]+$'
 
     # add listing block
     codeBlocks.push
@@ -75,15 +75,15 @@ module.exports =
       begin: "^\\s*(`{3,})\\s*(?i:(#{lang.pattern}))\\s*$"
       beginCaptures:
         0: name: 'support.asciidoc'
-      end: '^\\s*\\1\\s*$'
-      endCaptures:
-        0: name: 'support.asciidoc'
       contentName: "#{lang.type}.embedded.#{lang.code}"
       patterns: [
         include: '#block-callout'
       ,
         include: "#{lang.type}.#{lang.code}"
       ]
+      end: '^\\s*\\1\\s*$'
+      endCaptures:
+        0: name: 'support.asciidoc'
 
     # add generic block
     codeBlocks.push