Update with the latest color picker fix