Added map color change, calendar