Improved the colour picker implementation