[#16] Modified color picker