further theming simplification