Using Calendar objects instead of Date to simplify code
fixed calendar coloring bug