More consistent border colors