diff --git a/data/schema/language.xsd b/data/schema/language.xsd
--- a/data/schema/language.xsd
+++ b/data/schema/language.xsd
@@ -399,10 +399,6 @@
   -->
   <xs:element name="Float">
     <xs:complexType>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="AnyChar"/>
-        <xs:element ref="StringDetect"/>
-      </xs:choice>
       <xs:attributeGroup ref="commonAttributes"/>
     </xs:complexType>
   </xs:element>
@@ -453,10 +449,6 @@
   -->
   <xs:element name="Int">
     <xs:complexType>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="AnyChar"/>
-        <xs:element ref="StringDetect"/>
-      </xs:choice>
       <xs:attributeGroup ref="commonAttributes"/>
     </xs:complexType>
   </xs:element>
diff --git a/data/syntax/actionscript.xml b/data/syntax/actionscript.xml
--- a/data/syntax/actionscript.xml
+++ b/data/syntax/actionscript.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="ActionScript 2.0" version="2" kateversion="5.0" section="Sources" extensions="*.as" mimetype="text/x-actionscript" license="LGPL" author="Aaron Miller (armantic101@gmail.com)">
+<language name="ActionScript 2.0" version="3" kateversion="5.0" section="Sources" extensions="*.as" mimetype="text/x-actionscript" license="LGPL" author="Aaron Miller (armantic101@gmail.com)">
   <highlighting>
     
     <list name="properties">
@@ -253,21 +253,10 @@
         <keyword attribute="Keyword" context="#stay" String="keywords"/>
         <keyword attribute="Constants" context="#stay" String="const"/>
         <keyword attribute="Data Type" context="#stay" String="types"/>
-        <Float attribute="Float" context="#stay">
-          <AnyChar String="fF" attribute="Float" context="#stay"/>
-        </Float>
+        <Float attribute="Float" context="Float Suffixes"/>
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
-        <Int attribute="Decimal" context="#stay">
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-        </Int>
+        <Int attribute="Decimal" context="Int Suffixes"/>
         <HlCChar attribute="Char" context="#stay"/>
         <RegExpr attribute="Decimal" context="#stay" String="//\s*BEGIN.*$" beginRegion="Region1"/>
         <RegExpr attribute="Decimal" context="#stay" String="//\s*END.*$" endRegion="Region1"/>
@@ -283,6 +272,19 @@
         <RegExpr attribute="Symbol" context="Member" String="[.]{1,1}" /> 
         <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]|~^&#59;"/>
       </context>
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <AnyChar String="fF" attribute="Float" context="#pop"/>
+      </context>
+      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+      </context>
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue attribute="String" context="#stay"/>
         <HlCStringChar attribute="String Char" context="#stay"/>
@@ -331,4 +333,4 @@
     </comments>
     <keywords casesensitive="1"/>
   </general>
-</language>
\ No newline at end of file
+</language>
diff --git a/data/syntax/ahk.xml b/data/syntax/ahk.xml
--- a/data/syntax/ahk.xml
+++ b/data/syntax/ahk.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <language name="AutoHotKey" section="Scripts"
-          version="2" kateversion="5.0"
+          version="3" kateversion="5.0"
           indenter="cstyle"
           extensions="*.ahk;*.iahk"
           priority="9">
@@ -1007,29 +1007,33 @@
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
         <DetectIdentifier />
-        <Float attribute="Float" context="#stay">
-          <AnyChar String="fF" attribute="Float" context="#stay"/>
-        </Float>
+        <Float attribute="Float" context="Float Suffixes"/>
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
-        <Int attribute="Decimal" context="#stay">
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-        </Int>
+        <Int attribute="Decimal" context="Int Suffixes"/>
         <IncludeRules context="##Doxygen" />
         <DetectChar attribute="Comment" context="Commentar 1" char=";"/>
         <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
         <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
         <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
         <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]{|}~^&#59;"/>
       </context>
 
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <AnyChar String="fF" attribute="Float" context="#pop"/>
+      </context>
+
+      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+      </context>
+
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue attribute="String" context="#stay"/>
         <HlCStringChar attribute="String Char" context="#stay"/>
diff --git a/data/syntax/ample.xml b/data/syntax/ample.xml
--- a/data/syntax/ample.xml
+++ b/data/syntax/ample.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="AMPLE" version="6" kateversion="5.2" section="Scripts" extensions="*.ample;*.menu;*.startup" mimetype="text/x-amplesrc" priority="5" author="Christian Parg (cparg@gmx.de)" license="Apache &amp; LGPL" >
+<language name="AMPLE" version="7" kateversion="5.2" section="Scripts" extensions="*.ample;*.menu;*.startup" mimetype="text/x-amplesrc" priority="5" author="Christian Parg (cparg@gmx.de)" license="Apache &amp; LGPL" >
 <!--
 #################################################################################################
 ## AMPLE Highlight file by Christian Parg (cparg_(at)_gmx_de)
@@ -3112,36 +3112,39 @@
         <DetectIdentifier />
         <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
         <DetectChar attribute="Symbol" context="#stay" char="}"   endRegion="Brace1" />
-        <Float attribute="Float" context="#stay">
-          <StringDetect attribute="Decimal" context="#stay" String="meg" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="f" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="p" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="n" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="u" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="m" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="k" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="g" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="t" insensitive="true"/>
-        </Float>
-
-        <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="meg" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="f" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="p" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="n" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="u" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="m" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="k" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="g" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="t" insensitive="true"/>
-        </Int>
+        <Float attribute="Float" context="Float Suffixes"/>
+        <Int attribute="Decimal" context="Int Suffixes"/>
         <HlCChar      attribute="Char"    context="#stay"/>
         <DetectChar   attribute="String"  context="String" char="&quot;"/>
         <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
         <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
         <AnyChar      attribute="Symbol"  context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]|~^&#59;"/>
       </context>
 
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="Float" context="#pop" String="meg" insensitive="true"/>
+          <StringDetect attribute="Float" context="#pop" String="f" insensitive="true"/>
+          <StringDetect attribute="Float" context="#pop" String="p" insensitive="true"/>
+          <StringDetect attribute="Float" context="#pop" String="n" insensitive="true"/>
+          <StringDetect attribute="Float" context="#pop" String="u" insensitive="true"/>
+          <StringDetect attribute="Float" context="#pop" String="m" insensitive="true"/>
+          <StringDetect attribute="Float" context="#pop" String="k" insensitive="true"/>
+          <StringDetect attribute="Float" context="#pop" String="g" insensitive="true"/>
+          <StringDetect attribute="Float" context="#pop" String="t" insensitive="true"/>
+      </context>
+
+      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="Decimal" context="#pop" String="meg" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="f" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="p" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="n" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="u" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="m" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="k" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="g" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="t" insensitive="true"/>
+      </context>
+
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue  attribute="String"      context="#stay"/>
         <HlCStringChar attribute="String Char" context="#stay"/>
