--- sh.lang	2014-04-14 19:02:42.000000000 +0300
+++ sh.lang	2014-04-18 11:04:47.000000000 +0300
@@ -68,6 +68,7 @@
         <context ref="def:line-continue"/>
         <context ref="variable"/>
         <context ref="backtick-subshell"/>
+        <context ref="dollar-subshell"/>
       </include>
     </context>
 
@@ -100,12 +101,26 @@
       </include>
     </context>
 
+    <context id="dollar-subshell" style-ref="subshell">
+      <start>\$\((?!\()</start>
+      <end>\)</end>
+      <include>
+        <context ref="def:escape"/>
+        <context ref="def:line-continue"/>
+        <context ref="variable"/>
+        <context ref="built-in-command"/>
+        <context ref="common-command"/>
+        <context ref="single-quoted-string"/>
+        <context ref="double-quoted-string"/>
+      </include>
+    </context>
+
     <context id="punctuator" style-ref="others">
       <match>[;\|&amp;/]</match>
     </context>
 
     <context id="function" style-ref="function">
-      <match>\b[a-zA-Z_][a-zA-Z0-9_]+[ \t]*\(\)</match>
+      <match>\b[a-zA-Z_][a-zA-Z0-9_-]+[ \t]*\(\)</match>
     </context>
 
     <context id="redirection" style-ref="others">
@@ -467,7 +482,7 @@
         <context ref="double-quoted-string"/>
         <context ref="single-quoted-string"/>
         <context style-ref="others">
-          <match>[^\)\s]+\s*\)|;;</match>
+          <match>^\s*[^\(\)\s]+\s*(?=\))</match>
         </context>
         <context ref="sh"/>
       </include>
@@ -482,6 +497,7 @@
         <context ref="double-quoted-string"/>
         <context ref="subshell"/>
         <context ref="backtick-subshell"/>
+        <context ref="dollar-subshell"/>
         <context ref="case"/>
         <context ref="punctuator"/>
         <context ref="function"/>