Added the theme selector
Merge branch 'themes' into develop