Updated with more settings for plugins