Colour clashes changed.
Latest round of template tidying.
Merge branch '3.0.1-dev' into dev