Added switches with labels that turn color when on