moved color variables
removed unused aliases