Removed empty include templates from forms, and use templates from theme directly