Merge "Fix folders being light in dark mode." into sc-dev