More fixes for Theming