Merge branch 'bot-update-estelle' into 'master'

Target lines for Mavis and some for the Vampire tag. Also some maintenance was done to her existing lines.

See merge request spnati/spnati.gitlab.io!1601