Settings tweaks, colour picker tweaks