Updated links&borders highlights