Improve surround-outer-overlay and surround-inner-overlay (issue/30)