Replaced existing colour handling with a directive (finally)