diff --git a/autotests/syntaxrepository_test.cpp b/autotests/syntaxrepository_test.cpp
--- a/autotests/syntaxrepository_test.cpp
+++ b/autotests/syntaxrepository_test.cpp
@@ -223,6 +223,37 @@
         QCOMPARE(definitionNames, expectedDefinitionNames);
     }
 
+    void testIncludedFormats()
+    {
+        QStringList definitionNames;
+        foreach (const auto &def, m_repo.definitions()) {
+            definitionNames.push_back(def.name());
+        }
+
+        foreach (const QString & name, definitionNames) {
+            Repository repo;
+            auto def = repo.definitionForName(name);
+            auto includedDefs = def.includedDefinitions();
+            includedDefs.push_front(def);
+
+            // collect all formats, shall be numbered from 1..
+            QSet<int> formatIds;
+            for (auto d : qAsConst(includedDefs)) {
+                const auto formats = d.formats();
+                for (const auto format : formats) {
+                    // no duplicates
+                    QVERIFY(!formatIds.contains(format.id()));
+                    formatIds.insert(format.id());
+                }
+            }
+
+            // ensure all ids are there from 1..size
+            for (int i = 1; i <= formatIds.size(); ++i) {
+                QVERIFY(formatIds.contains(i));
+            }
+        }
+    }
+
     void testReload()
     {
         auto def = m_repo.definitionForName(QLatin1String("QML"));
diff --git a/data/syntax/alert_indent.xml b/data/syntax/alert_indent.xml
deleted file mode 100644
--- a/data/syntax/alert_indent.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
-<language version="4" kateversion="2.4" name="Alerts_indent" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhaumann@kde.org)" license="MIT" hidden="true">
-  <highlighting>
-    <contexts>
-      <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
-        <IncludeRules context="##Alerts" />
-      </context>
-    </contexts>
-    <itemDatas>
-      <itemData name="Normal Text" defStyleNum="dsNormal"/>
-    </itemDatas>
-  </highlighting>
-  <general>
-    <folding indentationsensitive="1" />
-  </general>
-</language>
diff --git a/data/syntax/coffee.xml b/data/syntax/coffee.xml
--- a/data/syntax/coffee.xml
+++ b/data/syntax/coffee.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE language SYSTEM "language.dtd">
 
 <language name="CoffeeScript"
-          version="7"
+          version="8"
           kateversion="3.4"
           section="Scripts"
           extensions="Cakefile;*.coffee;*.coco;*.cson"
@@ -196,11 +196,11 @@
       </context>
       <!-- Comments. -->
       <context name="Comment" attribute="Comment" lineEndContext="#pop">
-        <IncludeRules context="##Alerts_indent"/>
+        <IncludeRules context="##Alerts"/>
       </context>
       <context name="Multiline Comment" attribute="Comment" lineEndContext="#stay" noIndentationBasedFolding="1">
         <StringDetect attribute="Comment" context="#pop" String="###" endRegion="Comment"/>
-        <IncludeRules context="##Alerts_indent"/>
+        <IncludeRules context="##Alerts"/>
       </context>
       <!-- Single-line strings. -->
       <context name="String" attribute="String" lineEndContext="#stay">
diff --git a/data/syntax/pig.xml b/data/syntax/pig.xml
--- a/data/syntax/pig.xml
+++ b/data/syntax/pig.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- Pig syntax highlighting v3.0, Copyright © 2012 Johannes Schwenk, johannes.schwenk@adition.com -->
-<language name="Pig" version="6" kateversion="3.4" section="Scripts" extensions="*.pig" mimetype="application/x-pig;text/x-pig" casesensitive="0" author="Johannes Schwenk, johannes.schwenk@adition.com" license="GPL">
+<language name="Pig" version="7" kateversion="3.4" section="Scripts" extensions="*.pig" mimetype="application/x-pig;text/x-pig" casesensitive="0" author="Johannes Schwenk, johannes.schwenk@adition.com" license="GPL">
 	<highlighting>
 		<list name="keywords">
 			<item>load</item>
@@ -158,7 +158,7 @@
 			<context name="Dash comment" attribute="Comment" lineEndContext="#pop">
 				<LineContinue attribute="Comment" context="#stay"/>
 				<DetectSpaces />
