diff --git a/autotests/folding/example.rmd.fold b/autotests/folding/example.rmd.fold
index c198d13..5df5366 100644
--- a/autotests/folding/example.rmd.fold
+++ b/autotests/folding/example.rmd.fold
@@ -1,39 +1,39 @@
-<beginfold id='1'>---</beginfold id='1'>
-title: <beginfold id='62'>"</beginfold id='62'>test<endfold id='62'>"</endfold id='62'>
-author: <beginfold id='62'>"</beginfold id='62'>me<endfold id='62'>"</endfold id='62'>
-date: <beginfold id='62'>"</beginfold id='62'>07.10.2014<endfold id='62'>"</endfold id='62'>
+<beginfold id='3'>---</beginfold id='3'>
+title: <beginfold id='64'>"</beginfold id='64'>test<endfold id='64'>"</endfold id='64'>
+author: <beginfold id='64'>"</beginfold id='64'>me<endfold id='64'>"</endfold id='64'>
+date: <beginfold id='64'>"</beginfold id='64'>07.10.2014<endfold id='64'>"</endfold id='64'>
 output: html_document
----
+<endfold id='3'>---</endfold id='3'>
 
 This is a simple test document. It shows syntax highlighting switches between YAML (above), R blocks
 <beginfold id='1'>```{r, echo=FALSE}</beginfold id='1'>
-for (i in 1:10) <beginfold id='52'>{</beginfold id='52'>
+for (i in 1:10) <beginfold id='54'>{</beginfold id='54'>
   if(i>=10) print(i)
-<endfold id='52'>}</endfold id='52'>
+<endfold id='54'>}</endfold id='54'>
 # two blank lines below
 
 sessionInfo()
 <endfold id='1'>```</endfold id='1'>
 
 LaTeX equations,
-<beginfold id='1'>$$</beginfold id='1'>
+<beginfold id='2'>$$</beginfold id='2'>
 h_{i}(t \mid q,C) = h_{0}(t) e^{\beta_{1}quality_{i} + \beta_{2}C_{iq}}