diff --git a/data/syntax/ansic89.xml b/data/syntax/ansic89.xml
--- a/data/syntax/ansic89.xml
+++ b/data/syntax/ansic89.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <language name="ANSI C89" section="Sources"
-          version="4" kateversion="5.0"
+          version="5" kateversion="5.0"
           indenter="cstyle"
           extensions="*.c;*.C;*.h"
           mimetype="text/x-csrc;text/x-c++src;text/x-chdr"
@@ -47,33 +47,35 @@
     <contexts>
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
         <DetectSpaces />
-	<RegExpr attribute="Preprocessor" context="Outscoped" String="#\s*if\s+0" beginRegion="Outscoped" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="Outscoped" String="#\s*if\s+0" beginRegion="Outscoped" firstNonSpace="true" />
         <DetectChar attribute="Preprocessor" context="Preprocessor" char="#" firstNonSpace="true" />
         <keyword attribute="Keyword" context="#stay" String="keywords"/>
         <keyword attribute="Data Type" context="#stay" String="types"/>
         <DetectIdentifier />
         <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
         <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
-        <Float attribute="Float" context="#stay">
-          <AnyChar String="fF" attribute="Float" context="#stay"/>
-        </Float>
+        <Float attribute="Float" context="Float Suffixes"/>
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
-        <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-        </Int>
+        <Int attribute="Decimal" context="Int Suffixes"/>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
         <Detect2Chars attribute="Comment" context="comment" char="/" char1="*" beginRegion="blockcomment"/>
         <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]|~^&#59;"/>
       </context>
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <AnyChar String="fF" attribute="Float" context="#pop"/>
+      </context>
+      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+      </context>
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue attribute="String" context="#stay"/>
         <HlCStringChar attribute="String Char" context="#stay"/>
diff --git a/data/syntax/ansys.xml b/data/syntax/ansys.xml
--- a/data/syntax/ansys.xml
+++ b/data/syntax/ansys.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Ansys" version="5" kateversion="5.0" section="Scientific" extensions="*.ans" author="Giovanni Bacci (giovanni@castellodilari.it)" license="LGPL" >
+<language name="Ansys" version="6" kateversion="5.0" section="Scientific" extensions="*.ans" author="Giovanni Bacci (giovanni@castellodilari.it)" license="LGPL" >
 <highlighting>
 	<list name="session_cmds">
 		<item>/BATCH</item>
@@ -2002,10 +2002,11 @@
 			<RangeDetect attribute="variable" context="#stay" char="%" char1="%" />
 			<keyword attribute="MatProp" context="#stay" String="APDL_commands" />
 			<Float attribute="NumFloat" context="#stay" />
-			<Int attribute="NumInt" context="#stay" >
-				<StringDetect attribute="NumInt" context="#stay" String="**" />
-			</Int>
+			<Int attribute="NumInt" context="Int Suffixes" />
 		</context>
+      <context name="Int Suffixes" attribute="NumInt" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="NumInt" context="#pop" String="**" />
+      </context>
 		<context attribute="String" name="doublequotestring" lineEndContext="#stay" >
 			<DetectChar attribute="String" context="#pop" char="&quot;" />
 		</context>
diff --git a/data/syntax/c.xml b/data/syntax/c.xml
--- a/data/syntax/c.xml
+++ b/data/syntax/c.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <language name="C" section="Sources"
-          version="4" kateversion="5.0"
+          version="5" kateversion="5.0"
           indenter="cstyle"
           extensions="*.c;*.C;*.h"
           mimetype="text/x-csrc;text/x-c++src;text/x-chdr"
@@ -119,30 +119,34 @@
         <DetectIdentifier />
         <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
         <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
-        <Float attribute="Float" context="#stay">
-          <AnyChar String="fF" attribute="Float" context="#stay"/>
-        </Float>
+        <Float attribute="Float" context="Float Suffixes"/>
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
         <RegExpr attribute="Binary" context="#stay" String="0b[01]+[ul]{0,3}" insensitive="true" />
-        <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-        </Int>
+        <Int attribute="Decimal" context="Int Suffixes"/>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
         <IncludeRules context="##Doxygen" />
         <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
         <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
         <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]|~^&#59;"/>
       </context>
 
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <AnyChar String="fF" attribute="Float" context="#pop"/>
+      </context>
+
+      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+      </context>
+
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue attribute="String" context="#stay"/>
         <HlCStringChar attribute="String Char" context="#stay"/>
diff --git a/data/syntax/cgis.xml b/data/syntax/cgis.xml
--- a/data/syntax/cgis.xml
+++ b/data/syntax/cgis.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="CGiS" version="4" kateversion="5.0" section="Sources" extensions="*.cgis" mimetype="">
+<language name="CGiS" version="5" kateversion="5.0" section="Sources" extensions="*.cgis" mimetype="">
   <highlighting>
     <list name="keywords">
       <item>1D</item>
@@ -82,17 +82,19 @@
         <DetectIdentifier />
         <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
         <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
-        <Float attribute="Float" context="#stay">
-          <AnyChar String="fF" attribute="Float" context="#stay"/>
-        </Float>
+        <Float attribute="Float" context="Float Suffixes"/>
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
         <Int attribute="Decimal" context="#stay"/>
         <IncludeRules context="##Doxygen" />
         <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
         <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
       </context>
 
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <AnyChar String="fF" attribute="Float" context="#pop"/>
+      </context>
+
       <context attribute="Hint" lineEndContext="#stay" name="Hint">
         <DetectSpaces />
         <DetectChar attribute="Hint" context="#pop" char=")" />
diff --git a/data/syntax/clojure.xml b/data/syntax/clojure.xml
--- a/data/syntax/clojure.xml
+++ b/data/syntax/clojure.xml
@@ -22,7 +22,7 @@
  * Boston, MA  02110-1301, USA.                                       *
  **********************************************************************
  -->
-<language version="9" kateversion="5.0" name="Clojure" section="Sources" extensions="*.clj;*.cljs;*.cljc" mimetype="" author="Dominik Haumann [lisp] modified for clojure by Caspar Hasenclever" license="LGPLv2+">
+<language version="10" kateversion="5.0" name="Clojure" section="Sources" extensions="*.clj;*.cljs;*.cljc" mimetype="" author="Dominik Haumann [lisp] modified for clojure by Caspar Hasenclever" license="LGPLv2+">
   <highlighting>
     <list name="definitions">
       <item>def</item>
@@ -736,14 +736,16 @@
         <RegExpr attribute="BaseN" context="#stay" String="0[xX][0-9A-Fa-f]+"/>
         <RegExpr attribute="BaseN" context="#stay" String="([12]?[0-9]|3[0-6])[rR][0-9a-zA-Z]+"/>
         <RegExpr attribute="Error" context="#stay" String="(3[7-9]|[0-9]*[4-9][0-9]+)[rR][0-9a-zA-Z]+"/>
