start fixing theming related issues