Default theme refactor in process