switch to WithAngleAndTemplate

following the discussion in PR#3344