improved theming