Feature/theming

Tagging for code-review: @xendk