Email colors
Code refactor