Plugin config + fix first config
Missing form file
Merge