Improved plugins
Working on config.js
merge