More work on colour support