Updated for colour scheme