-        <Float attribute="Float" context="#stay">
-            <StringDetect attribute="Decimal" context="#stay" String="M" insensitive="false"/>
-        </Float>
-        <Int attribute="Decimal" context="#stay">
-            <StringDetect attribute="Decimal" context="#stay" String="N" insensitive="false"/>
-        </Int>
+        <Float attribute="Float" context="Float Suffixes"/>
+        <Int attribute="Decimal" context="Int Suffixes"/>
         <DetectChar attribute="Brackets1" context="Level1" char="("/>
       </context>
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+            <StringDetect attribute="Float" context="#pop" String="M" insensitive="false"/>
+      </context>
+      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+            <StringDetect attribute="Decimal" context="#pop" String="N" insensitive="false"/>
+      </context>
       <context name="Comment" attribute="Comment" lineEndContext="#pop">
         <RegExpr String="(FIXME|TODO):?" attribute="Alert" context="#stay"/>
       </context>
diff --git a/data/syntax/crk.xml b/data/syntax/crk.xml
--- a/data/syntax/crk.xml
+++ b/data/syntax/crk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Crack" version="3" kateversion="5.0" section="Sources" extensions="*.crk" mimetype="">
+<language name="Crack" version="4" kateversion="5.0" section="Sources" extensions="*.crk" mimetype="">
   <highlighting>
     <list name="keywords">
       <item>break</item>
@@ -45,21 +45,10 @@
         <keyword attribute="Keyword" context="#stay" String="keywords"/>
         <StringDetect attribute="Keyword" context="Package" String="import" />
         <keyword attribute="Data Type" context="#stay" String="types" />
-        <Float attribute="Float" context="#stay">
-          <AnyChar String="fF" attribute="Float" context="#stay"/>
-        </Float>
+        <Float attribute="Float" context="Float Suffixes"/>
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
-        <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-        </Int>
+        <Int attribute="Decimal" context="Int Suffixes"/>
         <DetectChar attribute="String" context="Single quoted String" char="'"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
         <DetectChar attribute="String" context="Backtick String" char="`"/>
@@ -76,6 +65,21 @@
         <RegExpr attribute="Annotation" context="#stay" String="@\w+" />
       </context>
 
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <AnyChar String="fF" attribute="Float" context="#pop"/>
+      </context>
+
+      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+      </context>
+
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue attribute="String" context="#pop"/>
         <HlCStringChar attribute="Char" context="#stay"/>
diff --git a/data/syntax/cs.xml b/data/syntax/cs.xml
--- a/data/syntax/cs.xml
+++ b/data/syntax/cs.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="C#" version="4" kateversion="5.0" section="Sources" extensions="*.cs" mimetype="text/x-csharp-src;text/x-csharp-hde" indenter="cstyle" style="C++">
+<language name="C#" version="5" kateversion="5.0" section="Sources" extensions="*.cs" mimetype="text/x-csharp-src;text/x-csharp-hde" indenter="cstyle" style="C++">
   <highlighting>
     <list name="keywords">
       <item>abstract</item>
@@ -94,21 +94,10 @@
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
         <keyword attribute="Keyword" context="#stay" String="keywords"/>
         <keyword attribute="Data Type" context="#stay" String="types" />
-        <Float attribute="Float" context="#stay">
-          <AnyChar String="fF" attribute="Float" context="#stay"/>
-        </Float>
+        <Float attribute="Float" context="Float Suffixes"/>
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
-        <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-        </Int>
+        <Int attribute="Decimal" context="Int Suffixes"/>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
         <IncludeRules context="##Doxygen" />
@@ -127,6 +116,19 @@
         <RegExpr attribute="Symbol" context="Member" String="[.]{1,1}" />
         <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]|~^&#59;"/>
       </context>
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <AnyChar String="fF" attribute="Float" context="#pop"/>
+      </context>
+      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+      </context>
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue attribute="String" context="#pop"/>
         <HlCStringChar attribute="String Char" context="#stay"/>
diff --git a/data/syntax/ferite.xml b/data/syntax/ferite.xml
--- a/data/syntax/ferite.xml
+++ b/data/syntax/ferite.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="ferite" version="3" kateversion="5.0" section="Scripts" extensions="*.fe;*.feh" mimetype="text/x-ferite-src">
+<language name="ferite" version="4" kateversion="5.0" section="Scripts" extensions="*.fe;*.feh" mimetype="text/x-ferite-src">
   <highlighting>
     <list name="keywords">
       <item>break</item>
@@ -37,29 +37,31 @@
       <context attribute="Normal Text" lineEndContext="#stay" name="Default" >
         <keyword attribute="Keyword" context="#stay" String="keywords"/>
         <keyword attribute="Data Type" context="#stay" String="types"/>
-        <Float attribute="Float" context="#stay">
-          <AnyChar String="fF" attribute="Float" context="#stay"/>
-        </Float>
+        <Float attribute="Float" context="Float Suffixes"/>
         <HlCOct attribute="Octal" context="#stay" />
         <HlCHex attribute="Hex" context="#stay" />
-        <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-        </Int>
+        <Int attribute="Decimal" context="Int Suffixes"/>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
         <Detect2Chars attribute="Comment" context="Comment" char="/" char1="/"/>
         <Detect2Chars attribute="Comment" context="Multiline Comment" char="/" char1="*"/>
         <AnyChar attribute="Symbol" context="#stay" String="!%&amp;()+,-&lt;=&gt;?[]^{|}~"/>
         <StringDetect attribute="Comment" context="Undeffed" String="#if 0" insensitive="false"/>
         <DetectChar attribute="Preprocessor" context="Preprocessor" char="#" column="0"/>
       </context>
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <AnyChar String="fF" attribute="Float" context="#pop"/>
+      </context>
+      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+      </context>
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue attribute="String" context="#stay"/>
         <HlCStringChar attribute="String Char" context="#stay"/>
diff --git a/data/syntax/fgl-4gl.xml b/data/syntax/fgl-4gl.xml
--- a/data/syntax/fgl-4gl.xml
+++ b/data/syntax/fgl-4gl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="4GL" version="3" kateversion="5.0" section="Database" extensions="*.4gl;*.4GL;*.err" mimetype="text/x-4glsrc;text/x-4glerr" author="Andrej Falout (andrej@falout.org)" license="LGPL">
+<language name="4GL" version="4" kateversion="5.0" section="Database" extensions="*.4gl;*.4GL;*.err" mimetype="text/x-4glsrc;text/x-4glerr" author="Andrej Falout (andrej@falout.org)" license="LGPL">
   <highlighting>
     <list name="keywords">
       <item>at</item>
@@ -268,21 +268,10 @@
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal Text 1">
         <keyword attribute="Keyword" context="#stay" String="keywords"/>
         <keyword attribute="Data Type" context="#stay" String="types"/>
-        <Float attribute="Float" context="#stay">
-          <AnyChar String="fF" attribute="Float" context="#stay"/>
-        </Float>
+        <Float attribute="Float" context="Float Suffixes"/>
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
-        <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-        </Int>
+        <Int attribute="Decimal" context="Int Suffixes"/>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
         <DetectChar attribute="Comment" context="Comment 1" char="#"/>
@@ -294,6 +283,19 @@
          <StringDetect attribute="Preprocessor" context="Comment 4" String="#if 0" insensitive="false"/>
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="#"/>
       </context>
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <AnyChar String="fF" attribute="Float" context="#pop"/>
+      </context>
+      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+      </context>
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue attribute="String" context="#stay"/>
         <HlCStringChar attribute="String Char" context="#stay"/>
