Feature/theming

Tagging for code-review: @xendk 
Style: extra newline after }