-<endfold id='1'>$$</endfold id='1'>
+<endfold id='2'>$$</endfold id='2'>
 
 and Markdown. A [link](http://example.com) in Markdown.
 
 Inline `r y <- 5 + x - sin(3)` R code.
 Inline `y <- 5 + x - sin(3)` code.
 
 
  Heading
  =======
  
  Sub-heading
  -----------
  A list of editors:
    * kate
    * vim
    * emacs
 
 *italic*, **bold**, `monospace`
diff --git a/autotests/reference/example.rmd.ref b/autotests/reference/example.rmd.ref
index 56eedaa..33a486a 100644
--- a/autotests/reference/example.rmd.ref
+++ b/autotests/reference/example.rmd.ref
@@ -1,39 +1,39 @@
-<Normal Text>---</Normal Text><br/>
+<Markdown>---</Markdown><br/>
 <Key>title:</Key><Attribute> </Attribute><String>"test"</String><br/>
 <Key>author:</Key><Attribute> </Attribute><String>"me"</String><br/>
 <Key>date:</Key><Attribute> </Attribute><String>"07.10.2014"</String><br/>
 <Key>output:</Key><Attribute> html_document</Attribute><br/>
-<Normal Text>---</Normal Text><br/>
+<Markdown>---</Markdown><br/>
 <Normal Text></Normal Text><br/>
 <Normal Text>This is a simple test document. It shows syntax highlighting switches between YAML (above), R blocks</Normal Text><br/>
 <Structure>```{r, echo=FALSE}</Structure><br/>
 <Control Structure>for</Control Structure><Normal Text> </Normal Text><Symbol>(</Symbol><Normal Text>i </Normal Text><Control Structure>in</Control Structure><Normal Text> </Normal Text><Int>1</Int><Operator>:</Operator><Int>10</Int><Symbol>)</Symbol><Normal Text> </Normal Text><Symbol>{</Symbol><br/>
 <Normal Text>  </Normal Text><Control Structure>if</Control Structure><Symbol>(</Symbol><Normal Text>i</Normal Text><Operator>>=</Operator><Int>10</Int><Symbol>)</Symbol><Normal Text> </Normal Text><Keyword>print</Keyword><Symbol>(</Symbol><Normal Text>i</Normal Text><Symbol>)</Symbol><br/>
 <Symbol>}</Symbol><br/>
 <Comment># two blank lines below</Comment><br/>
 <Normal Text></Normal Text><br/>
 <Keyword>sessionInfo</Keyword><Symbol>()</Symbol><br/>
 <Structure>```</Structure><br/>
 <Normal Text></Normal Text><br/>
 <Normal Text>LaTeX equations,</Normal Text><br/>
 <MathMode>$$</MathMode><br/>
 <Math>h_{i}(t </Math><Macro Mathmode>\mid</Macro Mathmode><Math> q,C) = h_{0}(t) e^{</Math><Macro Mathmode>\beta</Macro Mathmode><Math>_{1}quality_{i} + </Math><Macro Mathmode>\beta</Macro Mathmode><Math>_{2}C_{iq}}</Math><br/>
 <MathMode>$$</MathMode><br/>
 <Normal Text></Normal Text><br/>
 <Normal Text>and Markdown. A </Normal Text><inlinelink>[link](http://example.com)</inlinelink><Normal Text> in Markdown.</Normal Text><br/>
 <Normal Text></Normal Text><br/>
 <Normal Text>Inline </Normal Text><Structure>`r</Structure><Normal Text> y </Normal Text><Assign><-</Assign><String> </String><Int>5</Int><Normal Text> </Normal Text><Operator>+</Operator><String> </String><Normal Text>x </Normal Text><Operator>-</Operator><String> </String><Keyword>sin</Keyword><Symbol>(</Symbol><Int>3</Int><Symbol>)</Symbol><Structure>`</Structure><Normal Text> R code.</Normal Text><br/>
 <Normal Text>Inline </Normal Text><code>`y <- 5 + x - sin(3)`</code><Normal Text> code.</Normal Text><br/>
 <Normal Text></Normal Text><br/>
 <Normal Text></Normal Text><br/>
 <Normal Text> Heading</Normal Text><br/>
 <Normal Text> =======</Normal Text><br/>
 <Normal Text> </Normal Text><br/>
 <Normal Text> Sub-heading</Normal Text><br/>
 <ruler> -----------</ruler><br/>
 <Normal Text> A list of editors:</Normal Text><br/>
 <Normal Text>   * kate</Normal Text><br/>
 <Normal Text>   * vim</Normal Text><br/>
 <Normal Text>   * emacs</Normal Text><br/>
 <Normal Text></Normal Text><br/>
 <emphasis>*italic*,</emphasis><strong> **bold**,</strong><Normal Text> </Normal Text><code>`monospace`</code><br/>
diff --git a/data/syntax/rmarkdown.xml b/data/syntax/rmarkdown.xml
index 6d27305..5adb0d4 100644
--- a/data/syntax/rmarkdown.xml
+++ b/data/syntax/rmarkdown.xml
@@ -1,81 +1,83 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <!--
   Kate highlighting module for R Markdown
   (c) 2014 Dirk Sarpe (dsarpe@posteo.de)
 
   depends on:
     Kate highlighting module for Markdown
     Kate highlighting module for R script
     Kate highlighting module for LaTeX
     Kate highlighting module for YAML
 -->
 
 <language name="R Markdown"
 section="Markup"
 extensions="*.rmd;*.Rmd;*.RMD"
 mimetype="text/x-r-markdown"
-version="4"
+version="5"
 kateversion="3.4"
 casesensitive="true"
 author="Dirk Sarpe (dsarpe@posteo.de)"
 license="GPL">
 
   <highlighting>
     <contexts>
 
       <context attribute="Markdown" name="Normal Text" lineEndContext="#stay">
-        <RegExpr String="^```\{r.*\}" attribute="Structure" context="R block"
-                 beginRegion="block"/>
+        <RegExpr String="^```\{r.*\}" column="0" attribute="Structure" context="R block"
+                 beginRegion="R block"/>
         <Detect2Chars char="`" char1="r" attribute="Structure"
                       context="R inline"/>
         <Detect2Chars char="$" char1="$" attribute="MathMode"
-                      context="LaTeX equation block" beginRegion="block"/>
+                      context="LaTeX equation block" beginRegion="LaTeX equation block"/>
         <DetectChar char="$" attribute="MathMode"
                     context="LaTeX inline equation"/>
-        <RegExpr String="^---$" context="YAMLhead" beginRegion="block"/>
+        <RegExpr String="^---$" column="0" attribute="Markdown" context="YAMLhead"
+                 beginRegion="YAMLhead block"/>
         <IncludeRules context="##Markdown" includeAttrib="true"/>
       </context>
 
       <context name="R block" attribute="Markdown" lineEndContext="#stay">
-        <RegExpr String="^```$" attribute="Structure" context="Normal Text"
-                 endRegion="block"/>
+        <RegExpr String="^```$" column="0" attribute="Structure" context="#pop"
+                 endRegion="R block"/>
         <IncludeRules context="##R Script" includeAttrib="true"/>
       </context>
 
       <context name="R inline" attribute="Markdown" lineEndContext="#stay">
-        <DetectChar char="`" attribute="Structure" context="Normal Text"/>
+        <DetectChar char="`" attribute="Structure" context="#pop"/>
         <IncludeRules context="##R Script" includeAttrib="true"/>
       </context>
 
       <context name="LaTeX equation block" attribute="MathMode"
                lineEndContext="#stay">
         <Detect2Chars char="$" char1="$" attribute="MathMode"
-                      context="Normal Text" endRegion="block"/>
+                      context="#pop" endRegion="LaTeX equation block"/>
         <IncludeRules context="MathModeDisplay##LaTeX" includeAttrib="true"/>
       </context>
 
       <context name="LaTeX inline equation" attribute="MathMode"
                lineEndContext="#stay">
-        <DetectChar char="$" attribute="MathMode" context="Normal Text"/>
+        <DetectChar char="$" attribute="MathMode" context="#pop"/>
         <IncludeRules context="MathMode##LaTeX" includeAttrib="true"/>
       </context>
 
       <context name="YAMLhead" attribute="Document Headers"
                lineEndContext="#stay">
-        <RegExpr String="^---$" context="Normal Text"/>
+        <RegExpr String="^---$" column="0" attribute="Markdown" context="#pop"
+                 endRegion="YAMLhead block"/>
         <IncludeRules context="##YAML" includeAttrib="true"/>
       </context>
 
     </contexts>
 
     <itemDatas>
       <itemData name="Markdown" defStyleNum="dsNormal"/>
       <itemData name="Structure" defStyleNum="dsRegionMarker"/>
       <itemData name="MathMode" defStyleNum="dsRegionMarker" color="#00A000"/>
       <itemData name="Document Headers" defStyleNum="dsOthers"/>
     </itemDatas>
 
   </highlighting>
 
 </language>