Couple of theming updates