Feature/theming

@xendk