Move theming to base class