Color option editor fixes