Clean up templates to be more generic, more "checks" for apt-get packages