Updated plugins, tidied them
Updated configuration