diff --git a/data/syntax/c-preprocessor.xml b/data/syntax/c-preprocessor.xml
new file mode 100644
--- /dev/null
+++ b/data/syntax/c-preprocessor.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<!--
+Copyright (c) 2012-2016 Alex Turbov (I.zaufi@gmail.com)
+Copyright (c) 2017 Alex Richardson (arichardson.kde@gmail.com)
+Based on the preprocessor parts of isocpp.xml by
+-->
+<language
+    name="C Preprocessor"
+    version="2"
+    kateversion="5.0"
+    section="Other"
+    extensions="" mimetype="" hidden="true" priority="1"
+    author="Alex Richardson (arichardson.kde@gmail.com)"
+    license="MIT"
+    hidden="true"
+  >
+<!--
+  To be included by other files that use the C preprocessor (e.g. C, C++, Assembly, DTrace)
+
+  Include either DetectPreprocessor if non-preprocessor directives after # should be highlighted
+  as errors or DetectPreprocessorHashIsComment if # is a comment character (e.g. assembler)
+-->
+<highlighting>
+  <list name="StdMacros">
+    <item> __FILE__ </item>
+    <item> __LINE__ </item>
+    <item> __DATE__ </item>
+    <item> __TIME__ </item>
+    <item> __STDC__ </item>
+    <item> __STDC_VERSION__ </item>
+    <item> __STDC_HOSTED__ </item>
+    <item> __STDC_ISO_10646__ </item>
+    <item> __STDC_MB_MIGHT_NEQ_WC__ </item>
+    <item> __cplusplus </item>
+    <item> __func__ </item>
+  </list>
+  <contexts>
+    <context name="DetectPreprocessorInactiveBranch" attribute="Normal Text" lineEndContext="#stay">
+        <!-- TODO: should we really still support trigraphs in highlighting? -->
+        <RegExpr attribute="Preprocessor" context="Outscoped" String="(#|%\:|\?\?=)\s*if\s+(0|false)\s*" beginRegion="PP" firstNonSpace="true" insensitive="false" />
+        <RegExpr attribute="Preprocessor" context="Inscoped" String="(#|%\:|\?\?=)\s*if\s+(1|true)\s*" beginRegion="PP" firstNonSpace="true" insensitive="false" />
+    </context>
+
+    <context name="DetectPreprocessor" attribute="Normal Text" lineEndContext="#stay">
+        <!-- TODO: should we really still support trigraphs in highlighting? -->
+        <IncludeRules context="DetectPreprocessorInactiveBranch" />
+        <!-- Match preprocessor directives -->
+        <DetectChar context="AfterHash" char="#" firstNonSpace="true" lookAhead="true" />
+        <Detect2Chars context="AfterHash" char="%" char1=":" firstNonSpace="true" lookAhead="true" />
+        <StringDetect context="AfterHash" String="??=" firstNonSpace="true" lookAhead="true" />
+    </context>
+
+    <context name="DetectPreprocessorHashIsComment" attribute="Normal Text" lineEndContext="#stay">
+        <!-- TODO: should we really still support trigraphs in highlighting? -->
+        <IncludeRules context="DetectPreprocessorInactiveBranch" />
+        <!-- Match preprocessor directives -->
+        <DetectChar context="AfterHashAsComment" char="#" firstNonSpace="true" lookAhead="true" />
+        <Detect2Chars context="AfterHashAsComment" char="%" char1=":" firstNonSpace="true" lookAhead="true" />
+        <StringDetect context="AfterHashAsComment" String="??=" firstNonSpace="true" lookAhead="true" />
+    </context>
+
+    <context name="AfterHashCommon" attribute="Error" lineEndContext="#pop">
+      <RegExpr attribute="Preprocessor" context="Include" String="#\s*(?:include|include_next)" insensitive="true" firstNonSpace="true" />
+
+      <!-- define, elif, else, endif, error, if, ifdef, ifndef, line, pragma, undef, warning -->
+      <RegExpr attribute="Preprocessor" context="Preprocessor" String="(#|%\:|\?\?=)\s*if(?:def|ndef)?(?=(?:\(|\s+)\S)" beginRegion="PP" firstNonSpace="true" insensitive="false" />
+      <RegExpr attribute="Preprocessor" context="Preprocessor" String="(#|%\:|\?\?=)\s*endif" endRegion="PP" firstNonSpace="true" insensitive="false" />
+      <!-- Switch to seperate context for multiline #defines -->
+      <RegExpr attribute="Preprocessor" context="Define" String="(#|%\:|\?\?=)\s*(cmake)?define.*((?=\\))" firstNonSpace="true" lookAhead="true" insensitive="false" />
+      <RegExpr attribute="Preprocessor" context="Preprocessor" String="(#|%\:|\?\?=)\s*(?:el(?:se|if)|(cmake)?define|undef|line|error|warning|pragma)" insensitive="false" firstNonSpace="true" />
+      <RegExpr attribute="Preprocessor" context="Preprocessor" String="(#|%\:|\?\?=)\s+[0-9]+" firstNonSpace="true" insensitive="false" />
+    </context>
+
+    <context name="AfterHash" attribute="Error" lineEndContext="#pop">
+      <IncludeRules context="AfterHashCommon" />
+    </context>
+    <context name="AfterHashAsComment" attribute="Comment" lineEndContext="#pop">
+      <IncludeRules context="AfterHashCommon" />
+    </context>
+
+    <context attribute="Preprocessor" lineEndContext="#pop" name="Include">
+      <LineContinue attribute="Preprocessor" context="#stay"/>
+      <RangeDetect attribute="Prep. Lib" context="#stay" char="&quot;" char1="&quot;"/>
+      <RangeDetect attribute="Prep. Lib" context="#stay" char="&lt;" char1="&gt;"/>
+      <IncludeRules context="Preprocessor" />
+    </context>
+
+    <context name="Preprocessor" attribute="Preprocessor" lineEndContext="#pop">
+      <LineContinue attribute="Preprocessor" context="#stay" />
+      <keyword attribute="Standard Macros" context="#stay" String="StdMacros" />
+      <IncludeRules context="GNUMacros##GCCExtensions" />
+      <IncludeRules context="##Doxygen" />
+      <Detect2Chars attribute="Comment" context="Comment/Preprocessor" char="/" char1="*" beginRegion="Comment2" />
+      <Detect2Chars attribute="Comment" context="Comment Single" char="/" char1="/" />
+    </context>
+
+    <context name="Define" attribute="Preprocessor" lineEndContext="#pop">
+      <LineContinue attribute="Separator Symbol" context="#stay" />
+      <DetectChar attribute="Error" context="#stay" char="\\" />
+      <keyword attribute="Standard Macros" context="#stay" String="StdMacros" />
+      <IncludeRules context="GNUMacros##GCCExtensions" />
+    </context>
+
+    <context name="Comment/Preprocessor" attribute="Comment" lineEndContext="#stay">
+      <DetectSpaces />
+      <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment2" />
+      <DetectIdentifier />
+    </context>
+
+    <context name="Outscoped Common" attribute="Comment" lineEndContext="#stay">
+      <DetectSpaces />
+      <IncludeRules context="##Alerts" />
+      <IncludeRules context="##Modelines" />
+      <DetectIdentifier />
+      <IncludeRules context="##Doxygen" />
+      <Detect2Chars attribute="Comment" context="Comment Single" char="/" char1="/" />
+      <!-- Do not try to detect "C" style comments inside outscoped text
+            to prevent incorrect highlighting in case of overlapped (or not closed properly)
+            comment block...
+
+            <Detect2Chars attribute="Comment" context="Comment Multi" char="/" char1="*" beginRegion="Comment" />
+      -->
+      <RegExpr attribute="Comment" context="Outscoped intern" String="(#|%\:|\?\?=)\s*if" beginRegion="PP" firstNonSpace="true" insensitive="false" />
+      <LineContinue context="#stay" />
+    </context>
+
+    <context name="Outscoped" attribute="Comment" lineEndContext="#stay">
+      <IncludeRules context="Outscoped Common" />
+      <RegExpr attribute="Preprocessor" context="#pop" String="(#|%\:|\?\?=)\s*el(?:se|if)" firstNonSpace="true" insensitive="false" />
+      <RegExpr attribute="Preprocessor" context="#pop" String="(#|%\:|\?\?=)\s*endif" endRegion="PP" firstNonSpace="true" insensitive="false" />
+    </context>
+
+    <context name="Outscoped 2" attribute="Comment" lineEndContext="#stay">
+      <IncludeRules context="Outscoped Common" />
+      <RegExpr attribute="Preprocessor" context="#pop#pop" String="(#|%\:|\?\?=)\s*endif" endRegion="PP" firstNonSpace="true" insensitive="false" />
+    </context>
+
+    <context name="Inscoped" attribute="Normal Text" lineEndContext="#stay">
+      <DetectSpaces />
+      <RegExpr attribute="Preprocessor" context="Outscoped" String="(#|%\:|\?\?=)\s*if\s+(0|false)\s*" beginRegion="PP" firstNonSpace="true" insensitive="false" />
+      <RegExpr attribute="Preprocessor" context="Outscoped 2" String="(#|%\:|\?\?=)\s*el(?:se|if)" firstNonSpace="true" insensitive="false" />
+      <RegExpr attribute="Preprocessor" context="#pop" String="(#|%\:|\?\?=)\s*endif" endRegion="PP" firstNonSpace="true" insensitive="false" />
+      <!-- <IncludeRules context="Main" /> -->
+    </context>
+
+    <context name="Outscoped intern" attribute="Comment" lineEndContext="#stay">
+      <DetectSpaces />
+      <IncludeRules context="##Alerts" />
+      <IncludeRules context="##Modelines" />
+      <DetectIdentifier />
+      <IncludeRules context="##Doxygen" />
+      <Detect2Chars attribute="Comment" context="Comment Single" char="/" char1="/" />
+      <Detect2Chars attribute="Comment" context="Comment Multi" char="/" char1="*" beginRegion="Comment" />
+      <RegExpr attribute="Comment" context="Outscoped intern" String="(#|%\:|\?\?=)\s*if" beginRegion="PP" firstNonSpace="true" insensitive="false" />
+      <RegExpr attribute="Comment" context="#pop" String="(#|%\:|\?\?=)\s*endif" endRegion="PP" firstNonSpace="true" insensitive="false" />
+    </context>
+
+    <context name="Comment Single" attribute="Comment" lineEndContext="#pop">
+      <LineContinue attribute="Comment" context="#stay" />
+      <DetectSpaces />
+      <IncludeRules context="##Alerts" />
+      <IncludeRules context="##Modelines" />
+      <DetectIdentifier />
+    </context>
+
+    <context name="Comment Multi" attribute="Comment" lineEndContext="#stay">
+      <DetectSpaces />
+      <LineContinue attribute="Comment" context="#stay" />
+      <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment" />
+      <IncludeRules context="##Alerts" />
+      <IncludeRules context="##Modelines" />
+      <DetectIdentifier />
+    </context>
+  </contexts>
+  <itemDatas>
+      <itemData name="Normal Text"  defStyleNum="dsNormal" />
+      <itemData name="Preprocessor" defStyleNum="dsPreprocessor" spellChecking="false" />
+      <itemData name="Prep. Lib"    defStyleNum="dsImport"       spellChecking="false" />
+      <itemData name="Comment"      defStyleNum="dsComment"      spellChecking="true"  />
+      <itemData name="Error"        defStyleNum="dsError"        spellChecking="false" />
+      <itemData name="Standard Macros"  defStyleNum="dsOthers"   spellChecking="false" />
+  </itemDatas>
+</highlighting>
+</language>
+<!-- kate: indent-width 2; tab-width 2; -->
diff --git a/data/syntax/gnuassembler.xml b/data/syntax/gnuassembler.xml
--- a/data/syntax/gnuassembler.xml
+++ b/data/syntax/gnuassembler.xml
@@ -43,7 +43,7 @@
 
 -->
 