diff --git a/data/syntax/fgl-per.xml b/data/syntax/fgl-per.xml
--- a/data/syntax/fgl-per.xml
+++ b/data/syntax/fgl-per.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="4GL-PER" version="3" kateversion="5.0" section="Database" extensions="*.per;*.PER;*.per.err" mimetype="text/x-4glper;text/x-4glpererr" author="Andrej Falout (andrej@falout.org)" license="LGPL">
+<language name="4GL-PER" version="4" kateversion="5.0" section="Database" extensions="*.per;*.PER;*.per.err" mimetype="text/x-4glper;text/x-4glpererr" author="Andrej Falout (andrej@falout.org)" license="LGPL">
   <highlighting>
     <list name="keywords">
       <item>by</item>
@@ -81,21 +81,10 @@
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal Text 1">
         <keyword attribute="Keyword" context="#stay" String="keywords"/>
         <keyword attribute="Data Type" context="#stay" String="types"/>
-        <Float attribute="Float" context="#stay">
-          <AnyChar String="fF" attribute="Float" context="#stay"/>
-        </Float>
+        <Float attribute="Float" context="Float Suffixes"/>
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
-        <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-        </Int>
+        <Int attribute="Decimal" context="Int Suffixes"/>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
         <DetectChar attribute="Comment" context="Comment 1" char="#"/>
@@ -106,6 +95,19 @@
          <StringDetect attribute="Preprocessor" context="Comment 4" String="#if 0" insensitive="false"/>
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="#"/>
       </context>
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <AnyChar String="fF" attribute="Float" context="#pop"/>
+      </context>
+      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+      </context>
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue attribute="String" context="#stay"/>
         <HlCStringChar attribute="String Char" context="#stay"/>
diff --git a/data/syntax/groovy.xml b/data/syntax/groovy.xml
--- a/data/syntax/groovy.xml
+++ b/data/syntax/groovy.xml
@@ -3,7 +3,7 @@
 <!--
     Based on the java syntax file 1.19 by Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)
 -->
-<language name="Groovy" version="4" kateversion="5.0" section="Sources" extensions="*.groovy;*.gradle" license="LGPL" author="Chris Reeves (chris@ev-soft.net)">
+<language name="Groovy" version="5" kateversion="5.0" section="Sources" extensions="*.groovy;*.gradle" license="LGPL" author="Chris Reeves (chris@ev-soft.net)">
 	<highlighting>
 		<list name="java15">
 			<item>ACTIVE</item>
@@ -3769,21 +3769,10 @@
 				<keyword attribute="Keyword" context="#stay" String="keywords"/>
 				<keyword attribute="Data Type" context="#stay" String="types"/>
 				<keyword attribute="Java15" context="#stay" String="java15"/>
-				<Float attribute="Float" context="#stay">
-					<AnyChar String="fF" attribute="Float" context="#stay"/>
-				</Float>
+				<Float attribute="Float" context="Float Suffixes"/>
 				<HlCOct attribute="Octal" context="#stay"/>
 				<HlCHex attribute="Hex" context="#stay"/>
-				<Int attribute="Decimal" context="#stay">
-					<StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
-					<StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
-					<StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
-					<StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
-					<StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
-					<StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
-					<StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
-					<StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-				</Int>
+				<Int attribute="Decimal" context="Int Suffixes"/>
 				<HlCChar attribute="Char" context="#stay"/>
 				<RegExpr attribute="Char" context="#stay" String="'\\u[0-9a-fA-F]{4}'"/>
 				<RegExpr attribute="Decimal" context="#stay" String="//\s*BEGIN.*$" beginRegion="Region1"/>
@@ -3805,6 +3794,19 @@
 				<DetectChar attribute="Symbol" context="InFunctionCall" char="("/>
 				<AnyChar attribute="Symbol" context="#stay" String=":!%&amp;+,-/.*&lt;=&gt;?[]|~^&#59;"/>
 			</context>
+            <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+                <AnyChar String="fF" attribute="Float" context="#pop"/>
+            </context>
+            <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+                <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
+                <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
+                <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
+                <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
+                <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
+                <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
+                <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
+                <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+            </context>
 			<context attribute="Normal Text" lineEndContext="#stay" name="InFunctionCall">
 				<IncludeRules context="Normal"/>
 				<DetectChar attribute="Symbol" context="#pop" char=")"/>
diff --git a/data/syntax/ilerpg.xml b/data/syntax/ilerpg.xml
--- a/data/syntax/ilerpg.xml
+++ b/data/syntax/ilerpg.xml
@@ -45,7 +45,7 @@
 
 -->
 
-<language name="ILERPG" version="7" kateversion="2.2" section="Sources" extensions="QRPG*.*;qrpg*.*" mimetype="text/x-ilerpg-src" casesensitive="0" license="GPLv2+" author="Nick Roux (nick@sundown.homeip.net)">
+<language name="ILERPG" version="8" kateversion="2.2" section="Sources" extensions="QRPG*.*;qrpg*.*" mimetype="text/x-ilerpg-src" casesensitive="0" license="GPLv2+" author="Nick Roux (nick@sundown.homeip.net)">
     <highlighting>
     <list name="dkeywords">
 	    <item>EXTPROC</item>
@@ -580,16 +580,18 @@
 	      <DetectChar attribute="ConstantChar" context="StringConstants" char="'"/>
 	      <Float attribute="Float" context="#stay"/>
 	      <RegExpr attribute="Hex" context="#stay" String="[Xx]'[0-9a-fA-F]{2,}'"/>
-	      <Int attribute="Decimal" context="#stay">
-		      <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
-		      <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
-		      <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
-		      <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
-		      <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
-		      <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
-		      <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
-		      <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-	      </Int>
+	      <Int attribute="Decimal" context="Int Suffixes"/>
+      </context>
+
+      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
       </context>
       
       <!-- Reserved words - Use as include -->
diff --git a/data/syntax/jsp.xml b/data/syntax/jsp.xml
--- a/data/syntax/jsp.xml
+++ b/data/syntax/jsp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language version="3" kateversion="2.4" name="JSP" section="Markup" extensions="*.jsp;*.JSP" mimetype="text/html" casesensitive="false" author="Rob Martin (rob@gamepimp.com)" license="LGPL">
+<language version="4" kateversion="2.4" name="JSP" section="Markup" extensions="*.jsp;*.JSP" mimetype="text/html" casesensitive="false" author="Rob Martin (rob@gamepimp.com)" license="LGPL">
   <highlighting>
 
     <list name="java-1.4.2-classes">
@@ -2912,21 +2912,10 @@
         <keyword String="jsp-reserved-words" attribute="Keyword" context="#stay"/>
         <keyword String="java-1.4.2-types" attribute="Types" context="#stay"/>
         <keyword String="java-1.4.2-classes" attribute="Java 1.4.2 Classes" context="#stay"/>
