Enhanced switch-candy

thanks @jayvin : )