Patch 1

A few quick improvements to border colors.