-        <Float attribute="Float" context="#stay">
-          <AnyChar String="fF" attribute="Float" context="#stay"/>
-        </Float>
+        <Float attribute="Float" context="Float Suffixes"/>
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
-        <Int attribute="Decimal" context="#stay">
-          <StringDetect String="ULL" attribute="Decimal" context="#stay" insensitive="true"/>
-          <StringDetect String="LUL" attribute="Decimal" context="#stay" insensitive="true"/>
-          <StringDetect String="LLU" attribute="Decimal" context="#stay" insensitive="true"/>
-          <StringDetect String="UL" attribute="Decimal" context="#stay" insensitive="true"/>
-          <StringDetect String="LU" attribute="Decimal" context="#stay" insensitive="true"/>
-          <StringDetect String="LL" attribute="Decimal" context="#stay" insensitive="true"/>
-          <StringDetect String="U" attribute="Decimal" context="#stay" insensitive="true"/>
-          <StringDetect String="L" attribute="Decimal" context="#stay" insensitive="true"/>
-        </Int>
+        <Int attribute="Decimal" context="Int Suffixes"/>
         <HlCChar attribute="Char" context="#stay"/>
         <RegExpr String="//\s*BEGIN.*$" attribute="Decimal" context="#stay" beginRegion="Region1" firstNonSpace="true"/>
         <RegExpr String="//\s*END.*$" attribute="Decimal" context="#stay" endRegion="Region1" firstNonSpace="true"/>
@@ -2938,28 +2927,32 @@
         <Detect2Chars char="/" char1="*" attribute="Java Comment" context="Java Multi-Line Comment"/>
       </context>
 
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <AnyChar String="fF" attribute="Float" context="#pop"/>
+      </context>
+
+      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+      </context>
+
       <context name="Jsp Expression" attribute="Normal Text" lineEndContext="#stay">
         <StringDetect String="'${'" attribute="Normal Text" context="#stay"/>
         <DetectChar char="}" attribute="Jsp Scriptlet" context="#pop"/>
         <keyword String="java-1.4.2-keywords" attribute="Keyword" context="#stay"/>
         <keyword String="jsp-reserved-words" attribute="Keyword" context="#stay"/>
         <keyword String="java-1.4.2-types" attribute="Types" context="#stay"/>
         <keyword String="java-1.4.2-classes" attribute="Java 1.4.2 Classes" context="#stay"/>
-        <Float attribute="Float" context="#stay">
-          <AnyChar String="fF" attribute="Float" context="#stay"/>
-        </Float>
+        <Float attribute="Float" context="Float Suffixes"/>
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
-        <Int attribute="Decimal" context="#stay">
-          <StringDetect String="ULL" attribute="Decimal" context="#stay" insensitive="true"/>
-          <StringDetect String="LUL" attribute="Decimal" context="#stay" insensitive="true"/>
-          <StringDetect String="LLU" attribute="Decimal" context="#stay" insensitive="true"/>
-          <StringDetect String="UL" attribute="Decimal" context="#stay" insensitive="true"/>
-          <StringDetect String="LU" attribute="Decimal" context="#stay" insensitive="true"/>
-          <StringDetect String="LL" attribute="Decimal" context="#stay" insensitive="true"/>
-          <StringDetect String="U" attribute="Decimal" context="#stay" insensitive="true"/>
-          <StringDetect String="L" attribute="Decimal" context="#stay" insensitive="true"/>
-        </Int>
+        <Int attribute="Decimal" context="Int Suffixes"/>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar char="&quot;" attribute="String" context="Java String"/>
         <AnyChar String="!%&amp;()+,-&lt;=&gt;?[]^{|}~" attribute="Symbol" context="#stay"/>
diff --git a/data/syntax/kotlin.xml b/data/syntax/kotlin.xml
--- a/data/syntax/kotlin.xml
+++ b/data/syntax/kotlin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- kotlin language syntax http://kotlinlang.org -->
-<language name="Kotlin" version="4" kateversion="5.0" section="Sources" extensions="*.kt;*.kts" license="LGPLv2+" author="Sergey Mashkov (sergey.mashkov@jetbrains.com)" style="cstyle" indenter="cstyle">
+<language name="Kotlin" version="5" kateversion="5.0" section="Sources" extensions="*.kt;*.kts" license="LGPLv2+" author="Sergey Mashkov (sergey.mashkov@jetbrains.com)" style="cstyle" indenter="cstyle">
     <highlighting>
         <list name="keywords">
             <item>package</item>
@@ -114,20 +114,24 @@
                 <Detect2Chars attribute="Comment" context="CommentSingleLine" char="/" char1="/"/>
                 <Detect2Chars attribute="Comment" context="CommentMultiline" char="/" char1="*" beginRegion="Comment"/>
 
-                <Float attribute="Float" context="#stay">
-                    <AnyChar String="fF" attribute="Float" context="#stay"/>
-                </Float>
-                <Int attribute="Decimal" context="#stay">
-                    <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-                </Int>
+                <Float attribute="Float" context="Float Suffixes"/>
+                <Int attribute="Decimal" context="Int Suffixes"/>
 
                 <RegExpr attribute="Annotation" context="#stay" String="@[_\w][_\w\d]*"/>
                 <RegExpr attribute="TODO" context="#stay" String="TODO\s*\([^)]*\)" />
                 <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
                 <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
                 <Detect2Chars attribute="Comment" context="CommentSingleLine" char="#" char1="!" />
             </context>
 
+            <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+                <AnyChar String="fF" attribute="Float" context="#pop"/>
+            </context>
+
+            <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+                <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+            </context>
+
             <context attribute="Normal Text" lineEndContext="#pop" name="Imports">
                 <DetectChar attribute="Symbol" context="#pop" char=";" />
                 <StringDetect attribute="Keyword" context="TypeName" String="as" />
diff --git a/data/syntax/ld.xml b/data/syntax/ld.xml
--- a/data/syntax/ld.xml
+++ b/data/syntax/ld.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- GNU LD Linker Script syntax highlighter -->
-<language name="GNU Linker Script" section="Scripts" extensions="*.ld" version="2" kateversion="2.4" author="Lyle Putnam (lcputnam@gmail.com)" license="">
+<language name="GNU Linker Script" section="Scripts" extensions="*.ld" version="3" kateversion="2.4" author="Lyle Putnam (lcputnam@gmail.com)" license="">
     <highlighting>
         <list name="keywords">
             <item>AT</item>
@@ -42,19 +42,20 @@
                 <HlCOct attribute="Number" context="#stay" />
                 <HlCHex attribute="Number" context="#stay" />
                 <!-- Base 10 Integers may be suffixed with K, M or G to indicate size -->
-                <Int attribute="Number" context="#stay">
-                    <StringDetect attribute="Number" context="#stay" String="K" insensitive="true" />
-                    <StringDetect attribute="Number" context="#stay" String="M" insensitive="true" />
-                    <StringDetect attribute="Number" context="#stay" String="G" insensitive="true" />
-                </Int>
+                <Int attribute="Number" context="Int Suffixes"/>
                 <RegExpr attribute="Section Name" context="#stay" String="\.[\-_0-9a-zA-Z]+" />
                 <!-- "COMMON" and "/DISCARD/" are special section targets -->
                 <RegExpr attribute="Section Name" context="#stay" String="(COMMON|\/DISCARD\/)" />
                 <DetectChar attribute="Normal Text" context="#stay" char="{" beginRegion="Block" />
                 <DetectChar attribute="Normal Text" context="#stay" char="}" endRegion="Block" />
                 <Detect2Chars attribute="Comment" context="comment" char="/" char1="*" beginRegion="Comment" />
                 <DetectChar attribute="String" context="string" char="&quot;" />
             </context>
