Changed border styling so it uses border color variable