Standalone templates fixed