Work towards removing TextFormat and Colors