re #57 - Changed colors and content