use original color when not required
Merge pull request #503 from olga-jane/oobi_refactoring

use original color when not required