First basic styles iteration
Merge branch 'gh-pages-feature-basic-styles' into gh-pages