added new mixins and variables
changed color variables