Changed the way that the perimeter shape handles colors so that two-tone challenges can be supported.