Merge "Revert "Fix some dark theme issues"" into mnc-dev