more theming work