Change default to date-order
Start adding colours