added shapes and ribbon mixins