Refactor Default theme and Pi theme #153