More theming fixes