Fixed issue #1 and also significantly reduced produced color-tags.