Make templates/headInclude and acptemplates/header more consistent