More consistent naming on the colors. Make the colors a type instead of free-floating constants. Function naming consistency