Template cleanup
Updates build and resources