Tidy up form theming