Refactor themes to avoid imports

Enhancement #9