Change color variables names

Remove color names from the variables names so they can be any colors.