+            <context name="Int Suffixes" attribute="Number" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+                    <StringDetect attribute="Number" context="#pop" String="K" insensitive="true" />
+                    <StringDetect attribute="Number" context="#pop" String="M" insensitive="true" />
+                    <StringDetect attribute="Number" context="#pop" String="G" insensitive="true" />
+            </context>
             <context name="comment" attribute="Comment" lineEndContext="#stay">
                 <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment" />
             </context>
diff --git a/data/syntax/lpc.xml b/data/syntax/lpc.xml
--- a/data/syntax/lpc.xml
+++ b/data/syntax/lpc.xml
@@ -16,7 +16,7 @@
 -->
 
 
-<language name="LPC" version="1" kateversion="2.4" section="Sources" extensions="*.c;*.h;*.inc;*.o" author="Andreas Klauer (Andreas.Klauer@metamorpher.de)" license="Artistic" >
+<language name="LPC" version="2" kateversion="2.4" section="Sources" extensions="*.c;*.h;*.inc;*.o" author="Andreas Klauer (Andreas.Klauer@metamorpher.de)" license="Artistic" >
 
   <highlighting>
 
@@ -84,9 +84,7 @@
         <keyword String="types" attribute="Datatype" context="#stay" />
         <keyword String="keywords" attribute="Keywords" context="#stay" />
         <DetectChar char="#" context="Preprocessor" attribute="Preprocessor" column="0"/>
-        <Float attribute="Floats" context="#stay">
-          <AnyChar String="fFeE" context="#stay" />
-        </Float>
+        <Float attribute="Floats" context="Float Suffixes"/>
         <RegExpr String="0b[01]+" attribute="Binary" context="#stay" />
         <RegExpr String="0x[0-9a-fA-F]+" attribute="Hexadecimal" context="#stay" />
         <RegExpr String="0o[0-7]+" attribute="Octal" context="#stay" />
@@ -97,6 +95,9 @@
         <DetectChar attribute="Default" context="#stay" char="{" beginRegion="brace" />
         <DetectChar attribute="Default" context="#stay" char="}" endRegion="brace" />
       </context>
+      <context name="Float Suffixes" attribute="Floats" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <AnyChar String="fFeE" attribute="Floats" context="#pop"/>
+      </context>
       <context name="Comment1" attribute="Single-Line comments" lineEndContext="#pop">
         <LineContinue attribute="Single-Line comments" context="#stay" />
         <keyword attribute="Alert" context="#stay" String="attention" />
diff --git a/data/syntax/nesc.xml b/data/syntax/nesc.xml
--- a/data/syntax/nesc.xml
+++ b/data/syntax/nesc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="nesC" author="Shakthi Kannan" license="GPLv2" version="3" kateversion="2.3" section="Sources" extensions="*.nc" mimetype="text/x-ncsrc" priority="5">
+<language name="nesC" author="Shakthi Kannan" license="GPLv2" version="4" kateversion="2.3" section="Sources" extensions="*.nc" mimetype="text/x-ncsrc" priority="5">
   <highlighting>
     <list name="keywords">
       <item>break</item>
@@ -88,21 +88,10 @@
         <keyword attribute="Data Type" context="#stay" String="types"/>
         <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1"/>
         <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1"/>
-        <Float attribute="Float" context="#stay">
-          <AnyChar String="fF" attribute="Float" context="#stay"/>
-        </Float>
+        <Float attribute="Float" context="Float Suffixes"/>
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
-        <Int attribute="Decimal" context="#stay">
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-        </Int>
+        <Int attribute="Decimal" context="Int Suffixes"/>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
         <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
@@ -113,6 +102,19 @@
         <RegExpr attribute="Symbol" context="Member" String="[.]{1,1}"/>
         <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]|~^;"/>
       </context>
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <AnyChar String="fF" attribute="Float" context="#pop"/>
+      </context>
+      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+      </context>
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue attribute="String" context="#stay"/>
         <HlCStringChar attribute="String Char" context="#stay"/>
diff --git a/data/syntax/objectivec.xml b/data/syntax/objectivec.xml
--- a/data/syntax/objectivec.xml
+++ b/data/syntax/objectivec.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="*.m;*.h" mimetype="text/x-objc-src;text/x-c-hdr">
+<language name="Objective-C" version="3" kateversion="5.0" section="Sources" extensions="*.m;*.h" mimetype="text/x-objc-src;text/x-c-hdr">
   <highlighting>
     <list name="keywords">
       <item>break</item>
@@ -57,29 +57,31 @@
         <keyword attribute="Data Type" context="#stay" String="types"/>
         <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
         <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
-        <Float attribute="Float" context="#stay">
-          <AnyChar String="fF" attribute="Float" context="#stay"/>
-        </Float>
+        <Float attribute="Float" context="Float Suffixes"/>
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
-        <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-        </Int>
+        <Int attribute="Decimal" context="Int Suffixes"/>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
         <Detect2Chars attribute="Comment" context="SingleLineComment" char="/" char1="/"/>
         <Detect2Chars attribute="Comment" context="MultiLineComment" char="/" char1="*"/>
         <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]|~^&#59;"/>
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="^#"/>
         <Detect2Chars attribute="String" context="String" char="@" char1="&quot;" />
       </context>
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <AnyChar String="fF" attribute="Float" context="#pop"/>
+      </context>
+      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+      </context>
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue attribute="String" context="#stay"/>
         <HlCStringChar attribute="String Char" context="#stay"/>
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="4" 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="5" 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>
@@ -173,21 +173,10 @@
         <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
         
         <DetectIdentifier />
-        <Float attribute="Float" context="#stay">
-          <AnyChar String="fF" attribute="Float" context="#stay"/>
-        </Float>
+        <Float attribute="Float" context="Float Suffixes"/>
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
-        <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-        </Int>
+        <Int attribute="Decimal" context="Int Suffixes"/>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
         <Detect2Chars attribute="Comment" context="SingleLineComment" char="/" char1="/"/>
@@ -204,6 +193,19 @@
         <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
         <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]{|}~^&#59;"/>
       </context>
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <AnyChar String="fF" attribute="Float" context="#pop"/>
+      </context>
+      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+      </context>
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue attribute="String" context="#stay"/>
         <HlCStringChar attribute="String Char" context="#stay"/>
diff --git a/data/syntax/opencl.xml b/data/syntax/opencl.xml
--- a/data/syntax/opencl.xml
+++ b/data/syntax/opencl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <language name="OpenCL" section="Sources"
-          version="3" kateversion="3.4"
+          version="4" kateversion="3.4"
           indenter="cstyle"
           extensions="*.cl"
           mimetype="text/x-clsrc"
@@ -134,29 +134,33 @@
         <DetectIdentifier />
         <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
         <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
