refactor theme