NanoVNA App has graph selections for S11 and S21 phase unwrap. This program only works on Windows and I prefer it to NanoVNA Saver for several reasons (easy graph selection, better scaling options, robust calibration, better measurement comparison)
Roger