Merge "Fix Homepage wrong color in dark theme"