Add a config option to choose the theme
Merge pull request #82 from rohieb/feature/config-option-change-theme

Add a config option to choose the theme
Merge remote-tracking branch 'upstream/dev' into dev