diff --git a/data/generators/cmake.xml.tpl b/generators/cmake.xml.tpl
rename from data/generators/cmake.xml.tpl
rename to generators/cmake.xml.tpl
--- a/data/generators/cmake.xml.tpl
+++ b/generators/cmake.xml.tpl
@@ -31,7 +31,7 @@
 
 <language
     name="CMake"
-    version="14"
+    version="15"
     kateversion="2.4"
     section="Other"
     extensions="CMakeLists.txt;*.cmake;*.cmake.in"
diff --git a/data/generators/cmake.yaml b/generators/cmake.yaml
rename from data/generators/cmake.yaml
rename to generators/cmake.yaml
--- a/data/generators/cmake.yaml
+++ b/generators/cmake.yaml
@@ -1806,6 +1806,7 @@
           , STDERR                                          # Since 3.15: the value for `COMMAND_ECHO`
           , STDOUT                                          # Since 3.15: the value for `COMMAND_ECHO`
           ]
+        nested-parentheses?: true
     -
         name: file
         named-args: [
@@ -2231,6 +2232,7 @@
           , PRE_LINK
           , POST_BUILD
           ]
+        nested-parentheses?: true
     -
         name: add_custom_target
         named-args: [
@@ -2249,6 +2251,7 @@
           , COMMAND_EXPAND_LISTS
           , SOURCES
           ]
+        nested-parentheses?: true
     -
         name: add_definitions
     -
@@ -2267,6 +2270,7 @@
     -
         name: add_test
         named-args: [NAME, COMMAND, CONFIGURATIONS, WORKING_DIRECTORY]
+        nested-parentheses?: true
     -
         name: aux_source_directory
     -
diff --git a/autotests/html/highlight.cmake.html b/html/highlight.cmake.html
rename from autotests/html/highlight.cmake.html
rename to html/highlight.cmake.html
--- a/autotests/html/highlight.cmake.html
+++ b/html/highlight.cmake.html
@@ -115,4 +115,26 @@
       )
 
 <span style="font-weight:bold;">endif</span>()
+
+<span style="color:#898887;"># In each function call below, all 3 named parameter lines should apply the same highlighting.</span>
+<span style="font-weight:bold;">add_custom_command</span>(
+    <span style="color:#006e28;">COMMAND</span> true
+    <span style="color:#006e28;">COMMAND</span> (true)
+    <span style="color:#006e28;">COMMAND</span> true
+)
+<span style="font-weight:bold;">add_custom_target</span>(TargetName
+    <span style="color:#006e28;">WORKING_DIRECTORY</span> somedir
+    <span style="color:#006e28;">COMMAND</span> (true)
+    <span style="color:#006e28;">BYPRODUCTS</span> somefile
+)
+<span style="font-weight:bold;">execute_process</span>(
+    <span style="color:#006e28;">COMMAND</span> true
+    <span style="color:#006e28;">COMMAND</span> (true)
+    <span style="color:#006e28;">COMMAND</span> true
+)
+<span style="font-weight:bold;">add_test</span>(
+    <span style="color:#006e28;">NAME</span> sometest
+    <span style="color:#006e28;">COMMAND</span> (true)
+    <span style="color:#006e28;">WORKING_DIRECTORY</span> somedir
+)
 </pre></body></html>
diff --git a/autotests/input/highlight.cmake b/input/highlight.cmake
rename from autotests/input/highlight.cmake
rename to input/highlight.cmake
--- a/autotests/input/highlight.cmake
+++ b/input/highlight.cmake
@@ -109,3 +109,25 @@
       )
 
 endif()
+
+# In each function call below, all 3 named parameter lines should apply the same highlighting.
+add_custom_command(
+    COMMAND true
+    COMMAND (true)
+    COMMAND true
+)
+add_custom_target(TargetName
+    WORKING_DIRECTORY somedir
+    COMMAND (true)
+    BYPRODUCTS somefile
+)
+execute_process(
+    COMMAND true
+    COMMAND (true)
+    COMMAND true
+)
+add_test(
+    NAME sometest
+    COMMAND (true)
+    WORKING_DIRECTORY somedir
+)
diff --git a/autotests/reference/highlight.cmake.ref b/reference/highlight.cmake.ref
rename from autotests/reference/highlight.cmake.ref
rename to reference/highlight.cmake.ref
--- a/autotests/reference/highlight.cmake.ref
+++ b/reference/highlight.cmake.ref
@@ -109,3 +109,25 @@
 <Normal Text>      )</Normal Text><br/>
 <Normal Text></Normal Text><br/>
 <Command>endif</Command><Normal Text>()</Normal Text><br/>