-<language name="GNU Assembler" version="3" kateversion="5.0" section="Assembler" extensions="*.s;*.S" mimetype="text/x-asm" author="John Zaitseff (J.Zaitseff@zap.org.au), Roland Pabel (roland@pabel.name), Miquel Sabaté (mikisabate@gmail.com)" license="GPLv2+">
+<language name="GNU Assembler" version="4" kateversion="5.0" section="Assembler" extensions="*.s;*.S" mimetype="text/x-asm" author="John Zaitseff (J.Zaitseff@zap.org.au), Roland Pabel (roland@pabel.name), Miquel Sabaté (mikisabate@gmail.com)" license="GPLv2+">
   <highlighting>
     <list name="keywords">
       <item>.abort</item>
@@ -246,30 +246,22 @@
         <HlCChar      attribute="Char" context="#stay" />
         <RegExpr      attribute="Char" context="#stay" String="'(\\x[0-9a-fA-F][0-9a-fA-F]?|\\[0-7]?[0-7]?[0-7]?|\\.|.)" />
         <DetectChar   attribute="String" context="String" char="&quot;" />
-        <RegExpr      attribute="Preprocessor" context="Preprocessor" String="#\s*if(?:def|ndef)?(?=\s+\S)" insensitive="true" beginRegion="PP" firstNonSpace="true" />
-        <RegExpr      attribute="Preprocessor" context="Preprocessor" String="#\s*endif" insensitive="true" endRegion="PP" firstNonSpace="true" />
-        <RegExpr      attribute="Preprocessor" context="Define" String="#\s*define.*((?=\\))" insensitive="true" firstNonSpace="true" />
-        <RegExpr      attribute="Preprocessor" context="Preprocessor" String="#\s*(?:el(?:se|if)|include(?:_next)?|define|undef|line|error|warning|pragma)" firstNonSpace="true" />
+        <IncludeRules context="DetectPreprocessorHashIsComment##C Preprocessor" />
         <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="*" />
         <AnyChar      attribute="Comment" context="Commentar 2" String="@;#" />
         <AnyChar      attribute="Symbol" context="#stay" String="!#%&amp;*()+,-&lt;=&gt;?/:[]^{|}~" />
       </context>
       <context attribute="Comment" lineEndContext="#stay" name="Commentar 1">
