Lots of cleanup
Started build handlebars theme