Fixed up styling to support default styling
Merge branch 'feature/oasis-style' into gh-pages