Colorpicker updates

Fixes #320

Also changed the colors a bit so that the extra colors below have more usable options (they were too dark)