Fixed template locations again