Default theme front-end code update
Merge pull request #138 from sexnothing/master

Default theme front-end code update