Fix color picker for new colors

Hopefully this merges into the colorpicker branch trivially