Feature/theming

Tagging for code-review: @xendk 
What happened to this?