splited themes
modified themes
changed scss
Merge branch 'master' into gh-pages