diff --git a/bin/assets/plugins/lspclient.json b/bin/assets/plugins/lspclient.json
index 6d97d1482..ef4b0e46f 100644
--- a/bin/assets/plugins/lspclient.json
+++ b/bin/assets/plugins/lspclient.json
@@ -284,7 +284,7 @@
       "url": "https://github.com/neocmakelsp/neocmakelsp",
       "command": "neocmakelsp",
       "command_parameters": "stdio",
-      "file_patterns": ["%.cmake$", "CMakeLists%.txt$"],
+      "file_patterns": ["%.cmake$", "CMakeLists%.txt$", "%.cmake.in$"],
       "rootIndicationFileNames": ["build"]
     },
     {
diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/cmake.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/cmake.cpp
index a35a38819..cd161e655 100644
--- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/cmake.cpp
+++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/cmake.cpp
@@ -9,7 +9,7 @@ SyntaxDefinition& addCMake() {
 		->add(
 
 			{ "CMake",
-			  { "%.cmake$", "CMakeLists%.txt$" },
+			  { "%.cmake$", "CMakeLists%.txt$", "%.cmake.in$" },
 			  {
 				  { { "#", "\n" }, "comment" },
 				  { { "\"", "\"", "\\" }, "string" },
diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/vala.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/vala.cpp
index b5d0a79bb..87ebc0ae2 100644
--- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/vala.cpp
+++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/vala.cpp
@@ -28,7 +28,7 @@ SyntaxDefinition& addVala() {
 				SyntaxPatternMatchType::RegEx },
 			  { { "-?%d+[%d%.eE]*f?" }, "number" },
 			  { { "[%+%-/%*%<>!=%^&|?~:;%.%(%)%[%]{}]" }, "operator" },
-			  { { "[%a_][%w_]*%f[(]" }, "function" },
+			  { { "[%a_][%w_]*%s*%f[(]" }, "function" },
 			  { { "[%a_][%w_]*" }, "symbol" },
 		  },
 		  {
diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languagessyntaxhighlighting.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languagessyntaxhighlighting.cpp
index e581a67f4..bf94dc96b 100644
--- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languagessyntaxhighlighting.cpp
+++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languagessyntaxhighlighting.cpp
@@ -248,7 +248,7 @@ static void preDefinitionLangsChunk1( SyntaxDefinitionManager* sdm ) {
 	sdm->addPreDefinition( {
 		"CMake",
 		[]() -> SyntaxDefinition& { return addCMake(); },
-		{ "%.cmake$", "CMakeLists%.txt$" },
+		{ "%.cmake$", "CMakeLists%.txt$", "%.cmake.in$" },
 		{ "^cmake_minimum_required.*%c" },
 
 	} );