Default format
Merge pull request #6 from lipis/format

Default theme cleanup and more