-				<IncludeRules context="##Alerts_indent" />
+				<IncludeRules context="##Alerts" />
 				<DetectIdentifier />
 			</context>
 			
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="8" kateversion="3.4"
+	  version="9" kateversion="3.4"
 	  mimetype="text/x-prolog"
 	  extensions="*.prolog;*.dcg;*.pro"
 	  author="Torsten Eichstädt (torsten.eichstaedt@web.de)"
@@ -223,7 +223,7 @@
     - Incl. Sep2012 DRAFT Technical Corrigendum 2: Prolog - Part 1: General Core
     - Incl. honourable Richard O'Keefe's remarks as warnings as "ISO Bogus".
     - Detect 'shebang' shell scripts, see BUGs
-    - Includes alert_indent.xml to highlight alert keywords in comments.
+    - Includes alert.xml to highlight alert keywords in comments.
     - Dot "." may be an _unquoted_ user-defined operator in nested terms (but is
       highlighted as "Warning" 'cause it's more likely a typo than an user-def'd
       op) and is only taken as fullstop and highlighted as "Logic & Control" in
@@ -777,15 +777,15 @@
 		<Detect2Chars char="*" char1="/" context="#pop" endRegion="comment"
 			    attribute="% italic predicates: w/ side effects" />
 		<DetectSpaces />
-		<IncludeRules context="##Alerts_indent" />
+		<IncludeRules context="##Alerts" />
 		<DetectIdentifier />
 	    </context>
 
 	    <!-- 1-line comment: #pop@EOL  -->
 	    <!-- Folding for consecutive 1-line comments: let indentation-based auto-folding work -->
 	    <context name="1-comment" lineEndContext="#pop" attribute="% italic predicates: w/ side effects" >
 		<DetectSpaces />
-		<IncludeRules context="##Alerts_indent" />
+		<IncludeRules context="##Alerts" />
 		<DetectIdentifier />
 	    </context>
 	    <context name="region_marker" lineEndContext="#pop" attribute="%BEGIN folding region" noIndentationBasedFolding="true" >
diff --git a/data/syntax/python.xml b/data/syntax/python.xml
--- a/data/syntax/python.xml
+++ b/data/syntax/python.xml
@@ -14,7 +14,7 @@
 <!-- v2.07 add support for %prog and co, see bug 142832 -->
 <!-- v2.08 add missing overloaders, new Python 3 statements, builtins, and keywords -->
 <!-- v2.29 recognize escape sequenzes correctly -->
-<language name="Python" version="7" style="python" indenter="python" kateversion="5.0" section="Scripts" extensions="*.py;*.pyw;SConstruct;SConscript" mimetype="application/x-python;text/x-python;text/x-python3" casesensitive="1" author="Michael Bueker" license="">
+<language name="Python" version="8" style="python" indenter="python" kateversion="5.0" section="Scripts" extensions="*.py;*.pyw;SConstruct;SConscript" mimetype="application/x-python;text/x-python;text/x-python3" casesensitive="1" author="Michael Bueker" license="">
 	<highlighting>
 		<list name="import">
 			<item>import</item>
@@ -448,25 +448,25 @@
 			<context name="Triple A-comment" attribute="Comment" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<IncludeRules context="stringescape"/>
 				<StringDetect attribute="Comment" String="'''" context="#pop" endRegion="Triple A-region"/>
-				<IncludeRules context="##Alerts_indent" />
+				<IncludeRules context="##Alerts" />
 			</context>
 
 			<context name="Triple Q-comment" attribute="Comment" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<IncludeRules context="stringescape"/>
 				<StringDetect attribute="Comment" String="&quot;&quot;&quot;" context="#pop" endRegion="Triple Q-region"/>
-				<IncludeRules context="##Alerts_indent" />
+				<IncludeRules context="##Alerts" />
 			</context>
 
 			<context name="Single A-comment" attribute="Comment" lineEndContext="#stay">
 				<IncludeRules context="stringescape"/>
 				<DetectChar attribute="Comment" char="'" context="#pop"/>
-				<IncludeRules context="##Alerts_indent" />
+				<IncludeRules context="##Alerts" />
 			</context>
 
 			<context name="Single Q-comment" attribute="Comment" lineEndContext="#stay">
 				<IncludeRules context="stringescape"/>
 				<DetectChar attribute="Comment" char="&quot;" context="#pop"/>
-				<IncludeRules context="##Alerts_indent" />
+				<IncludeRules context="##Alerts" />
 			</context>
 
 			<!-- Strings -->