email theme
remove code
Merge branch 'master' into feature/v2