Changing color related global variable names so it's clear they are global
Merging color alterations