Clean up Email theming