Fixing default theme.
Merge branch 'develop'