Updated to GH templates