diff --git a/data/syntax/haml.xml b/data/syntax/haml.xml
--- a/data/syntax/haml.xml
+++ b/data/syntax/haml.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Haml" version="5" kateversion="3.0" section="Markup"
+<language name="Haml" version="6" kateversion="3.0" section="Markup"
           extensions="*.haml"
           author="Cies Breijs (cies_at_kde_nl)" license="LGPL"
           mimetype="text/x-haml">
@@ -203,7 +203,7 @@
         <RegExpr attribute="Entity" context="#stay" String="&amp;[a-zA-Z]+;" />
       </context>
 
-      <context attribute="Array" lineEndContext="#stay" name="array">
+      <context attribute="Operator" lineEndContext="#stay" name="array">
         <DetectSpaces/>
         <DetectChar attribute="Operator" context="#pop" char="]" endRegion="Array" />
         <IncludeRules context="rubysourceline" />
@@ -426,8 +426,9 @@
 
 
     <itemDatas>
-    <!-- BEGIN Ruby itemData -->
+    <!-- Ruby itemData -->
       <itemData name="Ruby Normal Text" defStyleNum="dsNormal"/>
+      <itemData name="Ruby embedded in haml" defStyleNum="dsNormal"/>
 
       <itemData name="Keyword" defStyleNum="dsKeyword"/>
       <itemData name="Attribute Definition" defStyleNum="dsOthers"/>
@@ -444,15 +445,13 @@
 
       <itemData name="Symbol" defStyleNum="dsDataType" />
       <itemData name="String" defStyleNum="dsString"/>
+      <itemData name="Escaped Text" defStyleNum="dsChar"/>
       <itemData name="Unquoted String" defStyleNum="dsString"/>
       <itemData name="Raw String" defStyleNum="dsString" color="#DD4A4A" selColor="#DD4A4A"/>
       <itemData name="Command" defStyleNum="dsString" color="#AA3000"/>
       <itemData name="Message" defStyleNum="dsNormal" color="#4000A7"/> <!-- #4A00C0 -->
       <itemData name="Regular Expression" defStyleNum="dsOthers" color="#4A5704"/>
       <itemData name="Substitution" defStyleNum="dsOthers"/>
-      <itemData name="Data" defStyleNum="dsNormal"/>
-      <!-- short for 'general delimited input' -->
-      <itemData name="GDL input" defStyleNum="dsOthers" />
 
       <itemData name="Default globals" defStyleNum="dsDataType" color="#C00000" bold="1"/>
       <itemData name="Global Variable" defStyleNum="dsDataType" color="#C00000"/>
@@ -466,15 +465,11 @@
 
       <itemData name="Ruby Comment" defStyleNum="dsComment"/>
       <itemData name="Blockcomment" defStyleNum="dsComment"/>
-      <itemData name="Region Marker" defStyleNum="dsNormal" color="#0000ff"/>
-      <itemData name="RDoc Value" defStyleNum="dsOthers"/>
 
       <!-- use these to mark errors and alerts things -->
       <itemData name="Error" defStyleNum="dsError" />
-      <itemData name="Alert" defStyleNum="dsAlert" />
 
       <itemData name="Delimiter" defStyleNum="dsChar"/>
-      <itemData name="Expression" defStyleNum="dsOthers"/>
       <itemData name="Operator" defStyleNum="dsChar"/>
 
      <!-- HAML itemData -->