Removed forms, added effects

Unable to preview change, don't know if it works.