Merge "Fix some dark theme issues (Take 2)" into mnc-dev