Added background-color management