Better colour handling