Calendar updates and better colouration