Redesign of site
Merge branch 'theme'