Pulled update for evil mode