Complete rewrite of all plugins