Cleaning up templates
Updated apt version