fix on implementation of theme colour