Change to much more versatile colour scheme