refactor theme resolving