[Themes] Improvments to theming