Returning correct filetype
Merge branch 'plugins'