Feature/theming

Tagging for code-review: @xendk 
I was a bit quick there. I'll fix it myself, but the Drupal Coding standard require that you use || and && rather than 'and' or 'or'.

The reasoning is that the former has lower precedence than the latter, which is more along what most people exepect.