Small theming fixes