Added borderColor and borderWidth