fix theming issues