Add a bunch of colors and default textColor/textColorSecondary.
Merge remote-tracking branch 'origin/develop' into develop