-        <Float attribute="Float" context="#stay">
-          <AnyChar String="fF" attribute="Float" context="#stay"/>
-        </Float>
+        <Float attribute="Float" context="Float Suffixes"/>
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
-        <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-        </Int>
+        <Int attribute="Decimal" context="Int Suffixes"/>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
         <IncludeRules context="##Doxygen" />
         <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
         <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
         <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]|~^&#59;"/>
       </context>
 
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <AnyChar String="fF" attribute="Float" context="#pop"/>
+      </context>
+
+      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+      </context>
+
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue attribute="String" context="#stay"/>
         <HlCStringChar attribute="String Char" context="#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="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">
+<language name="Pig" version="8" 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>
@@ -128,16 +128,18 @@
 				<Float attribute="Float" context="#stay" />
 				<HlCHex attribute="Hex" context="#stay"/>
 				<HlCOct attribute="Octal" context="#stay"/>
-				<Int attribute="Int" context="#stay">
-					<StringDetect attribute="Int" String="L" insensitive="true" context="#stay"/>
-				</Int>
+                <Int attribute="Int" context="Int Suffixes"/>
 				<Detect2Chars attribute="Comment" char="/" char1="*" context="Multiline comment" beginRegion="Comment"/>
 				<DetectChar attribute="String" char="'" context="Single A-string"/>
 <!--				<DetectChar attribute="String" char="&quot;" context="Single Q-string"/>-->
 				<Detect2Chars attribute="Comment" char="-" char1='-' context="Dash comment"/>
 				<IncludeRules context="Parameter variable" />
 			</context>
 
+            <context name="Int Suffixes" attribute="Int" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+					<StringDetect attribute="Int" String="L" insensitive="true" context="#pop"/>
+            </context>
+
 			<context name="Parameter variable" attribute="Normal Text" lineEndContext="#pop">
 				<DetectSpaces />
 				<RegExpr attribute="Parameter" String="[$][a-zA-Z0-9_]+" context="#stay" />
diff --git a/data/syntax/protobuf.xml b/data/syntax/protobuf.xml
--- a/data/syntax/protobuf.xml
+++ b/data/syntax/protobuf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Protobuf" version="6" kateversion="5.0" section="Sources" extensions="*.proto" mimetype="text/x-protobuf" author="Slawomir Mikula (slawek.mikula@gmail.com)" license="LGPL">
+<language name="Protobuf" version="7" kateversion="5.0" section="Sources" extensions="*.proto" mimetype="text/x-protobuf" author="Slawomir Mikula (slawek.mikula@gmail.com)" license="LGPL">
   <highlighting>
     <list name="keywords">
       <item>message</item>
@@ -54,18 +54,22 @@
         <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
         <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
         <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]|~^&#59;"/>
-        <Float attribute="Float" context="#stay">
-            <AnyChar String="fF" attribute="Float" context="#stay"/>
-        </Float>
+        <Float attribute="Float" context="Float Suffixes"/>
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
-        <Int attribute="Decimal" context="#stay">
-            <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-        </Int>
+        <Int attribute="Decimal" context="Int Suffixes"/>
         <HlCChar attribute="Char" context="#stay"/>
         <RegExpr attribute="Char" context="#stay" String="'\\u[0-9a-fA-F]{4}'"/>
       </context>
 
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <AnyChar String="fF" attribute="Float" context="#pop"/>
+      </context>
+
+      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+      </context>
+
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue attribute="String" context="#stay"/>
         <HlCStringChar attribute="String Char" context="#stay"/>
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="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="">
+<language name="Python" version="9" 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>
@@ -346,9 +346,7 @@
 				<Float attribute="Float" context="#stay" />
 				<HlCHex attribute="Hex" context="#stay"/>
 				<HlCOct attribute="Octal" context="#stay"/>
-				<Int attribute="Int" context="#stay">
-					<StringDetect attribute="Int" String="L" insensitive="true" context="#stay"/>
-				</Int>
+				<Int attribute="Int" context="Int Suffixes"/>
 
 				<RegExpr attribute="Int" String=" ([0-9]+_)+[0-9]+" context="#stay"/>
 				<RegExpr attribute="Float" String=" ([0-9]+_)+[0-9]+\.[0-9]+" context="#stay"/>
@@ -368,6 +366,10 @@
 				<AnyChar attribute="Operator" String="+*/%\|=;\!&lt;&gt;!^&amp;~-@" context="#stay"/>
 			</context>
 
+			<context name="Int Suffixes" attribute="Int" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+				<StringDetect attribute="Int" context="#pop" String="L" insensitive="true"/>
+			</context>
+
 			<context name="#CheckForString" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
 				<DetectSpaces/>
 				<LineContinue attribute="Normal Text" context="CheckForStringNext"/>
diff --git a/data/syntax/scala.xml b/data/syntax/scala.xml
--- a/data/syntax/scala.xml
+++ b/data/syntax/scala.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Scala" version="5" kateversion="2.3" section="Sources"
+<language name="Scala" version="6" kateversion="2.3" section="Sources"
           extensions="*.scala;*.sbt" mimetype="text/x-scala" license="LGPL"
           author="Stephane Micheloud (stephane.micheloud@epfl.ch)">
 <!--
@@ -3406,21 +3406,10 @@
         <keyword attribute="Data Type" context="#stay" String="types"/>
         <keyword attribute="Java15" context="#stay" String="java15"/>
         <keyword attribute="Scala2" context="#stay" String="scala2"/>
-        <Float attribute="Float" context="#stay">
-          <AnyChar String="fF" attribute="Float" context="#stay"/>
-        </Float>
+        <Float attribute="Float" context="Float Suffixes"/>
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
-        <Int attribute="Decimal" context="#stay">
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-        </Int>
+        <Int attribute="Decimal" context="Int Suffixes"/>
         <HlCChar attribute="Char" context="#stay"/>
         <RegExpr attribute="Decimal" context="#stay" String="//\s*BEGIN.*$" beginRegion="Region1"/>
         <RegExpr attribute="Decimal" context="#stay" String="//\s*END.*$" endRegion="Region1"/>
@@ -3439,6 +3428,19 @@
         <RegExpr attribute="Symbol" context="Member" String="[.]{1,1}" />
         <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]|~^&#59;"/>
       </context>
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <AnyChar String="fF" attribute="Float" context="#pop"/>
+      </context>
+      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+      </context>
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue attribute="String" context="#stay"/>
         <HlCStringChar attribute="String Char" context="#stay"/>
diff --git a/data/syntax/sml.xml b/data/syntax/sml.xml
--- a/data/syntax/sml.xml
+++ b/data/syntax/sml.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="SML" version="3" kateversion="2.3" section="Sources" extensions="*.sml;*.ml" mimetype="" author="Christoph Cullmann (cullmann@kde.org)" license="MIT">
+<language name="SML" version="4" kateversion="2.3" section="Sources" extensions="*.sml;*.ml" mimetype="" author="Christoph Cullmann (cullmann@kde.org)" license="MIT">
   <highlighting>
     <list name="keywords">
       <item>abstype</item>
