Fixed bug where borderColor wasn't using correct Color