Refactor theme