SOS-1606

Second SO Theme. We can do a straight back port to 6.1.x