Made border colors fit color scheme