more progress with theming support