diff --git a/data/syntax/prolog.xml b/data/syntax/prolog.xml
--- a/data/syntax/prolog.xml
+++ b/data/syntax/prolog.xml
@@ -105,7 +105,7 @@
     <!ENTITY bs         "\">
 ]>
 <language name="Prolog" section="Sources"
-	  version="6" kateversion="3.4"
+	  version="7" kateversion="3.4"
 	  mimetype="text/x-prolog"
 	  extensions="*.prolog;*.dcg;*.pro"
 	  author="Torsten Eichstädt (torsten.eichstaedt@web.de)"
@@ -335,19 +335,6 @@
 	    <!-- Unspecified integer representation/format -->
 	    <item>xor</item>
 	</list>
-	<list name="directives non-ISO">
-	    <!-- FIXME is this a top_level goal only? (consult :- include) -->
-	    <item>consult</item>
-	    <item>built_in</item>
-<!--GNU            <item>foreign</item> -->
-<!--GNU            <item>ensure_linked</item> -->
-<!--GNU            <item>built_in_fd</item> -->
-<!--             <item>if</item> -->
-<!-- 	    <item>else</item> -->
-<!-- 	    <item>endif</item> -->
-<!--             <item>elif</item> -->
-        </list>
-
         <!-- including directive "initialization" -->
         <list name="logic+control ISO">
 	    <item>initialization</item>
@@ -374,11 +361,6 @@
 <!-- 	    <item>numbervars</item> -->
 <!-- 	    <item>current_predicate</item> -->
 	</list>
-	<list name="listing non-ISO">
-	    <!-- FIXME is this a top_level goal? -->
-	    <item>listing</item>
-<!-- standard/compatible	    <item>public</item> -->
-	</list>
 	<list name="terms ISO">
 	    <!-- keep tokens with same prefix sorted by length? -->
 	    <item>atom_concat</item>
@@ -398,47 +380,9 @@
 	    <item>term_variables</item>
 	    <item>unify_with_occurs_check</item>
 	</list>
-	<list name="terms non-ISO">
-	    <!-- keep tokens with same prefix sorted by length? -->
-	    <item>number_atom</item>
-	    <item>expand_term</item>
-	    <item>term_expansion</item>
-
-	    <!--FIXME These go to streams non-ISO: -->
-	    <item>display</item>
-	    <item>print</item>
-	    <item>format</item>
-	    <item>portray_clause</item>
-	    <item>portray</item>
-	    <item>term_expansion</item>
-	</list>
 	<list name="DCG non-ISO">
 	    <item>phrase</item>
 	</list>
-	<list name="lists ISO">
-	    <item>sort</item>
-	    <item>keysort</item>
-	</list>
-	<list name="lists non-ISO">
-	    <item>append</item>
-	    <item>delete</item>
-	    <item>length</item>
-	    <item>last</item>
-	    <item>map_list</item>
-	    <item>min_list</item>
-	    <item>maplist</item>
-	    <item>msort</item>
-	    <item>memberchk</item>
-	    <item>member</item>
-	    <item>nth</item>
-	    <item>permutation</item>
-	    <item>reverse</item>
-	    <item>select</item>
-	    <item>prefix</item>
-	    <item>suffix</item>
-	    <item>sublist</item>
-	    <item>sum_list</item>
-	</list>
 	<list name="streams ISO">
 	    <item>open</item>
 <!--GNU	    <item>current_stream</item>-->
@@ -461,20 +405,6 @@
 	    <item>writeq</item>
 	    <item>write</item>
 	</list>
-	<list name="streams deprecated">
-	    <item>append</item>
-	    <item>seeing</item>
-	    <item>seen</item>
-	    <item>see</item>
-	    <item>telling</item>
-	    <item>tell</item>
-	    <item>told</item>
-	    <item>get0</item>
-	    <item>get</item>
-	    <item>skip</item>
-	    <item>put</item>
-	    <item>tab</item>
-	</list>
 	<list name="arith eval ISO">
 	    <item>is</item>
 	</list>
