Refactor themes