-        <IncludeRules context="##Alerts" />
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" />
+        <IncludeRules context="Comment Multi##C Preprocessor" />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="Commentar 2" >
-        <IncludeRules context="##Alerts" />
+        <IncludeRules context="Comment Single##C Preprocessor" />
       </context>
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue  attribute="String" context="Some Context" />
         <HlCStringChar attribute="String Char" context="#stay" />
         <DetectChar    attribute="String" context="#pop" char="&quot;" />
       </context>
-      <context attribute="Preprocessor" lineEndContext="#pop" name="Preprocessor" />
-      <context attribute="Preprocessor" lineEndContext="#pop" name="Define">
-        <LineContinue attribute="Preprocessor" context="#stay"/>
-      </context>
       <context attribute="Normal Text" lineEndContext="#pop" name="Some Context" />
     </contexts>
 
@@ -287,7 +279,6 @@
       <itemData name="String Char"  defStyleNum="dsSpecialChar" />
       <itemData name="Symbol"       defStyleNum="dsNormal"   />
       <itemData name="Comment"      defStyleNum="dsComment"  />
-      <itemData name="Preprocessor" defStyleNum="dsPreprocessor" />
     </itemDatas>
   </highlighting>
 
diff --git a/data/syntax/mips.xml b/data/syntax/mips.xml
--- a/data/syntax/mips.xml
+++ b/data/syntax/mips.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="MIPS Assembler" version="2" kateversion="2.4" section="Assembler" extensions="*.s;" mimetype="text/x-mips" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" priority="-1">
+<language name="MIPS Assembler" version="3" kateversion="2.4" section="Assembler" extensions="*.s;*.S;" mimetype="text/x-mips" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" priority="-1">
   <highlighting>
     <list name="type">
       <item> .align </item>
