Text colors implemented
Resolved conflicts