theming fixes