fixed up issues with colors