Merge "Dark theme not working bug" into rvc-dev