Fixes and add general template
Merge branch 'master' of github.com:brothatru/wordpress-onescreen-theme