Update xmas groupings
Add external email support