(#10) Fixed processing of multiple non-default themes
Merge branch 'feature/10-fix-processing-multiple-non-default-themes'

* feature/10-fix-processing-multiple-non-default-themes:
  (#10) Fixed processing of multiple non-default themes