fix on implementation of theme colour
Merge remote-tracking branch 'upstream/master'