New plugins and shortcuts
Cleanup and tuning