Merge pull request #39 from caesar2164/giulio/new-default-template

Update default theme for v3 to match default theme
edit v1 templates to match default theme