Fixing theming issues