more theming updates