diff --git a/data/syntax/brightscript.xml b/data/syntax/brightscript.xml
--- a/data/syntax/brightscript.xml
+++ b/data/syntax/brightscript.xml
@@ -4,7 +4,7 @@
 	name="BrightScript"
 	section="Scripts"
 	extensions="*.brs"
-	version="3"
+	version="4"
 	kateversion="5.0"
 	author="Daniel Levin (dendy.ua@gmail.com)"
 	license="MIT">
@@ -295,9 +295,9 @@
 	<StringDetect String="end" insensitive="true" attribute="keyword" context="#pop!function_end"/>
 </context>
 
-<context name="function_end" attribute="keyword" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+<context name="function_end" attribute="keyword" lineEndContext="#pop#pop" fallthrough="true" fallthroughContext="#pop#pop">
 	<DetectSpaces/>
-	<keyword String="function" attribute="keyword" context="#pop#pop" endRegion="function"/>
+	<StringDetect String="function" insensitive="true" attribute="keyword" context="#pop#pop" endRegion="function"/>
 </context>
 
 
@@ -343,9 +343,9 @@
 	<StringDetect String="end" insensitive="true" attribute="keyword" context="#pop!sub_end"/>
 </context>
 
-<context name="sub_end" attribute="keyword" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop#pop">
+<context name="sub_end" attribute="keyword" lineEndContext="#pop#pop" fallthrough="true" fallthroughContext="#pop#pop">
 	<DetectSpaces/>
-	<keyword String="sub" attribute="keyword" context="#pop#pop" endRegion="sub"/>
+	<StringDetect String="sub" insensitive="true" attribute="keyword" context="#pop#pop" endRegion="sub"/>
 </context>