code changes in support of john's button tinting