@@ -14,7 +14,18 @@
       <item> .half </item>
       <item> .sdata </item>
       <item> .set </item>
+      <item> .size </item>
       <item> .space </item>
+      <item> .type </item>
+      <!-- https://sourceware.org/binutils/docs/as/Type.html -->
+      <item> @function </item>
+      <item> @gnu_indirect_function </item>
+      <item> @object </item>
+      <item> @tls_object </item>
+      <item> @common </item>
+      <item> @notype </item>
+      <item> @gnu_unique_object </item>
+      <item> .type </item>
       <item> .word </item>
     </list>
     <list name="section">
@@ -29,9 +40,13 @@
       <item> add </item>
       <item> add.d </item>
       <item> add.s </item>
+      <item> dadd </item>
       <item> addi </item>
+      <item> daddi </item>
       <item> addiu </item>
+      <item> daddiu </item>
       <item> addu </item>
+      <item> daddu </item>
       <item> and </item>
       <item> andi </item>
       <item> bc0f </item>
@@ -131,9 +146,11 @@
       <item> srl </item>
       <item> srlv </item>
       <item> sub </item>
+      <item> dsub </item>
       <item> sub.d </item>
       <item> sub.s </item>
       <item> subu </item>
+      <item> dsubu </item>
       <item> sw </item>
       <item> swc0 </item>
       <item> swc1 </item>
