Fix filetype and simplify syntax regions