Feature/theming

Tagging for code-review: @xendk 
Use theme_image in preprocess instead.