updated mixins
Color changes
ie fix
Merge remote-tracking branch 'origin/develop'