diff --git a/data/syntax/diff.xml b/data/syntax/diff.xml
--- a/data/syntax/diff.xml
+++ b/data/syntax/diff.xml
@@ -15,7 +15,7 @@
     2008-02-13: 1.11 Eduardo Robles Elvira <edulix AT gmail DOT com>
      Fixed folding.
 -->
-<language name="Diff" version="3" kateversion="5.0" section="Other" extensions="*.diff;*patch" mimetype="text/x-patch">
+<language name="Diff" version="4" kateversion="5.0" section="Other" extensions="*.diff;*patch" mimetype="text/x-patch">
 
   <highlighting>
 
@@ -96,7 +96,6 @@
       </context>
 
       <!-- line contexts -->
-      <context attribute="File" lineEndContext="#pop" name="File"/>
       <context attribute="Removed line" lineEndContext="#pop" name="Removed"/>
       <context attribute="Added line" lineEndContext="#pop" name="Added"/>
       <context attribute="Changed line (old)" lineEndContext="#pop" name="ChangedOld"/>
diff --git a/data/syntax/objectivecpp.xml b/data/syntax/objectivecpp.xml
--- a/data/syntax/objectivecpp.xml
+++ b/data/syntax/objectivecpp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Objective-C++" version="2" kateversion="5.0" section="Sources" extensions="*.mm;*.M;*.h" mimetype="text/x-objcpp-src;text/x-c-hdr" author="Gennady Telegin (gepo@lvk.cs.msu.su">
+<language name="Objective-C++" version="3" kateversion="5.0" section="Sources" extensions="*.mm;*.M;*.h" mimetype="text/x-objcpp-src;text/x-c-hdr" author="Gennady Telegin (gepo@lvk.cs.msu.su">
   <highlighting>
     <list name="keywords">
       <item>break</item>
@@ -193,9 +193,8 @@
         <Detect2Chars attribute="Comment" context="SingleLineComment" char="/" char1="/"/>
         <Detect2Chars attribute="Comment" context="MultiLineComment" char="/" char1="*"/>
 
-        <RegExpr attribute="Preprocessor" context="Preprocessor" String="^#"/>
         <Detect2Chars attribute="String" context="String" char="@" char1="&quot;" />
-        
+
         <keyword attribute="Extensions" context="#stay" String="extensions" />
 
         <IncludeRules context="##Doxygen" />
@@ -214,40 +213,30 @@
       <context attribute="Comment" lineEndContext="#stay" name="MultiLineComment">
         <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/"/>
       </context>
-      <context attribute="Preprocessor" lineEndContext="Default" name="Preprocessor">
-        <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="##Doxygen" />
-        <Detect2Chars attribute="Comment" context="SingleLineComment" char="/" char1="/"/>
-        <Detect2Chars attribute="Comment" context="MultiLineCommentPrep" char="/" char1="*"/>
-      </context>
       <context attribute="Comment" lineEndContext="#stay" name="MultiLineCommentPrep">
         <DetectSpaces />
         <Detect2Chars attribute="Comment" context="#pop#pop" char="*" char1="/"/>
         <DetectIdentifier />
       </context>
-      
-      
-      
+
       <!-- from c++ -->
-      
+
       <context attribute="Region Marker" lineEndContext="#pop" name="Region Marker">
       </context>
-      
+
       <context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
         <DetectSpaces />
         <IncludeRules context="##Alerts" />
         <DetectIdentifier />
       </context>
-      
+
       <context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
         <DetectSpaces />
         <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
         <IncludeRules context="##Alerts" />
         <DetectIdentifier />
       </context>
-      
+
       <context attribute="Preprocessor" lineEndContext="#pop" name="Preprocessor">
         <LineContinue attribute="Preprocessor" context="#stay"/>
         <RegExpr attribute="Preprocessor" context="Define" String="define.*((?=\\))"/>
@@ -258,11 +247,11 @@
         <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
         <Detect2Chars attribute="Comment" context="MultiLineCommentPrep" char="/" char1="*"/>
       </context>
-      
+
       <context attribute="Preprocessor" lineEndContext="#pop" name="Define">
         <LineContinue attribute="Preprocessor" context="#stay"/>
       </context>
-      
+
       <context attribute="Comment" lineEndContext="#stay" name="Outscoped" >
         <DetectSpaces />
         <IncludeRules context="##Alerts" />