diff --git a/syntax/maude.xml b/syntax/maude.xml
index ecd6df1..f48b30e 100644
--- a/syntax/maude.xml
+++ b/syntax/maude.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language SYSTEM "language.dtd" [
+  <!ENTITY tok_start "(?&lt;=^|\s|[(\[{}\]),])">
+  <!ENTITY tok_end   "(?=$|\s|[(\[{}\]),])">
+]>
 
 <language name="Maude" section="Sources" extensions="*.maude"
           version="1" kateversion="5.53">
@@ -45,22 +48,26 @@
         <keyword attribute="eqs"     context="#stay" String="eqs"     />
         <keyword attribute="rules"   context="#stay" String="rules"   />
         <keyword attribute="members" context="#stay" String="members" />
+        <keyword attribute="strats"  context="#stay" String="strats"  />
+        <keyword attribute="sds"     context="#stay" String="sds"     />
 
         <keyword attribute="if" context="#stay" String="if" />
         <RegExpr attribute="if" context="#stay" String="/\\" />
 
         <RegExpr attribute="punc" context="#stay"
-          String="(?&lt;=^|\s)(?::[:=]?|->|&lt;-|=>|=(?:=|/=)?|@)(?=\s|$)" />
+          String="&tok_start;(?::[:=]?|->|&lt;-|=>|=(?:=|/=)?|@)&tok_end;" />
 
         <RegExpr attribute="delim" context="#stay"
           String="[{}\[\](),]|(?&lt;=^|\s)\.(?=\s|$)" />
 
         <DetectChar attribute="string" context="String" char="&quot;" />
 
-        <Float   attribute="float" context="#stay" />
+        <RegExpr attribute="rat"   context="#stay"
+          String="&tok_start;-?\d+(?:/\d+)?&tok_end;" />
         <RegExpr attribute="float" context="#stay"
-          String="(?&lt;=^|\s|[(\[{])-?Infinity(?=$|\s|[)\]}])" />
-        <RegExpr attribute="rat"   context="#stay" String="-?\d+(?:/\d+)?" />
+          String="&tok_start;-?\d*\.\d+(?:[eE][+-]?\d+)?&tok_end;" />
+        <RegExpr attribute="float" context="#stay"
+          String="&tok_start;-?Infinity&tok_end;" />
 
         <RegExpr attribute="comment" context="comment s"
           String="(?:---|\*\*\*)(?!\()" />
@@ -110,6 +117,9 @@
   </highlighting>
 
   <general>
-    <keywords casesensitive="true" />
+    <keywords
+      casesensitive="true"
+      additionalDeliminators="[]{}(), &#9;"
+      wordWrapDeliminators=" " />
   </general>
 </language>