Shade picker+finder + Shape selector updates