(#67) Refactor theme structure
Merge branch 'feature/67-refactor--default-theme'

* feature/67-refactor--default-theme:
  (#67) Refactor theme structure