Almost restored the shade picker