Added various module overrides, less mixins etc