Styling and more
Merge remote-tracking branch 'origin/theme' into theme

* origin/theme:
  adapting to read img widgets