Theme switcher fixes