[ALOY-1085] Update Alloy templates

Includes changes that were part of @FokkeZB 's PR, but uses new artwork.