diff --git a/syntax/pico8.vim b/syntax/pico8.vim
index 42de77d..143cab3 100644
--- a/syntax/pico8.vim
+++ b/syntax/pico8.vim
@@ -46,10 +46,10 @@ syn match  luaError "}"
 syn match  luaError "\<\%(end\|else\|elseif\|then\|until\|in\)\>"
 
 " Function declaration
-syn region luaFunctionBlock transparent matchgroup=luaFunction start="\<function\>" end="\<end\>" contains=ALLBUT,luaTodo,luaSpecial,luaCond,luaCondElseif,luaCondEnd,luaRepeat
+syn region luaFunctionBlock transparent matchgroup=luaFunction start="\<function\>" end="\<end\>" contains=ALL
 
 " if then else elseif end
-syn keyword luaCond contained else
+syn keyword luaCond contained else if
 
 " then ... end
 syn region luaCondEnd contained transparent matchgroup=luaCond start="\<then\>" end="\<end\>" contains=ALLBUT,luaTodo,luaSpecial,luaRepeat