riched20: Move the check for cell border colours into the same loop as the other...