Change border color to use  variable throughout