+<Normal Text></Normal Text><br/>
+<Comment># In each function call below, all 3 named parameter lines should apply the same highlighting.</Comment><br/>
+<Command>add_custom_command</Command><Normal Text>(</Normal Text><br/>
+<Normal Text>    </Normal Text><Named Args>COMMAND</Named Args><Normal Text> true</Normal Text><br/>
+<Normal Text>    </Normal Text><Named Args>COMMAND</Named Args><Normal Text> (true)</Normal Text><br/>
+<Normal Text>    </Normal Text><Named Args>COMMAND</Named Args><Normal Text> true</Normal Text><br/>
+<Normal Text>)</Normal Text><br/>
+<Command>add_custom_target</Command><Normal Text>(TargetName</Normal Text><br/>
+<Normal Text>    </Normal Text><Named Args>WORKING_DIRECTORY</Named Args><Normal Text> somedir</Normal Text><br/>
+<Normal Text>    </Normal Text><Named Args>COMMAND</Named Args><Normal Text> (true)</Normal Text><br/>
+<Normal Text>    </Normal Text><Named Args>BYPRODUCTS</Named Args><Normal Text> somefile</Normal Text><br/>
+<Normal Text>)</Normal Text><br/>
+<Command>execute_process</Command><Normal Text>(</Normal Text><br/>
+<Normal Text>    </Normal Text><Named Args>COMMAND</Named Args><Normal Text> true</Normal Text><br/>
+<Normal Text>    </Normal Text><Named Args>COMMAND</Named Args><Normal Text> (true)</Normal Text><br/>
+<Normal Text>    </Normal Text><Named Args>COMMAND</Named Args><Normal Text> true</Normal Text><br/>
+<Normal Text>)</Normal Text><br/>
+<Command>add_test</Command><Normal Text>(</Normal Text><br/>
+<Normal Text>    </Normal Text><Named Args>NAME</Named Args><Normal Text> sometest</Normal Text><br/>
+<Normal Text>    </Normal Text><Named Args>COMMAND</Named Args><Normal Text> (true)</Normal Text><br/>
+<Normal Text>    </Normal Text><Named Args>WORKING_DIRECTORY</Named Args><Normal Text> somedir</Normal Text><br/>
+<Normal Text>)</Normal Text><br/>
diff --git a/data/syntax/cmake.xml b/syntax/cmake.xml
rename from data/syntax/cmake.xml
rename to syntax/cmake.xml
--- a/data/syntax/cmake.xml
+++ b/syntax/cmake.xml
@@ -31,7 +31,7 @@
 
 <language
     name="CMake"
-    version="14"
+    version="15"
     kateversion="2.4"
     section="Other"
     extensions="CMakeLists.txt;*.cmake;*.cmake.in"
@@ -2757,11 +2757,18 @@
         <DetectChar attribute="Normal Text" context="execute_process_ctx_op" char="(" />
       </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="execute_process_ctx_op">
+        <DetectChar attribute="Normal Text" context="execute_process_ctx_op_nested" char="(" />
         <IncludeRules context="EndCmdPop2" />
         <keyword attribute="Named Args" context="#stay" String="execute_process_nargs" />
         <keyword attribute="Special Args" context="#stay" String="execute_process_sargs" />
         <IncludeRules context="User Function Args" />
       </context>
+      <context attribute="Normal Text" lineEndContext="#stay" name="execute_process_ctx_op_nested">
+        <IncludeRules context="EndCmdPop" />
+        <keyword attribute="Named Args" context="#stay" String="execute_process_nargs" />
+        <keyword attribute="Special Args" context="#stay" String="execute_process_sargs" />
+        <IncludeRules context="User Function Args" />
+      </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="file_ctx">
         <DetectChar attribute="Normal Text" context="file_ctx_op" char="(" />
       </context>
@@ -3073,18 +3080,30 @@
         <DetectChar attribute="Normal Text" context="add_custom_command_ctx_op" char="(" />
       </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="add_custom_command_ctx_op">
+        <DetectChar attribute="Normal Text" context="add_custom_command_ctx_op_nested" char="(" />
         <IncludeRules context="EndCmdPop2" />
         <keyword attribute="Named Args" context="#stay" String="add_custom_command_nargs" />
         <IncludeRules context="User Function Args" />
       </context>
+      <context attribute="Normal Text" lineEndContext="#stay" name="add_custom_command_ctx_op_nested">
+        <IncludeRules context="EndCmdPop" />
+        <keyword attribute="Named Args" context="#stay" String="add_custom_command_nargs" />
+        <IncludeRules context="User Function Args" />
+      </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="add_custom_target_ctx">
         <DetectChar attribute="Normal Text" context="add_custom_target_ctx_op" char="(" />
       </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="add_custom_target_ctx_op">
+        <DetectChar attribute="Normal Text" context="add_custom_target_ctx_op_nested" char="(" />
         <IncludeRules context="EndCmdPop2" />
         <keyword attribute="Named Args" context="#stay" String="add_custom_target_nargs" />
         <IncludeRules context="User Function Args" />
       </context>
+      <context attribute="Normal Text" lineEndContext="#stay" name="add_custom_target_ctx_op_nested">
+        <IncludeRules context="EndCmdPop" />
+        <keyword attribute="Named Args" context="#stay" String="add_custom_target_nargs" />
+        <IncludeRules context="User Function Args" />
+      </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="add_definitions_ctx">
         <DetectChar attribute="Normal Text" context="add_definitions_ctx_op" char="(" />
       </context>
@@ -3134,10 +3153,16 @@
         <DetectChar attribute="Normal Text" context="add_test_ctx_op" char="(" />
       </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="add_test_ctx_op">
+        <DetectChar attribute="Normal Text" context="add_test_ctx_op_nested" char="(" />
         <IncludeRules context="EndCmdPop2" />
         <keyword attribute="Named Args" context="#stay" String="add_test_nargs" />
         <IncludeRules context="User Function Args" />
       </context>
+      <context attribute="Normal Text" lineEndContext="#stay" name="add_test_ctx_op_nested">
+        <IncludeRules context="EndCmdPop" />
+        <keyword attribute="Named Args" context="#stay" String="add_test_nargs" />
+        <IncludeRules context="User Function Args" />
+      </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="aux_source_directory_ctx">
         <DetectChar attribute="Normal Text" context="aux_source_directory_ctx_op" char="(" />
       </context>