Themes switching improvements