Fix text color issue

Changed to always write text color, even if black, then add the \color{textcolor} command to the text commands.