Bug fixes. Also, allowing text and icon side-by-side, and setting of border and "background" colors separately (optionally).#16