Implementing feature #15, modified wrapper colors