@@ -163,8 +180,10 @@
       <item> l.d </item>
       <item> l.s </item>
       <item> la </item>
+      <item> dla </item>
       <item> ld </item>
       <item> li </item>
+      <item> dli </item>
       <item> li.d </item>
       <item> li.s </item>
       <item> mfc0.d </item>
@@ -317,7 +336,9 @@
         <keyword attribute="Section" context="#stay" String="type"/>
         <RegExpr attribute="Region Marker" context="#stay" String="#\s*BEGIN.*$" beginRegion="region" firstNonSpace="true"/>
         <RegExpr attribute="Region Marker" context="#stay" String="#\s*END.*$" endRegion="region" firstNonSpace="true"/>
-        <RegExpr attribute="Comment" context="#stay" String="#.*$" />
+        <IncludeRules context="DetectPreprocessorHashIsComment##C Preprocessor" />
+        <Detect2Chars attribute="Comment" context="Comment Multi" char="/" char1="*" beginRegion="Comment"/>
+        <AnyChar      attribute="Comment" context="Comment Single" String="@;#" />
         <RegExpr attribute="Label" context="#stay" String="[\w_\.]+:" firstNonSpace="true"/>
         <DetectChar attribute="String" context="string" char="&quot;" />
         <Float attribute="Float" context="#stay"/>
@@ -329,30 +350,37 @@
         <RegExpr attribute="Char" context="#stay" String="\\." />
         <DetectChar attribute="String" context="#pop" char="&quot;" />
       </context>
+      <context name="Comment Multi" attribute="Comment" lineEndContext="#stay" >
+        <IncludeRules context="Comment Multi##C Preprocessor" />
+      </context>
+      <context name="Comment Single" attribute="Comment" lineEndContext="#pop" >
+        <IncludeRules context="Comment Single##C Preprocessor" />
+      </context>
     </contexts>
     <itemDatas>
       <itemData name="Normal Text" defStyleNum="dsNormal" />
-      <itemData name="Hardware Instruction" defStyleNum="dsKeyword" />
-      <itemData name="Pseudo Instruction" defStyleNum="dsFunction"/>
-      <itemData name="Other Register" defStyleNum="dsDataType" color="#0000ff"/>
-      <itemData name="Main Register" defStyleNum="dsDataType"/>
-      <itemData name="Floating Point Register" defStyleNum="dsFloat"/>
-      <itemData name="Section" defStyleNum="dsDataType"/>
-      <itemData name="Type" defStyleNum="dsKeyword"/>
+      <itemData name="Hardware Instruction" defStyleNum="dsKeyword" spellChecking="0"/>
+      <itemData name="Pseudo Instruction" defStyleNum="dsFunction" spellChecking="0"/>
+      <itemData name="Other Register" defStyleNum="dsDataType" color="#0000ff" spellChecking="0"/>
+      <itemData name="Main Register" defStyleNum="dsDataType" spellChecking="0"/>
+      <itemData name="Floating Point Register" defStyleNum="dsFloat" spellChecking="0"/>
+      <itemData name="Section" defStyleNum="dsDataType" spellChecking="0"/>
+      <itemData name="Type" defStyleNum="dsKeyword" spellChecking="0"/>
       <itemData name="Comment" defStyleNum="dsComment" />
       <itemData name="Char" defStyleNum="dsChar" />
       <itemData name="String" defStyleNum="dsString" />
-      <itemData name="Label" defStyleNum="dsOthers" />
+      <itemData name="Label" defStyleNum="dsOthers" spellChecking="0" />
       <itemData name="Decimal" defStyleNum="dsDecVal"/>
       <itemData name="Octal" defStyleNum="dsBaseN"/>
       <itemData name="Hex" defStyleNum="dsBaseN"/>
       <itemData name="Float" defStyleNum="dsFloat"/>
-      <itemData name="Region Marker" defStyleNum="dsRegionMarker"/>
+      <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="0"/>
     </itemDatas>
   </highlighting>
   <general>
     <comments>
       <comment name="singleLine" start="#" />
+      <comment name="multiLine"  start="/*" end="*/" />
     </comments>
     <keywords casesensitive="0" weakDeliminator="."/>
   </general>