Fixed missing rainbow colour checkbox and reverted to earlier null year solution