WIP: new plugins, mappings, plugin options, snippets fixes