Single product hop template overhaul with includes