Rework system so token colors are only a presentational element