diff --git a/rc/filetype/c-family.kak b/rc/filetype/c-family.kak
index 0af8fcff7..9cc02b6d4 100644
--- a/rc/filetype/c-family.kak
+++ b/rc/filetype/c-family.kak
@@ -199,11 +199,8 @@ evaluate-commands %sh{
             add-highlighter shared/$ft regions
             add-highlighter shared/$ft/code default-region group
             add-highlighter shared/$ft/string region %{$maybe_at(?<!')(?<!'\\\\)"} %{(?<!\\\\)(?:\\\\\\\\)*"} fill string
-            add-highlighter shared/$ft/raw_string region -match-capture %{R"([^(]*)\\(} %{\\)([^")]*)"} fill string
-            add-highlighter shared/$ft/javadoc region /\*\*[^/] \*/ fill documentation
-            add-highlighter shared/$ft/qtdoc region /\*! \*/ fill documentation
-            add-highlighter shared/$ft/inline_doc region /// $ fill documentation
-            add-highlighter shared/$ft/inline_qtdoc region //! $ fill documentation
+            add-highlighter shared/$ft/documentation_comment region /\*(\*[^/]|!) \*/ fill documentation
+            add-highlighter shared/$ft/line_documentation_comment region //[/!] $ fill documentation
             add-highlighter shared/$ft/comment region /\\* \\*/ fill comment
             add-highlighter shared/$ft/line_comment region // (?<!\\\\)(?=\\n) fill comment
             add-highlighter shared/$ft/disabled region -recurse "#\\h*if(?:def)?" ^\\h*?#\\h*if\\h+(?:0|FALSE)\\b "#\\h*(?:else|elif|endif)" fill comment
@@ -287,6 +284,9 @@ evaluate-commands %sh{
 
 # c++ specific
 
+# raw strings
+add-highlighter shared/cpp/raw_string region -match-capture %{R"([^(]*)\(} %{\)([^")]*)"} fill string
+
 # integer literals
 add-highlighter shared/cpp/code/ regex %{(?i)(?<!\.)\b[1-9]('?\d+)*(ul?l?|ll?u?)?\b(?!\.)} 0:value
 add-highlighter shared/cpp/code/ regex %{(?i)(?<!\.)\b0b[01]('?[01]+)*(ul?l?|ll?u?)?\b(?!\.)} 0:value