simplify the theming a little