Updates to get calendar color working