Several theming updates