Fixed token colour orders.  Starting to externalise annoying values.