adds theme.
merges dev to master
merge dev to master