Some theming fixes