@@ -69,12 +69,13 @@
         <DetectChar attribute="String" context="String" char="&quot;" />
         <keyword attribute="Keyword" context="#stay" String="keywords" />
         <keyword attribute="Data Type" context="#stay" String="types" />
-        <Float attribute="Float" context="#stay">
-          <AnyChar String="fF" attribute="Float" context="#stay"/>
-        </Float>
+        <Float attribute="Float" context="Float Suffixes"/>
         <HlCHex attribute="Decimal" context="#stay"/>
         <Int attribute="Decimal" context="#stay" />
       </context>
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <AnyChar String="fF" attribute="Float" context="#pop"/>
+      </context>
       <context attribute="Comment" lineEndContext="#stay" name="Multiline/Inline Comment">
         <Detect2Chars attribute="Comment" context="#pop" char="*" char1=")" />
       </context>
diff --git a/data/syntax/taskjuggler.xml b/data/syntax/taskjuggler.xml
--- a/data/syntax/taskjuggler.xml
+++ b/data/syntax/taskjuggler.xml
@@ -324,20 +324,9 @@
         <DetectChar attribute="Symbol" context="#stay" char="[" beginRegion="Brace1" />
         <DetectChar attribute="Symbol" context="#stay" char="]" endRegion="Brace1" />
 
-        <!-- number hilighting -->
-        <Float attribute="Float" context="#stay">
-            <AnyChar String="fF" attribute="Float" context="#stay"/>
-        </Float>
-        <Int attribute="Decimal" context="#stay">
-            <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
-            <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
-            <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
-            <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
-            <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
-            <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
-            <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
-            <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-        </Int>
+        <!-- number highlighting -->
+        <Float attribute="Float" context="Float Suffixes"/>
+        <Int attribute="Decimal" context="Int Suffixes"/>
 
         <!-- strings -->
         <DetectChar attribute="String" context="String1" char="&apos;"/>
@@ -348,6 +337,21 @@
         <Detect2Chars attribute="Comment" context="Comment2" char="/" char1="*"/>
       </context>
 
+      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <AnyChar String="fF" attribute="Float" context="#pop"/>
+      </context>
+
+      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+          <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+      </context>
+
       <context attribute="String" lineEndContext="#stay" name="String1">
         <DetectChar attribute="String" context="#pop" char="&apos;"/>
       </context>
diff --git a/data/syntax/uscript.xml b/data/syntax/uscript.xml
--- a/data/syntax/uscript.xml
+++ b/data/syntax/uscript.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="UnrealScript" version="1" kateversion="2.2" section="Scripts" extensions="*.uc" mimetype="text/x-uscript">
+<language name="UnrealScript" version="2" kateversion="2.2" section="Scripts" extensions="*.uc" mimetype="text/x-uscript">
 	<highlighting>
 		<list name="keywords">
 			<item>break</item>
@@ -116,21 +116,10 @@
 			<context attribute="Normal Text" lineEndContext="#stay" name="Normal">
 				<keyword attribute="Keyword" context="#stay" String="keywords"/>
 				<keyword attribute="Data Type" context="#stay" String="types"/>
-				<Float attribute="Float" context="#stay">
-					<AnyChar String="fF" attribute="Float" context="#stay"/>
-				</Float>
+                <Float attribute="Float" context="Float Suffixes"/>
 				<HlCOct attribute="Octal" context="#stay"/>
 				<HlCHex attribute="Hex" context="#stay"/>
-				<Int attribute="Decimal" context="#stay">
-					<StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
-					<StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
-					<StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
-					<StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
-					<StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
-					<StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
-					<StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
-					<StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-				</Int>
+                <Int attribute="Decimal" context="Int Suffixes"/>
 				<HlCChar attribute="Char" context="#stay"/>
 				<RegExpr attribute="Region Marker" context="#stay" String="//BEGIN.*$" beginRegion="Region1"/>
 				<RegExpr attribute="Region Marker" context="#stay" String="//END.*$" endRegion="Region1"/>
@@ -143,6 +132,19 @@
 				<AnyChar attribute="Symbol" context="#stay" String="!%&amp;()+,-&lt;=&gt;?[]^{|}~"/>
 				<StringDetect attribute="Preprocessor" context="Preprocessor" insensitive="true" String="#exec"/>
 			</context>
+            <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+                <AnyChar String="fF" attribute="Float" context="#pop"/>
+            </context>
+            <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+                <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
+                <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
+                <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
+                <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
+                <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
+                <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
+                <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
+                <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+            </context>
 			<context attribute="String" lineEndContext="#pop" name="String">
 				<LineContinue attribute="String" context="#stay"/>
 				<HlCStringChar attribute="String Char" context="#stay"/>
diff --git a/data/syntax/vala.xml b/data/syntax/vala.xml
--- a/data/syntax/vala.xml
+++ b/data/syntax/vala.xml
@@ -22,7 +22,7 @@
  * Boston, MA  02110-1301, USA.                                       *
  **********************************************************************
  -->
-<language name="Vala" section="Sources" version="4" kateversion="3.4" indenter="cstyle" extensions="*.vala" mimetype="text/x-vala" priority="15" author="Antoni Boucher (bouanto@hotmail.com)" license="LGPLv2+">
+<language name="Vala" section="Sources" version="5" kateversion="3.4" indenter="cstyle" extensions="*.vala" mimetype="text/x-vala" priority="15" author="Antoni Boucher (bouanto@hotmail.com)" license="LGPLv2+">
     <highlighting>
         <list name="keywords">
             <item>abstract</item>
@@ -141,26 +141,33 @@
             <StringDetect attribute="String" context="MultiLine String" String="&quot;&quot;&quot;"/>
             <DetectChar attribute="String" context="String" char="&quot;"/>
             <DetectIdentifier />
-            <Float attribute="Float" context="#stay">
-                <AnyChar String="fF" attribute="Float" context="#stay"/>
-            </Float>
+            <Float attribute="Float" context="Float Suffixes"/>
             <HlCOct attribute="Octal" context="#stay"/>
             <HlCHex attribute="Hex" context="#stay"/>
-            <Int attribute="Decimal" context="#stay">
-                <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
-                <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
-                <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
-                <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
-                <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-            </Int>
+            <Int attribute="Decimal" context="Int Suffixes"/>
             <IncludeRules context="##Doxygen" />
             <Detect2Chars attribute="Comment" context="Comment" char="/" char1="/"/>
             <Detect2Chars attribute="Comment" context="MultiLine Comment" char="/" char1="*" beginRegion="Comment"/>
             <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
             <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
             <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]{|}~^&#59;"/>
         </context>
 
+        <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+            <AnyChar String="fF" attribute="Float" context="#pop"/>
+        </context>
+
+        <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+            <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
+            <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
+            <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
+            <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
+            <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
+            <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
+            <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
+            <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+        </context>
+
         <context name="String Template Variable" attribute="String" lineEndContext="#stay">
             <Detect2Chars attribute="Escaped Code" context="#stay" char="$" char1="$" />
             <RegExpr attribute="Variable" context="#stay" String="\$[a-zA-Z_][a-zA-Z0-9_]*" />