Added background-image support
Added support for border-width and border-color terms