clean up app file, add more templates