Rework switch-theme