Merge "Fix background colors on some themes" into sc-dev