Incorporate color changes from T431s and develop a simpler means for managing color definitions.