Update with plugins

I take no credit for stuff in extras folder