Last color-fix (next will be changes)