Revert 'merge pull request #28 from lblpbd/onestop/forms' back to 'Updates plugins and Themes'