Various enhancements. reg form conforms to theme