More theming changes