removed word wrap, added two variables for colors

Change-Id: I39efb66c750c21480846afd7f81418fd319627c6