theme property added
Merge branch 'dev'