Starting to refactor theme.
Merge branch 'master' of https://github.com/buckyflowers/component-library