removed unused keyframes
finished making keyframes wrapped in mixins