more theming fixes