Got rid of the border system, I'll let another plugin handle that.