Theme switcher fix