added settings to settings file and cleaned up mixin references