Refactor Default theme and Pi theme #153
Merge pull request #159 from sexnothing/master

Refactor Default theme and Pi theme #153