Added support for X border attribute and a new setting relating to that.