Moved parts of the theme into mixins