Refactor Theme