UI: Fix for theme switcher. Closes #986.