Added oval and color picker.