Updateds to theme and form generation