use save-excursion when avoiding margin instead of manually moving point back
better colors for ediff refined sections & org indentation