Refs #1889 fix menu & calendar on colour themes