Added a little more logic for border width styling checks and fixed a bug where border_colour property was trying to be used to set border width.