Mixins added and base settings updated