Track colour improvements

Closes #63 don't use yellow
Closes #69 names and colours don't match