Tdh merged 2

As above, use/update the colors in colors.xml