I13: Refactored form theming