Tweaks to colors
Merge branch 'release/2.11' into release/12.0

Conflicts:
	module.xml