@@ -537,13 +467,6 @@
 	    <item>callable</item>
 	    <item>ground</item>
 	</list>
-	<!-- FIXME rename to "types non-ISO"? -->
-	<list name="list+is_list non-ISO">
-	    <item>list</item>
-	    <item>is_list</item>
-	<!--GNU            <item>partial_list</item> -->
-	    <!--GNU            <item>list_or_partial_list</item> -->
-	</list>
 	<list name="built-ins ISO">
 	    <item>current_op</item>
 	    <item>current_prolog_flag</item>
diff --git a/data/syntax/relaxng.xml b/data/syntax/relaxng.xml
--- a/data/syntax/relaxng.xml
+++ b/data/syntax/relaxng.xml
@@ -16,7 +16,7 @@
    - Namespace rules
 -->
 
-<language version="2"
+<language version="3"
           kateversion="2.4"
           name="RELAX NG"
           section="Markup"
@@ -71,36 +71,37 @@
          <RegExpr attribute="Attribute" context="attributes" String="\s*" />
          <DetectChar attribute="Tag" context="#pop" char="&gt;" />
       </context>
-      
+
       <context name="attributes" attribute="Attribute" lineEndContext="#stay">
          <Detect2Chars attribute="Tag" context="#pop#pop" char="/" char1="&gt;" />
          <DetectChar attribute="Tag" context="#pop#pop" char="&gt;" />
          <RegExpr attribute="Normal Text" context="attrValue" String="\s*=\s*" />
       </context>
-      
+
       <context name="attrValue" attribute="Invalid" lineEndContext="#stay">
          <Detect2Chars attribute="Invalid" context="#pop#pop#pop" char="/" char1="&gt;" />
          <DetectChar attribute="Invalid" context="#pop#pop#pop" char="&gt;" />
          <DetectChar attribute="Attribute Value" context="string" char="&quot;" />
       </context>
-      
+
       <context name="string" attribute="Attribute Value" lineEndContext="#stay">
          <DetectChar attribute="Attribute Value" context="#pop#pop" char="&quot;" />
          <IncludeRules context="detectEntRef" />
       </context>
-      
+
       <context name="comment" attribute="Comment" lineEndContext="#stay">
         <DetectSpaces/>
         <StringDetect attribute="Comment" context="#pop"  String="--&gt;" endRegion="comment"/>
         <RegExpr attribute="Error" context="#stay" String="-(-(?!-&gt;))+"/>
         <IncludeRules context="##Alerts"/>
         <DetectIdentifier/>
-      </context>      
+      </context>
     </contexts>
-    
+
     <itemDatas>
       <itemData name="Normal Text" defStyleNum="dsNormal"/>
       <itemData name="Tag" defStyleNum="dsKeyword"/>
+      <itemData name="Entity Reference" defStyleNum="dsOthers"/>
       <itemData name="Invalid" defStyleNum="dsError"/>
       <itemData name="Attribute" defStyleNum="dsOthers"/>
       <itemData name="Attribute Value" defStyleNum="dsString" color="#800000" selColor="#ffffff" bold="0" italic="0"/>
diff --git a/data/syntax/rmarkdown.xml b/data/syntax/rmarkdown.xml
--- a/data/syntax/rmarkdown.xml
+++ b/data/syntax/rmarkdown.xml
@@ -15,7 +15,7 @@
 section="Markup"
 extensions="*.rmd;*.Rmd;*.RMD"
 mimetype="text/x-r-markdown"
-version="2"
+version="3"
 kateversion="3.4"
 casesensitive="true"
 author="Dirk Sarpe (dsarpe@posteo.de)"
@@ -70,7 +70,7 @@
     </contexts>
 
     <itemDatas>
-      <itemData name="Normal Text" defStyleNum="dsNormal"/>
+      <itemData name="Markdown" defStyleNum="dsNormal"/>
       <itemData name="Structure" defStyleNum="dsRegionMarker"/>
       <itemData name="MathMode" defStyleNum="dsRegionMarker" color="#00A000"/>
     </itemDatas>