Feature/theming

Tagging for code-review: @xendk 
What if you upload a new image with another extension?