Feature/theming

Tagging for code-review: @xendk 
(besides the fact that the email check should be merged into the test at the top of the function).