Fix bg color issues