Plugin Diversification

Start using some of those fancy new features to diversify the plugins.