Tonal colouring fixes