added color into the shapes mixins