calendar-theme merging